xiaji/flomo-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重构大模型配置为列表布局，每行显示名称、编辑、删除按钮

Browse Source
This commit is contained in:
xiaji
2026-04-06 10:14:49 +08:00
parent 7cd9d9a4bf
commit 7f5705af38
3 changed files with 114 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
flomo-ai/app/src/main/java/com/example/flomo_ai/SecondActivity.kt
View File

@@ -46,10 +46,8 @@ data class ButtonConfig(val id: String, val label: String, val action: String, v
class SecondActivity : AppCompatActivity() { class SecondActivity : AppCompatActivity() {
// View references // View references
private lateinit var spModelSelector: Spinner
private lateinit var llModelList: LinearLayout private lateinit var llModelList: LinearLayout
private lateinit var btnAddModel: Button private lateinit var btnAddModel: Button
private lateinit var btnDeleteModel: Button
private lateinit var etBaseUrl: EditText private lateinit var etBaseUrl: EditText
private lateinit var etApiKey: EditText private lateinit var etApiKey: EditText
private lateinit var btnToggleApiKey: ImageButton private lateinit var btnToggleApiKey: ImageButton
@@ -159,9 +157,8 @@ class SecondActivity : AppCompatActivity() {
btnToggleApiKey = findViewById(R.id.btnToggleApiKey) btnToggleApiKey = findViewById(R.id.btnToggleApiKey)
etModel = findViewById(R.id.etModel) etModel = findViewById(R.id.etModel)
etModelName = findViewById(R.id.etModelName) etModelName = findViewById(R.id.etModelName)
spModelSelector = findViewById(R.id.spModelSelector) llModelList = findViewById(R.id.llModelList)
btnAddModel = findViewById(R.id.btnAddModel) btnAddModel = findViewById(R.id.btnAddModel)
btnDeleteModel = findViewById(R.id.btnDeleteModel)
btnTestConnection = findViewById(R.id.btnTestConnection) btnTestConnection = findViewById(R.id.btnTestConnection)
tvTestStatus = findViewById(R.id.tvTestStatus) tvTestStatus = findViewById(R.id.tvTestStatus)
@@ -351,23 +348,42 @@ class SecondActivity : AppCompatActivity() {
etApiKey.setSelection(etApiKey.text.length) etApiKey.setSelection(etApiKey.text.length)
} }
private fun refreshModelSelector() { private fun refreshModelList() {
val names = llmConfigs.map { it.name.ifEmpty { "未命名" } }.toMutableList() llModelList.removeAllViews()
val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, names) for ((index, config) in llmConfigs.withIndex()) {
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) val view = layoutInflater.inflate(R.layout.model_list_item, null)
spModelSelector.adapter = adapter val tvName = view.findViewById<TextView>(R.id.tvModelName)
val btnEdit = view.findViewById<Button>(R.id.btnEditModel)
val btnDelete = view.findViewById<Button>(R.id.btnDeleteModel)
tvName.text = config.name.ifEmpty { "未命名" }
btnEdit.setOnClickListener {
selectedLlmIndex = index
loadSelectedModelToFields()
Toast.makeText(this, "正在编辑: ${config.name}", Toast.LENGTH_SHORT).show()
}
btnDelete.setOnClickListener {
if (llmConfigs.size <= 1) {
Toast.makeText(this, "至少保留一个配置", Toast.LENGTH_SHORT).show()
return@setOnClickListener
}
llmConfigs.removeAt(index)
if (selectedLlmIndex >= llmConfigs.size) {
selectedLlmIndex = llmConfigs.size - 1
}
loadSelectedModelToFields()
refreshModelList()
Toast.makeText(this, "配置已删除", Toast.LENGTH_SHORT).show()
}
llModelList.addView(view)
}
} }
private fun setupUI() { private fun setupUI() {
refreshModelSelector() refreshModelList()
spModelSelector.setOnItemSelectedListener(object : android.widget.AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: android.widget.AdapterView<*>, view: android.view.View?, position: Int, id: Long) {
selectedLlmIndex = position
loadSelectedModelToFields()
}
override fun onNothingSelected(parent: android.widget.AdapterView<*>) {}
})
btnAddModel.setOnClickListener { btnAddModel.setOnClickListener {
val newName = "新配置 ${llmConfigs.size + 1}" val newName = "新配置 ${llmConfigs.size + 1}"
@@ -380,23 +396,7 @@ class SecondActivity : AppCompatActivity() {
llmConfigs.add(newConfig) llmConfigs.add(newConfig)
selectedLlmIndex = llmConfigs.size - 1 selectedLlmIndex = llmConfigs.size - 1
loadSelectedModelToFields() loadSelectedModelToFields()
refreshModelSelector() refreshModelList()
spModelSelector.setSelection(selectedLlmIndex)
}
btnDeleteModel.setOnClickListener {
if (llmConfigs.size <= 1) {
Toast.makeText(this, "至少保留一个配置", Toast.LENGTH_SHORT).show()
return@setOnClickListener
}
llmConfigs.removeAt(selectedLlmIndex)
if (selectedLlmIndex >= llmConfigs.size) {
selectedLlmIndex = llmConfigs.size - 1
}
loadSelectedModelToFields()
refreshModelSelector()
spModelSelector.setSelection(selectedLlmIndex)
Toast.makeText(this, "配置已删除", Toast.LENGTH_SHORT).show()
} }
// Setup headers // Setup headers

67
flomo-ai/app/src/main/res/layout/activity_second.xml
View File

@@ -154,49 +154,48 @@
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
<!-- 模型选择器 --> <!-- 模型列表 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:orientation="horizontal" android:orientation="vertical">
android:gravity="center_vertical">
<Spinner <LinearLayout
android:id="@+id/spModelSelector" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="48dp" android:orientation="horizontal"
android:layout_weight="1" android:gravity="center_vertical">
android:background="@drawable/edittext_border"
android:spinnerMode="dropdown"
android:padding="12dp"/>
<Button <TextView
android:id="@+id/btnAddModel" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="40dp" android:layout_weight="1"
android:layout_marginStart="8dp" android:text="已配置模型"
android:text="+ 添加" android:textColor="@color/text_secondary"
android:textSize="14sp" android:textSize="14sp"/>
android:textColor="@color/white"
android:background="@drawable/button_primary_bg"
android:minWidth="0dp"
android:minHeight="0dp"/>
<Button <Button
android:id="@+id/btnDeleteModel" android:id="@+id/btnAddModel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginStart="4dp" android:text="+ 添加"
android:text="删除" android:textSize="14sp"
android:textSize="14sp" android:textColor="@color/white"
android:textColor="@color/white" android:background="@drawable/button_primary_bg"
android:background="@drawable/button_danger_bg" android:minWidth="0dp"
android:minWidth="0dp" android:minHeight="0dp"/>
android:minHeight="0dp"/> </LinearLayout>
<LinearLayout
android:id="@+id/llModelList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="12dp"/>
</LinearLayout> </LinearLayout>
<!-- Base URL --> <!-- 当前编辑区 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

46
flomo-ai/app/src/main/res/layout/model_list_item.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingVertical="12dp"
android:background="@drawable/edittext_border"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/tvModelName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/primary"
android:textSize="16sp"
android:gravity="center"
android:text="模型名称"/>
<Button
android:id="@+id/btnEditModel"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:text="编辑"
android:textSize="12sp"
android:textColor="@color/white"
android:background="@drawable/button_secondary_bg"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingHorizontal="12dp"
android:layout_marginEnd="8dp"/>
<Button
android:id="@+id/btnDeleteModel"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:text="删除"
android:textSize="12sp"
android:textColor="@color/white"
android:background="@drawable/button_danger_bg"
android:minWidth="0dp"
android:minHeight="0dp"
android:paddingHorizontal="12dp"/>
</LinearLayout>