diff --git a/ios/Podfile b/ios/Podfile index 9591f8465..ce17794db 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,10 +1,11 @@ # Define a global platform for your project platform :ios, '16.0' +$FirebaseSDKVersion = '11.13.0' + # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' - project 'Runner', { 'Debug' => :debug, 'Profile' => :release, @@ -86,4 +87,4 @@ post_install do |installer| end end end -end +end \ No newline at end of file diff --git a/lib/core/widgets/intro_overlay_builder.dart b/lib/core/widgets/intro_overlay_builder.dart index a2c3eaa7a..22b52a81a 100644 --- a/lib/core/widgets/intro_overlay_builder.dart +++ b/lib/core/widgets/intro_overlay_builder.dart @@ -10,7 +10,7 @@ class IntroOverlayBuilder { required Size size, }) { return OverlayPosition( - top: ScreenUtil().statusBarHeight, + top: 0, width: screenSize.width, crossAxisAlignment: CrossAxisAlignment.center, ); @@ -26,6 +26,7 @@ class IntroOverlayBuilder { children: [ Container( padding: EdgeInsetsGeometry.all(12.w), + margin: EdgeInsets.only(top: ScreenUtil().statusBarHeight), alignment: Alignment.centerRight, child: _button( '跳过', @@ -73,18 +74,22 @@ class IntroOverlayBuilder { bool alignment = true, Function? onNext, Function? onFinish, + Function? onTap, }) { - double height = - (params.offset?.dy ?? 0) - ScreenUtil().statusBarHeight - 20.w; + double dy = params.offset?.dy ?? 0; + double width = params.size.width; + double height = params.size.height; + double totalHeight = dy + height + 3; double left = params.offset?.dx ?? 0; - double right = 1.sw - left - params.size.width; + double right = 1.sw - left - width; return SizedBox( - height: height, + height: totalHeight, child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Container( padding: EdgeInsetsGeometry.all(12.w), + margin: EdgeInsets.only(top: ScreenUtil().statusBarHeight), alignment: Alignment.centerRight, child: _button( '跳过', @@ -96,15 +101,15 @@ class IntroOverlayBuilder { ), Padding( padding: EdgeInsets.only( - left: alignment ? left : 12.w, - right: alignment ? 12.w : right, + left: alignment ? left - 3 : 12.w - 3, + right: alignment ? 12.w - 3 : right - 3, ), child: Column( crossAxisAlignment: alignment ? CrossAxisAlignment.start : CrossAxisAlignment.end, children: [ Padding( - padding: EdgeInsets.only(bottom: 10.w), + padding: const EdgeInsets.symmetric(horizontal: 3), child: Text( text, style: TextStyle( @@ -117,23 +122,51 @@ class IntroOverlayBuilder { Row( children: [ if (onNext != null) - _button( - buttonText, - () { - params.onNext!(); - onNext(); - }, + Padding( + padding: EdgeInsets.only(top: 10.w, left: 3, right: 3), + child: _button( + buttonText, + () { + params.onNext!(); + onNext(); + }, + ), ), if (onFinish != null) - _button( - buttonText, - () { - params.onFinish(); - onFinish(); - }, + Padding( + padding: EdgeInsets.only(top: 10.w, left: 3, right: 3), + child: _button( + buttonText, + () { + params.onFinish(); + onFinish(); + }, + ), ), ], ), + SizedBox(height: 20.w), + onTap != null + ? _AnimatedBorderButton( + onTap: () { + onTap(); + }, + isButton: false, + child: Padding( + padding: const EdgeInsetsGeometry.all(3), + child: SizedBox( + width: width, + height: height, + ), + ), + ) + : Padding( + padding: const EdgeInsetsGeometry.all(3), + child: SizedBox( + width: width, + height: height, + ), + ), ], ), ), @@ -162,8 +195,21 @@ class IntroOverlayBuilder { ), ) : _AnimatedBorderButton( - text: text, onTap: onTap, + child: Container( + padding: EdgeInsets.symmetric(horizontal: 15.w, vertical: 5.w), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20.r), + border: Border.all(color: Colors.transparent), + ), + child: Text( + text, + style: TextStyle( + fontSize: 14.sp, + color: Colors.white, + ), + ), + ), ); } } @@ -228,12 +274,14 @@ class _AnimatedLottieWidgetState extends State<_AnimatedLottieWidget> // 新增的带边框流动动画的按钮组件 class _AnimatedBorderButton extends StatefulWidget { - final String text; + final Widget child; + final bool isButton; final Function() onTap; const _AnimatedBorderButton({ - required this.text, + required this.child, required this.onTap, + this.isButton = true, }); @override @@ -276,22 +324,9 @@ class _AnimatedBorderButtonState extends State<_AnimatedBorderButton> return CustomPaint( painter: _FlowingBorderPainter( progress: _animation.value, - borderRadius: 20.r, - ), - child: Container( - padding: EdgeInsets.symmetric(horizontal: 15.w, vertical: 5.w), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20.r), - border: Border.all(color: Colors.transparent), - ), - child: Text( - widget.text, - style: TextStyle( - fontSize: 14.sp, - color: Colors.white, - ), - ), + borderRadius: widget.isButton ? 20.r : 0.r, ), + child: widget.child, ); }, ), diff --git a/lib/modules/agent/views/agent_view.dart b/lib/modules/agent/views/agent_view.dart index 419261a77..4681a6fba 100644 --- a/lib/modules/agent/views/agent_view.dart +++ b/lib/modules/agent/views/agent_view.dart @@ -742,151 +742,143 @@ class _AgentViewState extends State with WidgetsBindingObserver { SizedBox(width: 8.w), // 动态按钮区域：展开按钮 + 发送按钮 或 图片选择按钮 - Builder(builder: (context) { - StepWidgetParams? widgetParams; - return IntroStepBuilder( - group: 'ai', - order: 2, - onHighlightWidgetTap: () async { - await controller - .noviceGuideService.aiStepsList[ - controller.noviceGuideService.aiStep] - ['method'](); - widgetParams!.onNext!(); - controller.sendMessage(); - }, - getOverlayPosition: - IntroOverlayBuilder.overlayPosition, - overlayBuilder: (params) { - widgetParams = params; - return IntroOverlayBuilder.aiBuilder( - params, - '点击发送，${controller.noviceGuideService.aiStepsList[controller.noviceGuideService.aiStep]['send']}', - alignment: false, - ); - }, - builder: - (BuildContext context, GlobalKey key) => - Obx( - key: key, - () { - final hasText = - controller.hasTextInput.value; - final hasImage = - controller.isImageInputActive.value; - final shouldShowSend = hasText || hasImage; - final shouldShowExpand = - controller.shouldShowExpandButton.value; + IntroStepBuilder( + group: 'ai', + order: 2, + getOverlayPosition: + IntroOverlayBuilder.overlayPosition, + overlayBuilder: (params) { + return IntroOverlayBuilder.aiBuilder( + params, + '点击发送，${controller.noviceGuideService.aiStepsList[controller.noviceGuideService.aiStep]['send']}', + alignment: false, + onTap: () async { + await controller + .noviceGuideService.aiStepsList[ + controller.noviceGuideService + .aiStep]['method'](); + params.onNext!(); + controller.sendMessage(); + }, + ); + }, + builder: (BuildContext context, GlobalKey key) => + Obx( + key: key, + () { + final hasText = controller.hasTextInput.value; + final hasImage = + controller.isImageInputActive.value; + final shouldShowSend = hasText || hasImage; + final shouldShowExpand = + controller.shouldShowExpandButton.value; - if (shouldShowSend) { - // 显示发送按钮（可能还有展开按钮） - return Column( - children: [ - // 展开按钮（在发送按钮上方） - if (shouldShowExpand && hasText) - Padding( - padding: - EdgeInsets.only(bottom: 40.h), - child: GestureDetector( - onTap: () { - // 打开底部弹出编辑模式 + if (shouldShowSend) { + // 显示发送按钮（可能还有展开按钮） + return Column( + children: [ + // 展开按钮（在发送按钮上方） + if (shouldShowExpand && hasText) + Padding( + padding: + EdgeInsets.only(bottom: 40.h), + child: GestureDetector( + onTap: () { + // 打开底部弹出编辑模式 + controller.openFullScreenEdit(); + showModalBottomSheet( + context: context, + isScrollControlled: true, + backgroundColor: + Colors.transparent, + builder: (context) => + const FullScreenEditor(), + ).then((_) { + // 弹出页关闭时的回调 controller - .openFullScreenEdit(); - showModalBottomSheet( - context: context, - isScrollControlled: true, - backgroundColor: - Colors.transparent, - builder: (context) => - const FullScreenEditor(), - ).then((_) { - // 弹出页关闭时的回调 - controller - .closeFullScreenEdit(); - }); - }, - child: Container( - width: 32.w, - height: 32.w, - decoration: BoxDecoration( - color: isDarkMode - ? Colors.grey[700] - : Colors.grey[300], - borderRadius: - BorderRadius.circular( - 16.w), - ), - child: Icon( - Icons.expand_less, - color: isDarkMode - ? Colors.grey[300] - : Colors.grey[700], - size: 20.sp, - ), + .closeFullScreenEdit(); + }); + }, + child: Container( + width: 32.w, + height: 32.w, + decoration: BoxDecoration( + color: isDarkMode + ? Colors.grey[700] + : Colors.grey[300], + borderRadius: + BorderRadius.circular( + 16.w), + ), + child: Icon( + Icons.expand_less, + color: isDarkMode + ? Colors.grey[300] + : Colors.grey[700], + size: 20.sp, ), - ), - ), - // 发送按钮 - GestureDetector( - onTap: () => - controller.sendMessage(), - child: Container( - width: 44.w, - height: 44.w, - margin: EdgeInsets.symmetric( - vertical: 2.w), - decoration: BoxDecoration( - color: primaryColor, - borderRadius: - BorderRadius.circular(22.w), - ), - child: Icon( - Icons.send, - color: Colors.white, - size: 22.sp, ), ), ), - ], - ); - } else { - // 显示'+'选择按钮 - return Obx(() { - final isExpanded = controller - .isPlusOptionsExpanded.value; - return GestureDetector( - onTap: () { - controller.togglePlusOptions(); - }, + // 发送按钮 + GestureDetector( + onTap: () => controller.sendMessage(), child: Container( width: 44.w, height: 44.w, margin: EdgeInsets.symmetric( vertical: 2.w), decoration: BoxDecoration( - color: isDarkMode - ? Colors.grey[800] - : Colors.grey[200], + color: primaryColor, borderRadius: BorderRadius.circular(22.w), ), child: Icon( - isExpanded - ? Icons.close - : Icons.add, - color: isDarkMode - ? Colors.grey[300] - : Colors.grey[700], + Icons.send, + color: Colors.white, size: 22.sp, ), ), - ); - }); - } - }, - ), - ); - }), + ), + ], + ); + } else { + // 显示'+'选择按钮 + return Obx(() { + final isExpanded = controller + .isPlusOptionsExpanded.value; + return GestureDetector( + onTap: () { + controller.togglePlusOptions(); + }, + child: Container( + width: 44.w, + height: 44.w, + margin: EdgeInsets.symmetric( + vertical: 2.w), + decoration: BoxDecoration( + color: isDarkMode + ? Colors.grey[800] + : Colors.grey[200], + borderRadius: + BorderRadius.circular(22.w), + ), + child: Icon( + isExpanded + ? Icons.close + : Icons.add, + color: isDarkMode + ? Colors.grey[300] + : Colors.grey[700], + size: 22.sp, + ), + ), + ); + }); + } + }, + ), + ), ], ), diff --git a/lib/modules/home/views/home_view.dart b/lib/modules/home/views/home_view.dart index 7ff7eb91a..df4d421ca 100644 --- a/lib/modules/home/views/home_view.dart +++ b/lib/modules/home/views/home_view.dart @@ -740,15 +740,15 @@ class HomeView extends GetView { child: IntroStepBuilder( group: 'home', order: 3, - onHighlightWidgetTap: () { - Intro.of(Get.context!).dispose(); - controller.exploreAIFeatures(); - }, getOverlayPosition: IntroOverlayBuilder.overlayPosition, overlayBuilder: (params) { return IntroOverlayBuilder.aiBuilder( params, '太棒了！你已成功唤醒小言，接下来试试让它帮你做件事吧', + onTap: () { + params.onFinish(); + controller.exploreAIFeatures(); + }, ); }, builder: (BuildContext context, GlobalKey key) => SizedBox( diff --git a/lib/modules/permissions/controllers/permissions_controller.dart b/lib/modules/permissions/controllers/permissions_controller.dart index 73ac1b605..d9022392a 100644 --- a/lib/modules/permissions/controllers/permissions_controller.dart +++ b/lib/modules/permissions/controllers/permissions_controller.dart @@ -116,10 +116,7 @@ class PermissionsController extends GetxController { print('获取Android版本信息失败: $e'); return []; } - } else if (Platform.isIOS) { - // iOS使用基本蓝牙权限 - return [Permission.bluetooth]; - } + } return []; } diff --git a/lib/modules/permissions/models/permission_group.dart b/lib/modules/permissions/models/permission_group.dart index c3c2ca4f6..30fddf8a5 100644 --- a/lib/modules/permissions/models/permission_group.dart +++ b/lib/modules/permissions/models/permission_group.dart @@ -35,10 +35,7 @@ class PermissionGroup { print('获取Android版本信息失败: $e'); return []; } - } else if (Platform.isIOS) { - // iOS使用基本蓝牙权限 - return [Permission.bluetooth]; - } + } return []; } diff --git a/lib/modules/permissions/views/permissions_view.dart b/lib/modules/permissions/views/permissions_view.dart index abfed7de3..6e633ae81 100644 --- a/lib/modules/permissions/views/permissions_view.dart +++ b/lib/modules/permissions/views/permissions_view.dart @@ -99,9 +99,12 @@ class PermissionsView extends GetView { group.titleKey == 'alarmPermissions') { return Platform.isAndroid; } - // 蓝牙权限组：Android 12+或iOS才显示 + // 蓝牙权限组：Android 12+才显示，iOS不显示 if (group.titleKey == 'bluetoothPermissions') { - return controller.shouldShowBluetoothPermissions(); + if (Platform.isAndroid) { + return controller.shouldShowBluetoothPermissions(); + } + return false; } // 存储权限组：Android 10及以下版本或iOS才显示 if (group.titleKey == 'storagePermissions') { diff --git a/lib/modules/settings/views/settings_view.dart b/lib/modules/settings/views/settings_view.dart index c626f2e54..4220460bd 100644 --- a/lib/modules/settings/views/settings_view.dart +++ b/lib/modules/settings/views/settings_view.dart @@ -515,27 +515,27 @@ class SettingsView extends GetView { // ? Colors.white.withOpacity(0.1) // : Colors.grey[200]), //BLE测试 - _buildSimpleNavigationSetting( - title: 'opus解码测试', - subtitle: '测试opus解码', - icon: Icons.bluetooth_searching, - iconBgColor: isDarkMode - ? Colors.green[900]!.withOpacity(0.3) - : Colors.green[100]!, - iconColor: - isDarkMode ? Colors.green[300]! : Colors.green[600]!, - titleColor: isDarkMode ? Colors.white : null, - subtitleColor: isDarkMode ? Colors.white70 : null, - onTap: () { - Get.toNamed(Routes.opusTest); - }, - isDarkMode: isDarkMode, - ), - Divider( - height: 1, - color: isDarkMode - ? Colors.white.withOpacity(0.1) - : Colors.grey[200]), + // _buildSimpleNavigationSetting( + // title: 'opus解码测试', + // subtitle: '测试opus解码', + // icon: Icons.bluetooth_searching, + // iconBgColor: isDarkMode + // ? Colors.green[900]!.withOpacity(0.3) + // : Colors.green[100]!, + // iconColor: + // isDarkMode ? Colors.green[300]! : Colors.green[600]!, + // titleColor: isDarkMode ? Colors.white : null, + // subtitleColor: isDarkMode ? Colors.white70 : null, + // onTap: () { + // Get.toNamed(Routes.opusTest); + // }, + // isDarkMode: isDarkMode, + // ), + // Divider( + // height: 1, + // color: isDarkMode + // ? Colors.white.withOpacity(0.1) + // : Colors.grey[200]), // BLE测试 // _buildSimpleNavigationSetting( diff --git a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt index da4f1a166..7de405f95 100644 --- a/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt +++ b/local_plugins/agent_service/android/src/main/kotlin/com/yunqiinnovation/agent_service/AgentService.kt @@ -196,6 +196,7 @@ object AgentService : CoroutineScope { UserPortrait.initialize(appContext); //初始化定位服务 LocationService.initialize(appContext) + QQMusicSingleton.getInstance().initialize(appContext) // 设置系统提示词 val customSystemPrompt = config["systemPrompt"] as? String //保存配置 diff --git a/local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt b/local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt index 6d49ecbd5..dec6cd009 100644 --- a/local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt +++ b/local_plugins/chat_api/android/src/main/kotlin/com/yunqiinnovation/chat_api/ChatApiService.kt @@ -636,13 +636,15 @@ class ChatApiService(private val context: android.content.Context? = null) : Cor } catch (e: Exception) { Log.e(TAG, "onFunctionCallResult回调异常: ${e.message}", e) } - // 将结果发送回OpenAI继续对话 - sendFunctionCallResultInternal( - sessionid= sessionid, - messages = currentMessages, - functionCall = functionCall, - functionResult = gson.toJson(result) - ) + if (functionName != "set_user_profile_field"){ + // 将结果发送回OpenAI继续对话 + sendFunctionCallResultInternal( + sessionid= sessionid, + messages = currentMessages, + functionCall = functionCall, + functionResult = gson.toJson(result) + ) + } } } } catch (e: Exception) { diff --git a/local_plugins/chat_api/ios/chat_api/Sources/chat_api/ChatApiService.swift b/local_plugins/chat_api/ios/chat_api/Sources/chat_api/ChatApiService.swift index 524feda90..8c6a37f0f 100644 --- a/local_plugins/chat_api/ios/chat_api/Sources/chat_api/ChatApiService.swift +++ b/local_plugins/chat_api/ios/chat_api/Sources/chat_api/ChatApiService.swift @@ -524,14 +524,16 @@ getSessionCallback(sessionId)?.onFunctionCall(sessionId, jsonFunctionCall) functionCall, result ) - - // 将结果发送回OpenAI继续对话 - await self.sendFunctionCallResultInternal( - sessionId: sessionId, - messages: self.currentMessages, - functionCall: functionCall, - functionResult: self.jsonToString(result) ?? "{}" - ) + if (firstToolCall.name != "set_user_profile_field"){ + // 将结果发送回OpenAI继续对话 + await self.sendFunctionCallResultInternal( + sessionId: sessionId, + messages: self.currentMessages, + functionCall: functionCall, + functionResult: self.jsonToString(result) ?? "{}" + ) + } + } } } catch { diff --git a/local_plugins/chat_api/ios/chat_api/Sources/chat_api/MCPClient.swift b/local_plugins/chat_api/ios/chat_api/Sources/chat_api/MCPClient.swift index 85bcc05e6..5f4ad0f10 100644 --- a/local_plugins/chat_api/ios/chat_api/Sources/chat_api/MCPClient.swift +++ b/local_plugins/chat_api/ios/chat_api/Sources/chat_api/MCPClient.swift @@ -114,7 +114,7 @@ public class MCPSubClient { } private func processTools(_ toolList: [Tool]) { - tools = toolList + tools.removeAll() toolMaps.removeAll() for tool in toolList { @@ -128,7 +128,7 @@ public class MCPSubClient { "description": tool.description ?? "", "parameters": parameters ] - + tools.append(tool) toolMaps.append([ "type": "function", "function": functionMap diff --git a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicLoginManager.kt b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicLoginManager.kt index 6cee7e034..4674fca8f 100644 --- a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicLoginManager.kt +++ b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicLoginManager.kt @@ -1,6 +1,7 @@ package com.yunqiinnovation.qq_music import android.app.Activity +import android.content.Context import android.os.Bundle import android.os.Handler import android.os.Looper @@ -16,7 +17,7 @@ import org.json.JSONTokener * QQ音乐登录管理器 * 负责处理QQ音乐的登录授权流程 */ -class QQMusicLoginManager(private val activity: Activity) { +class QQMusicLoginManager(private val context: Context) { companion object { private const val TAG = "QQMusicLoginManager" @@ -53,7 +54,7 @@ class QQMusicLoginManager(private val activity: Activity) { } // 初始化绑定助手 - qPlayBindHelper = QPlayBindHelper(activity) + qPlayBindHelper = QPlayBindHelper(context) // 开始绑定QQ音乐服务 bindQQMusicService(callback) @@ -126,7 +127,7 @@ class QQMusicLoginManager(private val activity: Activity) { Log.d(TAG, "启动QQ音乐登录页面") // 启动QQ音乐登录 - CommonCmd.loginQQMusic(activity, URI_LOGIN) + CommonCmd.loginQQMusic(context, URI_LOGIN) // 等待用户登录完成后进行身份验证 handler.postDelayed({ @@ -145,9 +146,9 @@ class QQMusicLoginManager(private val activity: Activity) { val encryptString = OpenIDHelper.getEncryptString(nonce) CommonCmd.verifyCallerIdentity( - activity, + context, Config.OPENID_APPID, - activity.packageName, + context.packageName, encryptString, BASE_SCHEME ) diff --git a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt index b7851ff0c..4fdc139ef 100644 --- a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt +++ b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicManager.kt @@ -15,7 +15,7 @@ import com.tencent.qqmusic.third.api.contract.* import android.os.Handler import android.os.Looper -class QQMusicManager(private val activity: Activity) { +class QQMusicManager(private val context: Context) { companion object { const val TAG = "QQMusicManager" } @@ -123,18 +123,18 @@ class QQMusicManager(private val activity: Activity) { Log.d(TAG, "绑定Intent: action=${intent.action}, package=${intent.`package`}") try { - val bindResult = activity.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE) + val bindResult = context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE) Log.d(TAG, "bindService结果: $bindResult") if (!bindResult) { Log.e(TAG, "绑定QQ音乐服务失败，尝试启动QQ音乐进程") // 尝试启动QQ音乐进程 - CommonCmd.startQQMusicProcess(activity, activity.packageName) + CommonCmd.startQQMusicProcess(context, context.packageName) // 延迟重试绑定 Handler(Looper.getMainLooper()).postDelayed({ Log.d(TAG, "重试绑定QQ音乐服务") - activity.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE) + context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE) }, 2000) } } catch (e: Exception) { @@ -657,7 +657,7 @@ class QQMusicManager(private val activity: Activity) { fun cleanup() { try { if (isBindQQMusicService) { - activity.unbindService(serviceConnection) + context.unbindService(serviceConnection) isBindQQMusicService = false Log.d(TAG, "QQ音乐服务已解绑") } diff --git a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt index 6cd6de9de..9aad96445 100644 --- a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt +++ b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QQMusicSingleton.kt @@ -39,7 +39,7 @@ class QQMusicSingleton private constructor() { } } - private var activity: Activity? = null + private var context: Context? = null private var loginManager: QQMusicLoginManager? = null private var musicManager: QQMusicManager? = null private val handler = Handler(Looper.getMainLooper()) @@ -51,9 +51,9 @@ class QQMusicSingleton private constructor() { /** * 初始化单例，设置Activity上下文 */ - fun initialize(activity: Activity) { - this.activity = activity - this.sharedPreferences = activity.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) + fun initialize(context: Context) { + this.context = context + this.sharedPreferences = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) loadSavedLoginInfo() Log.d(TAG, "QQ音乐单例初始化完成") } @@ -72,7 +72,7 @@ class QQMusicSingleton private constructor() { } return try { - this.activity?.packageManager?.getPackageInfo(packageName, 0) + this.context?.packageManager?.getPackageInfo(packageName, 0) Log.d(TAG, "QQ音乐app已安装: $packageName") true } catch (e: PackageManager.NameNotFoundException) { @@ -113,7 +113,7 @@ class QQMusicSingleton private constructor() { callback(Result.failure(Exception("未安装QQ音乐软件，请先安装QQ音乐软件"))) return } - val currentActivity = activity + val currentActivity = context // 先检查是否已经登录且未过期 if (isLoggedIn()) { Log.d(TAG, "用户已登录且未过期，直接返回登录信息") @@ -159,7 +159,7 @@ class QQMusicSingleton private constructor() { callback(Result.failure(Exception("未安装QQ音乐软件，请先安装QQ音乐软件"))) return } - val currentActivity = activity + val currentActivity = context // 先检查是否已经登录且未过期 if (isLoggedIn()) { @@ -206,7 +206,7 @@ class QQMusicSingleton private constructor() { retryCount: Int, callback: (Result>>) -> Unit ) { - val currentActivity = activity + val currentActivity = context if (currentActivity == null) { callback(Result.failure(Exception("Activity not available"))) return @@ -240,7 +240,7 @@ class QQMusicSingleton private constructor() { retryCount: Int, callback: (Result>>) -> Unit ) { - val currentActivity = activity ?: return + val currentActivity = context ?: return val searchKey = "${keyword}_${System.currentTimeMillis()}" var completed = false @@ -336,7 +336,7 @@ class QQMusicSingleton private constructor() { index: Int, callback: (Result) -> Unit ) { - val currentActivity = activity + val currentActivity = context if (currentActivity == null) { callback(Result.failure(Exception("Activity not available"))) return @@ -369,7 +369,7 @@ class QQMusicSingleton private constructor() { index: Int, callback: (Result) -> Unit ) { - val currentActivity = activity ?: return + val currentActivity = context ?: return ensureMusicManager(currentActivity) musicManager?.playSongs(songMids, index, object : QQMusicManager.PlayCallback { @@ -481,7 +481,7 @@ class QQMusicSingleton private constructor() { * 获取播放时间 */ fun getPlayTime(callback: (Result) -> Unit) { - val currentActivity = activity + val currentActivity = context if (currentActivity == null) { callback(Result.failure(Exception("Activity not available"))) return @@ -512,13 +512,13 @@ class QQMusicSingleton private constructor() { * 同步当前播放信息 - 统一接口 */ fun syncCurrentPlayInfo(callback: (Result>) -> Unit) { - val currentActivity = activity - if (currentActivity == null) { + val currentcontext = context + if (currentcontext == null) { callback(Result.failure(Exception("Activity not available"))) return } - ensureMusicManager(currentActivity) + ensureMusicManager(currentcontext) musicManager?.syncCurrentPlayInfo(object : QQMusicManager.InfoCallback { override fun onSuccess(data: Map) { handler.post { @@ -549,7 +549,7 @@ class QQMusicSingleton private constructor() { loginManager = null musicManager?.cleanup() musicManager = null - activity = null + context = null Log.d(TAG, "QQ音乐单例资源清理完成") } @@ -598,9 +598,9 @@ class QQMusicSingleton private constructor() { } // 私有辅助方法 - private fun ensureMusicManager(activity: Activity) { + private fun ensureMusicManager(context: Context) { if (musicManager == null) { - musicManager = QQMusicManager(activity) + musicManager = QQMusicManager(context) } } @@ -609,7 +609,7 @@ class QQMusicSingleton private constructor() { action: (QQMusicManager, QQMusicManager.PlayCallback) -> Unit ): (callback: (Result) -> Unit) -> Unit { return lambda@{ callback -> - val currentActivity = activity + val currentActivity = context if (currentActivity == null) { callback(Result.failure(Exception("Activity not available"))) return@lambda @@ -639,13 +639,13 @@ class QQMusicSingleton private constructor() { action: (QQMusicManager, QQMusicManager.InfoCallback) -> Unit ): (callback: (Result>) -> Unit) -> Unit { return lambda@{ callback -> - val currentActivity = activity - if (currentActivity == null) { + val currentcontext = context + if (currentcontext == null) { callback(Result.failure(Exception("Activity not available"))) return@lambda } - ensureMusicManager(currentActivity) + ensureMusicManager(currentcontext) action(musicManager!!, object : QQMusicManager.InfoCallback { override fun onSuccess(data: Map) { handler.post { diff --git a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QqMusicPlugin.kt b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QqMusicPlugin.kt index 9c9cd8e26..62f8c40a2 100644 --- a/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QqMusicPlugin.kt +++ b/local_plugins/qq_music/android/src/main/kotlin/com/yunqiinnovation/qq_music/QqMusicPlugin.kt @@ -42,7 +42,7 @@ class QqMusicPlugin: FlutterPlugin, MethodCallHandler, ActivityAware { Log.d("QqMusicPlugin", "onAttachedToActivity called") activity = binding.activity println("QQ音乐 onAttachedToActivity") - qqMusicSingleton.initialize(activity!!) +// qqMusicSingleton.initialize(activity!!) Log.d("QqMusicPlugin", "qqMusicSingleton.initialize completed") } diff --git a/pubspec.yaml b/pubspec.yaml index 329b96551..b5b804f1f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: voitrans description: "Voitrans - AI Voice Assistant." publish_to: "none" -version: 1.0.8+20 +version: 1.0.10+20 environment: sdk: ">=3.3.0 <4.0.0" @@ -62,8 +62,8 @@ dependencies: app_settings: 5.2.0 fluwx: ^5.7.1 url_launcher: ^6.3.1 - firebase_core: ^3.12.1 - firebase_auth: ^5.5.1 + firebase_core: ^4.0.0 + firebase_auth: ^6.0.1 google_sign_in: ^6.2.2 flutter_facebook_auth: ^7.1.1 sign_in_with_apple: ^7.0.1