Browse Source

上传优化代码

weicu
liwei1dao 1 year ago
parent
commit
be64f5ca56
  1. 2
      local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt
  2. 2
      local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt
  3. 6
      local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt

2
local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt

@ -449,6 +449,7 @@ class ChatApiService(private val context: android.content.Context? = null) : Cor
return@collect return@collect
} }
Log.d(TAG, "liwei-------------------------开始AI 对话 7-3") Log.d(TAG, "liwei-------------------------开始AI 对话 7-3")
if (delta.toolCalls == null){
// 处理普通文本内容 // 处理普通文本内容
delta.content?.let { content -> delta.content?.let { content ->
try { try {
@ -459,6 +460,7 @@ class ChatApiService(private val context: android.content.Context? = null) : Cor
// 不重新抛出异常,继续处理后续内容 // 不重新抛出异常,继续处理后续内容
} }
} }
}
Log.d(TAG, "liwei-------------------------开始AI 对话 7-4") Log.d(TAG, "liwei-------------------------开始AI 对话 7-4")
// 收集工具调用信息 // 收集工具调用信息
delta.toolCalls?.forEach { toolCall -> delta.toolCalls?.forEach { toolCall ->

2
local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt

@ -169,6 +169,7 @@ class QQMusicManager(private val context: Context) {
Log.d(TAG, "QQ音乐服务连接断开") Log.d(TAG, "QQ音乐服务连接断开")
qqmusicApi = null qqmusicApi = null
isBindQQMusicService = false isBindQQMusicService = false
} }
}, Context.BIND_AUTO_CREATE) }, Context.BIND_AUTO_CREATE)
Log.d(TAG, "重试绑定QQ音乐服务 $retryResult") Log.d(TAG, "重试绑定QQ音乐服务 $retryResult")
@ -326,7 +327,6 @@ class QQMusicManager(private val context: Context) {
putStringArrayList("midList", ArrayList(songMids)) putStringArrayList("midList", ArrayList(songMids))
putInt("index", index) putInt("index", index)
} }
// 直接调用executeAsync,不接收返回值 // 直接调用executeAsync,不接收返回值
qqmusicApi?.executeAsync("playSongMidAtIndex", params, object : IQQMusicApiCallback.Stub() { qqmusicApi?.executeAsync("playSongMidAtIndex", params, object : IQQMusicApiCallback.Stub() {
override fun onReturn(result: Bundle?) { override fun onReturn(result: Bundle?) {

6
local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt

@ -518,13 +518,17 @@ class QQMusicSingleton private constructor() {
} }
} }
} }
} }
}) })
} }
override fun onError(errorCode: Int, errorMessage: String) { override fun onError(errorCode: Int, errorMessage: String) {
Log.e(TAG, "${actionName}失败: $errorCode $errorMessage")
if (allagain > 0 && curragain < allagain){ //重试机制
executePlaybackAction(actionName,curragain+1,allagain,action)
}else{
callback(Result.failure(Exception("$actionName 失败: $errorMessage"))) callback(Result.failure(Exception("$actionName 失败: $errorMessage")))
} }
}
}) })
} }

Loading…
Cancel
Save