From 7cd9d9a4bfafdeb6017157bbdee88b2e35426dd1 Mon Sep 17 00:00:00 2001 From: xiaji Date: Mon, 6 Apr 2026 08:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DFlomo=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9AAPI=20Key=E6=94=B9=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E9=80=89=EF=BC=8C=E6=B7=BB=E5=8A=A0content=5Ftype=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/flomo_ai/MainActivity.kt | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/flomo-ai/app/src/main/java/com/example/flomo_ai/MainActivity.kt b/flomo-ai/app/src/main/java/com/example/flomo_ai/MainActivity.kt index de16ae5..64b6c06 100644 --- a/flomo-ai/app/src/main/java/com/example/flomo_ai/MainActivity.kt +++ b/flomo-ai/app/src/main/java/com/example/flomo_ai/MainActivity.kt @@ -508,7 +508,7 @@ class MainActivity : AppCompatActivity() { val settings = Gson().fromJson(json, NoteSettingsData::class.java) val noteConfig = settings.noteApiConfig - if (noteConfig == null || noteConfig.apiUrl.isBlank() || noteConfig.apiKey.isBlank()) { + if (noteConfig == null || noteConfig.apiUrl.isBlank()) { Toast.makeText(this, "请先配置笔记API", Toast.LENGTH_SHORT).show() return } @@ -541,10 +541,12 @@ class MainActivity : AppCompatActivity() { return withContext(Dispatchers.IO) { try { val client = OkHttpClient() - val requestBody = when (apiType) { + val (requestBody, useAuth) = when (apiType) { "Flomo" -> { - val json = JSONObject().put("content", content) - json.toString().toRequestBody("application/json".toMediaType()) + val json = JSONObject() + .put("content", content) + .put("content_type", "markdown") + Pair(json.toString().toRequestBody("application/json".toMediaType()), false) } "Notion" -> { val json = JSONObject() @@ -556,20 +558,24 @@ class MainActivity : AppCompatActivity() { ) ) ) - json.toString().toRequestBody("application/json".toMediaType()) + Pair(json.toString().toRequestBody("application/json".toMediaType()), true) } else -> { val json = JSONObject().put("content", content) - json.toString().toRequestBody("application/json".toMediaType()) + Pair(json.toString().toRequestBody("application/json".toMediaType()), apiKey.isNotBlank()) } } - val request = Request.Builder() + val requestBuilder = Request.Builder() .url(apiUrl) - .addHeader("Authorization", "Bearer $apiKey") .addHeader("Content-Type", "application/json") .post(requestBody) - .build() + + if (useAuth && apiKey.isNotBlank()) { + requestBuilder.addHeader("Authorization", "Bearer $apiKey") + } + + val request = requestBuilder.build() val response = client.newCall(request).execute() response.isSuccessful