增加星火大模型的model按钮;修改配置文件的字段;更改部分逻辑过程。现在大模型的类型也可以选择了。
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.example.flomo_ai
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.Gravity
|
||||
@@ -81,6 +82,7 @@ fun extractLabels(responseBody: String): List<String>? {
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
Log.e("ExtractLabels", "Error during extraction: ${e.message}")
|
||||
|
||||
}
|
||||
return null
|
||||
}
|
||||
@@ -89,11 +91,14 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
private lateinit var inputEditText: EditText
|
||||
private lateinit var configButton: Button
|
||||
private lateinit var submitToAIButton: Button
|
||||
private lateinit var submitToZhiPuAIButton: Button
|
||||
private lateinit var submitToSparkAIButton: Button
|
||||
|
||||
private lateinit var tabLayout: TabLayout
|
||||
private lateinit var submitToServerButton: Button
|
||||
private lateinit var statusText: TextView
|
||||
|
||||
@SuppressLint("MissingInflatedId")
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
@@ -102,10 +107,11 @@ class MainActivity : AppCompatActivity() {
|
||||
inputEditText.gravity = Gravity.START or Gravity.TOP
|
||||
|
||||
configButton = findViewById(R.id.configButton)
|
||||
|
||||
submitToAIButton = findViewById(R.id.submitToAIButton)
|
||||
// 状态栏目的信息
|
||||
statusText = findViewById<TextView>(R.id.statusTextView)
|
||||
submitToAIButton.setOnClickListener {
|
||||
|
||||
submitToZhiPuAIButton = findViewById(R.id.submitToZhiPuAIButton)
|
||||
submitToZhiPuAIButton.setOnClickListener {
|
||||
// 创建 OkHttpClient,点击智谱AI分析返回标签
|
||||
val client = OkHttpClient.Builder()
|
||||
.addInterceptor(object : Interceptor {
|
||||
@@ -124,23 +130,12 @@ class MainActivity : AppCompatActivity() {
|
||||
val combinedText =
|
||||
"$textFromEditText。请为以上文章分析并给出 4 个最合理的标签,没有其他内容。以 JSON 格式输出,格式为 labels: [标签 1, 标签 2, 标签 3, 标签 4]"
|
||||
|
||||
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
|
||||
val jsonAdapter = moshi.adapter(ChatRequest::class.java)
|
||||
|
||||
val requestBody = ChatRequest(
|
||||
model = "glm-4-flash",
|
||||
messages = listOf(Message(role = "user", content = combinedText))
|
||||
)
|
||||
|
||||
val requestBodyJson = jsonAdapter.toJson(requestBody)
|
||||
val mediaType = "application/json; charset=utf-8".toMediaType()
|
||||
val body = requestBodyJson.toRequestBody(mediaType)
|
||||
|
||||
// 从配置中读取 api_key
|
||||
val sharedPrefs = getSharedPreferences("APIConfigs", MODE_PRIVATE)
|
||||
val allConfigsJson = sharedPrefs.getString("configs", null)
|
||||
var api_key = ""
|
||||
var api_url = ""
|
||||
var api_model = "glm-4-flash"
|
||||
if (allConfigsJson != null) {
|
||||
val type = object : TypeToken<List<APIConfig>>() {}.type
|
||||
val allConfigs = Gson().fromJson<List<APIConfig>>(allConfigsJson, type)
|
||||
@@ -149,9 +144,26 @@ class MainActivity : AppCompatActivity() {
|
||||
if (zhipuConfig != null) {
|
||||
api_key = zhipuConfig.key
|
||||
api_url = zhipuConfig.url
|
||||
api_model = zhipuConfig.model
|
||||
statusText.text = "zhipuConfig配置文件$api_model"
|
||||
|
||||
} else {
|
||||
statusText.text = "没找到zhipuConfig配置文件"
|
||||
}
|
||||
}
|
||||
|
||||
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
|
||||
val jsonAdapter = moshi.adapter(ChatRequest::class.java)
|
||||
|
||||
val requestBody = ChatRequest(
|
||||
model = api_model.toString(),
|
||||
messages = listOf(Message(role = "user", content = combinedText))
|
||||
)
|
||||
|
||||
val requestBodyJson = jsonAdapter.toJson(requestBody)
|
||||
val mediaType = "application/json; charset=utf-8".toMediaType()
|
||||
val body = requestBodyJson.toRequestBody(mediaType)
|
||||
|
||||
// 创建请求
|
||||
val request = Request.Builder()
|
||||
.url("$api_url")
|
||||
@@ -206,6 +218,114 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
}
|
||||
}
|
||||
submitToSparkAIButton = findViewById(R.id.submitToSparkAIButton)
|
||||
submitToSparkAIButton.setOnClickListener {
|
||||
// 创建 OkHttpClient,点击星火大模型分析返回标签
|
||||
val client = OkHttpClient.Builder()
|
||||
.addInterceptor(object : Interceptor {
|
||||
override fun intercept(chain: Interceptor.Chain): okhttp3.Response {
|
||||
val originalRequest = chain.request()
|
||||
val newRequest = originalRequest.newBuilder().build()
|
||||
return chain.proceed(newRequest)
|
||||
}
|
||||
})
|
||||
.build()
|
||||
// 假设这是一个 EditText 元素
|
||||
val inputEditText = findViewById<EditText>(R.id.inputEditText)
|
||||
|
||||
// 获取 EditText 中的文本内容,创建request的body
|
||||
val textFromEditText = inputEditText.text.toString()
|
||||
val combinedText =
|
||||
"$textFromEditText。请为以上文章分析并给出 4 个最合理的标签,没有其他内容。以 JSON 格式输出,格式为 labels: [标签 1, 标签 2, 标签 3, 标签 4]"
|
||||
|
||||
|
||||
// 从配置中读取 api_key
|
||||
val sharedPrefs = getSharedPreferences("APIConfigs", MODE_PRIVATE)
|
||||
val allConfigsJson = sharedPrefs.getString("configs", null)
|
||||
var api_key = ""
|
||||
var api_url = ""
|
||||
var api_model = "general"
|
||||
if (allConfigsJson != null) {
|
||||
val type = object : TypeToken<List<APIConfig>>() {}.type
|
||||
val allConfigs = Gson().fromJson<List<APIConfig>>(allConfigsJson, type)
|
||||
val sparkConfig = allConfigs.find { it.name == "spark" }
|
||||
|
||||
if (sparkConfig != null) {
|
||||
api_key = sparkConfig.key
|
||||
api_url = sparkConfig.url
|
||||
api_model = sparkConfig.model
|
||||
statusText.text = "sparkConfig配置文件$api_model"
|
||||
} else {
|
||||
statusText.text = "没找到sparkConfig配置文件"
|
||||
}
|
||||
}
|
||||
// 配置 body的内容
|
||||
val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
|
||||
val jsonAdapter = moshi.adapter(ChatRequest::class.java)
|
||||
|
||||
val requestBody = ChatRequest(
|
||||
model = api_model.toString(),
|
||||
messages = listOf(Message(role = "user", content = combinedText))
|
||||
)
|
||||
|
||||
val requestBodyJson = jsonAdapter.toJson(requestBody)
|
||||
val mediaType = "application/json; charset=utf-8".toMediaType()
|
||||
val body = requestBodyJson.toRequestBody(mediaType)
|
||||
|
||||
// 创建请求
|
||||
val request = Request.Builder()
|
||||
.url("$api_url")
|
||||
.post(body)
|
||||
.header("Authorization", "Bearer $api_key")
|
||||
.header("Content-Type", "application/json")
|
||||
.build()
|
||||
|
||||
// 使用协程在后台线程中发送请求
|
||||
CoroutineScope(Dispatchers.Main).launch {
|
||||
try {
|
||||
// 模拟可能出现异常的网络操作,这里需要替换为你的实际网络请求相关代码
|
||||
// 比如使用 OkHttp 或者其他网络库进行请求
|
||||
val response = withContext(Dispatchers.IO) {
|
||||
client.newCall(request).execute()
|
||||
}
|
||||
if (response.isSuccessful) {
|
||||
val responseBody = response.body?.string() // 将响应体转换为字符串
|
||||
responseBody?.let {
|
||||
// 处理响应 JSON 数据
|
||||
print("return message is $responseBody")
|
||||
val labels = extractLabels(responseBody)
|
||||
labels?.let {
|
||||
if (labels != null && labels.size == 4) {
|
||||
for (i in 0 until 4) {
|
||||
val tab = tabLayout.getTabAt(i)
|
||||
if (tab != null) {
|
||||
tab.text = labels[i]
|
||||
tab.view.setOnClickListener {
|
||||
val currentText =
|
||||
findViewById<EditText>(R.id.inputEditText).text.toString()
|
||||
val buttonText = tab.text.toString()
|
||||
inputEditText.setText("$currentText\n#$buttonText")
|
||||
statusText.text = "标签已增加"
|
||||
}
|
||||
}
|
||||
}
|
||||
statusText.text = "标签已经获取并更新"
|
||||
}
|
||||
} ?: run {
|
||||
statusText.text = "没有更新到标签"
|
||||
}
|
||||
}
|
||||
} else {
|
||||
statusText.text = "服务器没有响应,没有更新"
|
||||
}
|
||||
} catch (e: UnknownHostException) {
|
||||
statusText.text ="UnknownHostException: ${e.message}"
|
||||
} catch (e: IOException) {
|
||||
statusText.text = "IOException: ${e.message}"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
tabLayout = findViewById(R.id.tabLayout)
|
||||
submitToServerButton = findViewById(R.id.submitToServerButton)
|
||||
@@ -238,10 +358,8 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun submitToServer(content: String) {
|
||||
|
||||
CoroutineScope(Dispatchers.Main).launch {
|
||||
statusText.text = "提交到flomo服务器..."
|
||||
|
||||
val result = withContext(Dispatchers.IO) {
|
||||
postDataToServer(content)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user