Browse Source

上传优化代码

newdev_shunjiawei
liwei1dao 1 year ago
parent
commit
190c5e8a71
  1. 18
      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. 8
      local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt

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

@ -449,14 +449,16 @@ 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 -> // 处理普通文本内容
try { delta.content?.let { content ->
replyContext += content try {
getSessionCallback(sessionid)?.onToken(sessionid,content) replyContext += content
} catch (e: Exception) { getSessionCallback(sessionid)?.onToken(sessionid,content)
Log.e(TAG, "onToken回调异常: ${e.message}", e) } catch (e: Exception) {
// 不重新抛出异常,继续处理后续内容 Log.e(TAG, "onToken回调异常: ${e.message}", e)
// 不重新抛出异常,继续处理后续内容
}
} }
} }
Log.d(TAG, "liwei-------------------------开始AI 对话 7-4") Log.d(TAG, "liwei-------------------------开始AI 对话 7-4")

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?) {

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

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

Loading…
Cancel
Save