From e0e257e373c79d2b8342467d8b8abd2050460ce6 Mon Sep 17 00:00:00 2001 From: xiaji Date: Sun, 5 Apr 2026 23:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E3=80=81=E9=80=89=E6=8B=A9=E3=80=81=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/flomo_ai/MainActivity.kt | 137 +++++++++++---- .../com/example/flomo_ai/SecondActivity.kt | 160 ++++++++++++------ .../app/src/main/res/layout/activity_main.xml | 23 +-- .../src/main/res/layout/activity_second.xml | 58 +++++++ 4 files changed, 281 insertions(+), 97 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 89b797b..de16ae5 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 @@ -40,17 +40,20 @@ class MainActivity : AppCompatActivity() { private lateinit var promptSelector: Spinner private lateinit var promptNameText: TextView private lateinit var promptContentText: TextView + private lateinit var headerModelSelector: Spinner // Data classes matching SecondActivity data class HeaderConfig(val key: String, val value: String) data class PromptConfig(val id: String, val title: String, val content: String, val expanded: Boolean = false) data class ButtonConfig(val id: String, val label: String, val action: String, val apiUrl: String? = null, val apiMethod: String? = null, val apiBodyTemplate: String? = null, val expanded: Boolean = false) - data class LLMConfig(val baseUrl: String, val apiKey: String, val model: String) + data class LLMConfig(val name: String, val baseUrl: String, val apiKey: String, val model: String) data class SettingsData( - val llmConfig: LLMConfig?, + val llmConfigs: List?, + val selectedLlmIndex: Int?, val headerConfigs: List?, val promptConfigs: List?, - val buttonConfigs: List? + val buttonConfigs: List?, + val llmConfig: LLMConfig? = null ) @SuppressLint("MissingInflatedId", "CutPasteId", "SetTextI18n") @@ -71,12 +74,11 @@ class MainActivity : AppCompatActivity() { outputTextView = findViewById(R.id.outputTextView) val btnCopyResult = findViewById