From 0bcc9ab1cc4558702d7fb9cbba78900ac01e7ca5 Mon Sep 17 00:00:00 2001 From: lxm <1274844347@qq.com> Date: Mon, 18 Aug 2025 20:23:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=BA=E9=80=9A=E8=BF=87=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=AE=9E=E8=A1=8C=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile | 49 +--- ios/Runner.xcodeproj/project.pbxproj | 258 +++++++----------- .../chat_api/ios/chat_api/Package.swift | 2 +- 3 files changed, 97 insertions(+), 212 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 9591f8465..520fdef83 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,10 +1,10 @@ -# Define a global platform for your project +# Uncomment this line to 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, @@ -28,7 +28,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup - target 'Runner' do use_frameworks! @@ -41,49 +40,5 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) - - # Ensure all pods use the same iOS deployment target - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0' - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ - '$(inherited)', - - ## dart: PermissionGroup.microphone - 'PERMISSION_MICROPHONE=1', - - ## dart: PermissionGroup.notification - 'PERMISSION_NOTIFICATIONS=1', - - ## dart: PermissionGroup.calendar - 'PERMISSION_EVENTS=1', - - ## dart: PermissionGroup.calendarFullAccess - 'PERMISSION_EVENTS_FULL_ACCESS=1', - - 'PERMISSION_LOCATION=1', - 'PERMISSION_LOCATION_WHENINUSE=0', - - ## dart: PermissionGroup.bluetooth - 'PERMISSION_BLUETOOTH=1', - ] - - # 禁用用户跟踪相关功能 - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'FBSDK_DISABLE_IDFA=1' - - # 移除可能的用户跟踪权限描述 - if target.name == 'Runner' - # 确保不包含NSUserTrackingUsageDescription - config.build_settings.delete('NSUserTrackingUsageDescription') - end - end - - # 针对Facebook SDK禁用广告ID收集 - if target.name.start_with?('FBSDKCoreKit') || target.name.start_with?('FacebookSDK') - target.build_configurations.each do |config| - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)'] - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'FBSDK_DISABLE_IDFA=1' - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'FBSDK_DISABLE_AUTO_LOG_APP_EVENTS=1' - end - end end end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 6d64fb0f1..256cf2b17 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,17 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 0AD944122DD9DB5C00557D21 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0AD944112DD9DB5C00557D21 /* GoogleService-Info.plist */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 1889933F4EEF956A7B6F5B09 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08E74CE6BE67CAB3E9B339F5 /* Pods_RunnerTests.framework */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74646C9D0269E604AD3F2BEC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 377B7A63D079C4E107807D0D /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; - 93D73EC48D95512F5F541AD7 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 162D67C21ED243BA396CEF5C /* Pods_RunnerTests.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - CBE786ED7A0DB415954B1BA4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFDA2C0DD7A7D82CA03799B2 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,21 +43,21 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0AD944112DD9DB5C00557D21 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + 06BC4614E1CA26B931FEE1B1 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 082F126E21F544E8D1A57DA2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 08E74CE6BE67CAB3E9B339F5 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 162D67C21ED243BA396CEF5C /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 280769B5B4FB941FA7D35C06 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 2C91016A31D6647548E59DC8 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 377B7A63D079C4E107807D0D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 46859C536D3D0051CC82E6C5 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; - 4852C04805E85DB32D31EEC2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 7336E2A88D5EBED0ABF7F787 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 76274BCD123CDD5AF172875F /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8872A1769E818A3887961ADC /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + 93F2596A3642DC8C74A148C9 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -66,60 +65,51 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CD9846946CA680DD2E0721FA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - D2958658C06A5ADF62D6ABA2 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - EFDA2C0DD7A7D82CA03799B2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B5FEF56387DBFB10CC1EDB1D /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; + F34ED885B6F8E61C40D16ACF /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 26E6940F4E2BCA2DFEFB0078 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, - CBE786ED7A0DB415954B1BA4 /* Pods_Runner.framework in Frameworks */, + 1889933F4EEF956A7B6F5B09 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - B3515CD9628E3332AFC88CD4 /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 93D73EC48D95512F5F541AD7 /* Pods_RunnerTests.framework in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + 74646C9D0269E604AD3F2BEC /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1ACB686EC7DC36C6E33D372F /* Pods */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - CD9846946CA680DD2E0721FA /* Pods-Runner.debug.xcconfig */, - 4852C04805E85DB32D31EEC2 /* Pods-Runner.release.xcconfig */, - 280769B5B4FB941FA7D35C06 /* Pods-Runner.profile.xcconfig */, - 46859C536D3D0051CC82E6C5 /* Pods-RunnerTests.debug.xcconfig */, - 76274BCD123CDD5AF172875F /* Pods-RunnerTests.release.xcconfig */, - 2C91016A31D6647548E59DC8 /* Pods-RunnerTests.profile.xcconfig */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - path = Pods; + path = RunnerTests; sourceTree = ""; }; - 1E5DDD8701F6FB27AA502080 /* Frameworks */ = { + 7B4CE5438253025F50DA0F3D /* Pods */ = { isa = PBXGroup; children = ( - EFDA2C0DD7A7D82CA03799B2 /* Pods_Runner.framework */, - 162D67C21ED243BA396CEF5C /* Pods_RunnerTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; + 082F126E21F544E8D1A57DA2 /* Pods-Runner.debug.xcconfig */, + 7336E2A88D5EBED0ABF7F787 /* Pods-Runner.release.xcconfig */, + 06BC4614E1CA26B931FEE1B1 /* Pods-Runner.profile.xcconfig */, + F34ED885B6F8E61C40D16ACF /* Pods-RunnerTests.debug.xcconfig */, + 93F2596A3642DC8C74A148C9 /* Pods-RunnerTests.release.xcconfig */, + 8872A1769E818A3887961ADC /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -140,8 +130,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 1ACB686EC7DC36C6E33D372F /* Pods */, - 1E5DDD8701F6FB27AA502080 /* Frameworks */, + 7B4CE5438253025F50DA0F3D /* Pods */, + BA5348C5B19199F79DB04D17 /* Frameworks */, ); sourceTree = ""; }; @@ -157,7 +147,6 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 0AD944112DD9DB5C00557D21 /* GoogleService-Info.plist */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -166,11 +155,20 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - D2958658C06A5ADF62D6ABA2 /* Runner.entitlements */, + B5FEF56387DBFB10CC1EDB1D /* Runner.entitlements */, ); path = Runner; sourceTree = ""; }; + BA5348C5B19199F79DB04D17 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 377B7A63D079C4E107807D0D /* Pods_Runner.framework */, + 08E74CE6BE67CAB3E9B339F5 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -178,10 +176,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - C9BCBB2ED2D63153791BA331 /* [CP] Check Pods Manifest.lock */, + C5CCB291C907E3CFCE6E8EB4 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - B3515CD9628E3332AFC88CD4 /* Frameworks */, + 26E6940F4E2BCA2DFEFB0078 /* Frameworks */, ); buildRules = ( ); @@ -197,16 +195,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - C8A928FCC4E7B91E60992CB3 /* [CP] Check Pods Manifest.lock */, + E6B74CD49F997F3C4D394D5F /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 0AD9449B2DE6F89600557D21 /* Remove Bitcode from YbridOpus */, - 7983395BAD15A5F148B66817 /* [CP] Embed Pods Frameworks */, - 2F4CC5CCDA87D20DF15BA3FF /* [CP] Copy Pods Resources */, + CBA79F5B749D9573DC8EC148 /* [CP] Embed Pods Frameworks */, + AF8013267D25E6F6BAB96D3D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -250,8 +247,7 @@ ); mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, - D013B7972DFA83E400B2B69B /* XCRemoteSwiftPackageReference "flutterfire" */, + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; @@ -277,7 +273,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 0AD944122DD9DB5C00557D21 /* GoogleService-Info.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -286,112 +281,94 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0AD9449B2DE6F89600557D21 /* Remove Bitcode from YbridOpus */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "Remove Bitcode from YbridOpus"; - outputFileListPaths = ( - ); + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# 移除YbridOpus框架中的bitcode\necho \"检查并移除YbridOpus框架中的bitcode...\"\n\nFRAMEWORK_PATHS=(\n \"${PODS_ROOT}/YbridOpus/YbridOpus.xcframework/ios-arm64_armv7/YbridOpus.framework/YbridOpus\"\n \"${PODS_ROOT}/YbridOpus/YbridOpus.xcframework/ios-i386_x86_64-simulator/YbridOpus.framework/YbridOpus\"\n \"${PODS_ROOT}/YbridOpus/YbridOpus.xcframework/ios-arm64_x86_64-maccatalyst/YbridOpus.framework/YbridOpus\"\n \"${PODS_ROOT}/YbridOpus/YbridOpus.xcframework/macos-arm64_x86_64/YbridOpus.framework/YbridOpus\"\n)\n\nfor framework_path in \"${FRAMEWORK_PATHS[@]}\"; do\n if [ -f \"$framework_path\" ]; then\n if otool -l \"$framework_path\" | grep -q __LLVM; then\n echo \"移除bitcode: $framework_path\"\n # 直接覆盖，不创建备份\n xcrun bitcode_strip -r \"$framework_path\" -o \"$framework_path.tmp\"\n mv \"$framework_path.tmp\" \"$framework_path\"\n fi\n fi\ndone\n\n# 清理任何可能的备份文件\nfind \"${PODS_ROOT}\" -name \"*.backup\" -type f -delete 2>/dev/null || true\nfind \"${BUILT_PRODUCTS_DIR}\" -name \"*.backup\" -type f -delete 2>/dev/null || true\n\necho \"bitcode移除和清理完成！\""; - }; - 2F4CC5CCDA87D20DF15BA3FF /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "Thin Binary"; + name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 7983395BAD15A5F148B66817 /* [CP] Embed Pods Frameworks */ = { + AF8013267D25E6F6BAB96D3D /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + C5CCB291C907E3CFCE6E8EB4 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Run Script"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - C8A928FCC4E7B91E60992CB3 /* [CP] Check Pods Manifest.lock */ = { + CBA79F5B749D9573DC8EC148 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - C9BCBB2ED2D63153791BA331 /* [CP] Check Pods Manifest.lock */ = { + E6B74CD49F997F3C4D394D5F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -406,7 +383,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -487,7 +464,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -507,12 +483,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; - NEW_SETTING = ""; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Profile; @@ -524,41 +499,31 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = K39FB49XKY; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Deep Voice"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_NAME = "$(TARGET_NAME)"; - REGISTER_APP_GROUPS = NO; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 46859C536D3D0051CC82E6C5 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = F34ED885B6F8E61C40D16ACF /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 537SFY28XS; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -571,14 +536,12 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 76274BCD123CDD5AF172875F /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 93F2596A3642DC8C74A148C9 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = K39FB49XKY; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -589,14 +552,12 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2C91016A31D6647548E59DC8 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 8872A1769E818A3887961ADC /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = K39FB49XKY; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -629,7 +590,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -655,12 +615,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; - NEW_SETTING = ""; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -688,7 +647,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -708,14 +666,13 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; - NEW_SETTING = ""; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -727,28 +684,20 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = K39FB49XKY; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Deep Voice"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_NAME = "$(TARGET_NAME)"; - REGISTER_APP_GROUPS = NO; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -760,27 +709,19 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = K39FB49XKY; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Deep Voice"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.saitong.voitrans; PRODUCT_NAME = "$(TARGET_NAME)"; - REGISTER_APP_GROUPS = NO; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; - SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -821,23 +762,12 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { isa = XCLocalSwiftPackageReference; relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; }; /* End XCLocalSwiftPackageReference section */ -/* Begin XCRemoteSwiftPackageReference section */ - D013B7972DFA83E400B2B69B /* XCRemoteSwiftPackageReference "flutterfire" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/flutterfire"; - requirement = { - branch = main; - kind = branch; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { isa = XCSwiftPackageProductDependency; diff --git a/local_plugins/chat_api/ios/chat_api/Package.swift b/local_plugins/chat_api/ios/chat_api/Package.swift index 8f7b3378a..6772cc3c9 100644 --- a/local_plugins/chat_api/ios/chat_api/Package.swift +++ b/local_plugins/chat_api/ios/chat_api/Package.swift @@ -13,7 +13,7 @@ let package = Package( .library(name: "chat-api", targets: ["chat_api"]) ], dependencies: [ - .package(url: "https://github.com/MacPaw/OpenAI.git", from: "0.4.3"), + .package(url: "https://github.com/MacPaw/OpenAI.git", exact: "0.4.3"), .package(url: "https://github.com/modelcontextprotocol/swift-sdk.git", from: "0.9.0"), .package(path: "../../../location_service/ios/location_service"), .package(path: "../../../qq_music/ios/qq_music"), From 1d91aaaabb8e70418e07ca75ff07da52b43f083e Mon Sep 17 00:00:00 2001 From: fdp <1286779656@qq.com> Date: Thu, 21 Aug 2025 20:31:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BD=95=E9=9F=B3?= =?UTF-8?q?=E9=9F=B3=E6=B3=A2=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../azure_speech/tools/SimpleAudioReceiver.kt | 3 +- .../azure_speech/AzureSpeechPlugin.swift | 376 ++++++++++-------- .../Sources/tools/SimpleAudioReceiver.swift | 6 +- 3 files changed, 227 insertions(+), 158 deletions(-) diff --git a/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/tools/SimpleAudioReceiver.kt b/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/tools/SimpleAudioReceiver.kt index 8da18ef18..c754e2e05 100644 --- a/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/tools/SimpleAudioReceiver.kt +++ b/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/tools/SimpleAudioReceiver.kt @@ -145,8 +145,9 @@ class SimpleAudioReceiver(private val context: Context) { } pushAudioStream?.write(finalData) - + if(recordfile!=null){ recordfile?.saveAudioDataToWav(finalData) + } } catch (e: Exception) { Log.e(TAG, "写入失败: ${e.message}") diff --git a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift index 7633701aa..f807e96db 100644 --- a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift +++ b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift @@ -20,16 +20,40 @@ import ble_service // 日志对象 private let log = OSLog(subsystem: "com.azure.speech", category: "AzureSpeechPlugin") + // 替换原有的 StreamHandler 类 +private typealias AsrEventStreamHandler = BaseEventStreamHandler +private typealias TtsEventStreamHandler = BaseEventStreamHandler +private typealias AudioDataEventStreamHandler = BaseEventStreamHandler +private typealias AstEventStreamHandler = BaseEventStreamHandler + + + // 事件类型枚举 + public enum EventType { + case asr + case tts + case audioData + case ast + } + /** + * 通道配置结构体 + */ + private struct ChannelConfig { + let methodChannelName: String + let eventChannelName: String + let eventType: EventType + let methodHandler: (FlutterMethodCall, @escaping FlutterResult) -> Void + } + // ASR相关 private var asrChannel: FlutterMethodChannel? private var asrEventChannel: FlutterEventChannel? - private var asrEventSink: FlutterEventSink? + internal var asrEventSink: FlutterEventSink? private let azureAsrHelper = AzureAsrHelper() // TTS相关 private var ttsChannel: FlutterMethodChannel? private var ttsEventChannel: FlutterEventChannel? - private var ttsEventSink: FlutterEventSink? + internal var ttsEventSink: FlutterEventSink? private let azureTtsHelper = AzureTtsHelper() // 是否已添加TTS事件监听器 @@ -37,98 +61,152 @@ import ble_service // AST相关 private var astChannel: FlutterMethodChannel? private var astEventChannel: FlutterEventChannel? + internal var astEventSink: FlutterEventSink? private let azureAstHelper = IntegratedSpeechTranslationService() + + // 音频数据相关 + private var audioDataEventChannel: FlutterEventChannel? + internal var audioDataEventSink: FlutterEventSink? + + + // 创建事件回调 private var astEventCallback: AstEventCallback? // 是否已添加AST事件监听器 private var isAstListenerAdded = false - + // 当前的连续识别回调 private var currentAsrCallback: AsrCallbackWrapper? - // 插件注册 - public static func register(with registrar: FlutterPluginRegistrar) { - let instance = AzureSpeechPlugin() - // 2. 初始化BleService并注册回调 - BleService.shared.addCallback(instance) - - // 初始化ASR通道 - let asrChannel = FlutterMethodChannel(name: "azure_speech/asr", binaryMessenger: registrar.messenger()) - registrar.addMethodCallDelegate(instance, channel: asrChannel) - instance.asrChannel = asrChannel - - // 设置ASR通道处理器 - 使用实例方法 - asrChannel.setMethodCallHandler { [weak instance] (call, result) in - instance?.handleAsrMethodCall(call, result: result) + // 添加音频数据回调实例作为类属性 + private lazy var audioDataCallback: AudioDataCallbackImpl = { + return AudioDataCallbackImpl { [weak self] data in + self?.handleAudioData(data) } - - // 初始化TTS通道 - let ttsChannel = FlutterMethodChannel(name: "azure_speech/tts", binaryMessenger: registrar.messenger()) - registrar.addMethodCallDelegate(instance, channel: ttsChannel) - instance.ttsChannel = ttsChannel - - // 设置TTS通道处理器 - 使用实例方法 - ttsChannel.setMethodCallHandler { [weak instance] (call, result) in - instance?.handleTtsMethodCall(call, result: result) + }() + + + /** + * 初始化通道的通用方法 + * @param registrar Flutter插件注册器 + * @param config 通道配置 + */ + private func setupChannel(registrar: FlutterPluginRegistrar, config: ChannelConfig) { + // 初始化方法通道 + let methodChannel = FlutterMethodChannel(name: config.methodChannelName, binaryMessenger: registrar.messenger()) + methodChannel.setMethodCallHandler { [weak self] (call, result) in + config.methodHandler(call, result) } + // 初始化事件通道 + let eventChannel = FlutterEventChannel(name: config.eventChannelName, binaryMessenger: registrar.messenger()) + eventChannel.setStreamHandler(BaseEventStreamHandler(instance: self, eventType: config.eventType)) - // 初始化AST通道 - let astChannel = FlutterMethodChannel(name: "azure_speech/ast", binaryMessenger: registrar.messenger()) - registrar.addMethodCallDelegate(instance, channel: astChannel) - instance.astChannel = astChannel - - // 设置AST通道处理器 - 使用实例方法 - astChannel.setMethodCallHandler { [weak instance] (call, result) in - instance?.handleAstMethodCall(call, result: result) + // 保存通道引用 + switch config.eventType { + case .asr: + self.asrChannel = methodChannel + self.asrEventChannel = eventChannel + case .tts: + self.ttsChannel = methodChannel + self.ttsEventChannel = eventChannel + case .audioData: + self.audioDataEventChannel = eventChannel + case .ast: + self.astChannel = methodChannel + self.astEventChannel = eventChannel } - - // 初始化ASR事件通道 - let asrEventChannel = FlutterEventChannel(name: "azure_speech/asr_events", binaryMessenger: registrar.messenger()) - asrEventChannel.setStreamHandler(instance) - instance.asrEventChannel = asrEventChannel - - // 初始化TTS事件通道 - let ttsEventChannel = FlutterEventChannel(name: "azure_speech/tts_events", binaryMessenger: registrar.messenger()) - ttsEventChannel.setStreamHandler(instance) - instance.ttsEventChannel = ttsEventChannel - - // 初始化TTS事件通道 - let astEventChannel = FlutterEventChannel(name: "azure_speech/asr_events", binaryMessenger: registrar.messenger()) - astEventChannel.setStreamHandler(instance) - instance.astEventChannel = astEventChannel - - - } - // 发送ASR事件方法 - internal func sendAsrEvent(_ event: [String: Any]) { - if asrEventSink == nil { - os_log("无法发送ASR事件：事件通道未准备好", log: log, type: .error) - return - } - - DispatchQueue.main.async { [weak self] in - guard let self = self else { return } - self.asrEventSink?(event) - } + /** + * 统一的事件发送方法 + * @param event 事件数据 + * @param type 事件类型 + */ +private func sendEvent(_ event: [String: Any], type: EventType) { + let eventSink: FlutterEventSink? + let logMessage: String + + switch type { + case .asr: + eventSink = asrEventSink + logMessage = "无法发送ASR事件：事件通道未准备好" + case .tts: + eventSink = ttsEventSink + logMessage = "无法发送TTS事件：事件通道未准备好" + case .audioData: + eventSink = audioDataEventSink + logMessage = "无法发送音频数据事件：事件通道未准备好" + case .ast: + eventSink = astEventSink + logMessage = "无法发送AST事件：事件通道未准备好" } - // 发送TTS事件方法 - private func sendTtsEvent(_ event: [String: Any]) { - if ttsEventSink == nil { - os_log("无法发送TTS事件：事件通道未准备好", log: log, type: .error) - return - } + guard eventSink != nil else { + os_log("%@", log: log, type: .error, logMessage) + return + } + + DispatchQueue.main.async { [weak self] in + guard let self = self else { return } + eventSink?(event) + } +} + // 插件注册 + public static func register(with registrar: FlutterPluginRegistrar) { + let instance = AzureSpeechPlugin() + BleService.shared.addCallback(instance) - DispatchQueue.main.async { [weak self] in - guard let self = self else { return } - self.ttsEventSink?(event) + // 配置所有通道 + let channelConfigs = [ + ChannelConfig( + methodChannelName: "azure_speech/asr", + eventChannelName: "azure_speech/asr_events", + eventType: .asr, + methodHandler: instance.handleAsrMethodCall + ), + ChannelConfig( + methodChannelName: "azure_speech/tts", + eventChannelName: "azure_speech/tts_events", + eventType: .tts, + methodHandler: instance.handleTtsMethodCall + ), + ChannelConfig( + methodChannelName: "azure_speech/ast", + eventChannelName: "azure_speech/ast_events", + eventType: .ast, + methodHandler: instance.handleAstMethodCall + ) + ] + + // 批量初始化通道 + for config in channelConfigs { + instance.setupChannel(registrar: registrar, config: config) } + + // 单独处理音频数据事件通道（只有事件通道） + let audioDataEventChannel = FlutterEventChannel(name: "azure_speech/audio_data_events", binaryMessenger: registrar.messenger()) + audioDataEventChannel.setStreamHandler(BaseEventStreamHandler(instance: instance, eventType: .audioData)) + instance.audioDataEventChannel = audioDataEventChannel } - + +// 简化的事件发送方法 +internal func sendAsrEvent(_ event: [String: Any]) { + sendEvent(event, type: .asr) +} + +private func sendTtsEvent(_ event: [String: Any]) { + sendEvent(event, type: .tts) +} + +private func sendAudioDataEvent(_ event: [String: Any]) { + sendEvent(event, type: .audioData) +} + +private func sendAstEvent(_ event: [String: Any]) { + sendEvent(event, type: .ast) +} // 设置TTS事件监听器 - private func setupTtsEventListener() { + internal func setupTtsEventListener() { if !isTtsListenerAdded { azureTtsHelper.addListener(self) isTtsListenerAdded = true @@ -136,18 +214,25 @@ import ble_service } - // // 处理Flutter方法调用 - // public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { - // switch call.method { - // case "azure_speech/asr": - // handleAsrMethodCall(call, result) - // case "azure_speech/tts": - // handleTtsMethodCall(call, result) - // default: - // // 处理未识别的通道 - // result(FlutterMethodNotImplemented) - // } - // } + /** + * 处理音频数据 + * @param data 音频数据 + */ + private func handleAudioData(_ data: Data) { + guard audioDataEventSink != nil else { + print("音频数据事件通道未准备好") + return + } + + let eventMap: [String: Any] = [ + "type": "audioData", + "data": FlutterStandardTypedData(bytes: data), + "timestamp": Int(Date().timeIntervalSince1970 * 1000), + "size": data.count + ] + print("音频数据大小: \(data.count)") + sendAudioDataEvent(eventMap) + } // MARK: - ASR 方法处理 @@ -299,19 +384,8 @@ import ble_service do { if acceptAudioData { - // 创建音频数据回调实现类 - let audioCallback = AudioDataCallbackImpl { [weak self] audioData in - // 构建音频数据事件映射 - let audioEvent: [String: Any] = [ - "type": "audioData", - "data": audioData, - "timestamp": Date().timeIntervalSince1970 * 1000, - "size": audioData.count - ] - // 发送音频数据事件到 Flutter 层 - self?.sendAsrEvent(audioEvent) - } - try azureAsrHelper.enableRecord(filePath: filePath, audioDataCallback: audioCallback) + // 使用复用的音频数据回调实例 + try azureAsrHelper.enableRecord(filePath: filePath, audioDataCallback: audioDataCallback) } else { try azureAsrHelper.enableRecord(filePath: filePath) } @@ -325,9 +399,10 @@ import ble_service case "pauseRecord": azureAsrHelper.pauseRecord() result(true) - // case "resumeRecord": - // azureAsrHelper.resumeRecord() - // result(true) + + case "resumeRecord": + azureAsrHelper.resumeRecord() + result(true) case "stopRecord": guard let args = call.arguments as? [String: Any], @@ -851,57 +926,60 @@ extension AzureSpeechPlugin: BleService.Callback { public func onDeviceInfoReceived(infoType: Int, infoData: [String: Any]) { } } -// MARK: - 事件处理 -extension AzureSpeechPlugin: FlutterStreamHandler { - public func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? { - // 根据通道类型设置事件接收器 - if let args = arguments as? [String: Any], - let channel = args["channel"] as? String { - - if channel == "asr" { - asrEventSink = events - } else if channel == "tts" { - ttsEventSink = events - setupTtsEventListener() - } - } else if arguments == nil { - // 如果没有指定通道，尝试弄清楚是哪个通道在监听 - if asrEventSink == nil && ttsEventSink != nil { - asrEventSink = events - } else if asrEventSink != nil && ttsEventSink == nil { - ttsEventSink = events - setupTtsEventListener() - } else { - // 无法确定哪个通道，默认设置为ASR - asrEventSink = events - } +/** + * 通用事件流处理器基类 + */ +private class BaseEventStreamHandler: NSObject, FlutterStreamHandler { + private weak var instance: AzureSpeechPlugin? + private let eventType: AzureSpeechPlugin.EventType + + /** + * 初始化事件流处理器 + * @param instance AzureSpeechPlugin实例 + * @param eventType 事件类型 + */ + init(instance: AzureSpeechPlugin, eventType: AzureSpeechPlugin.EventType) { + self.instance = instance + self.eventType = eventType + super.init() + } + + func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? { + switch eventType { + case .asr: + instance?.asrEventSink = events + case .tts: + instance?.ttsEventSink = events + instance?.setupTtsEventListener() + case .audioData: + instance?.audioDataEventSink = events + print("音频数据事件通道已准备好") + case .ast: + instance?.astEventSink = events } - return nil } - public func onCancel(withArguments arguments: Any?) -> FlutterError? { - // 根据通道类型清除事件接收器 - if let args = arguments as? [String: Any], - let channel = args["channel"] as? String { - - if channel == "asr" { - asrEventSink = nil - } else if channel == "tts" { - ttsEventSink = nil - } - } else { - // 如果没有指定通道，清除所有通道 - asrEventSink = nil - ttsEventSink = nil + func onCancel(withArguments arguments: Any?) -> FlutterError? { + switch eventType { + case .asr: + instance?.asrEventSink = nil + case .tts: + instance?.ttsEventSink = nil + case .audioData: + instance?.audioDataEventSink = nil + print("音频数据事件通道已取消") + case .ast: + instance?.astEventSink = nil } - return nil } } + + // MARK: - TTS 事件监听实现 extension AzureSpeechPlugin: TtsEventListener { // 使用@objc特性为方法提供一个不同的Objective-C选择器名称 @@ -942,19 +1020,6 @@ extension AzureSpeechPlugin: TtsEventListener { } } -// MARK: - 音频数据监听实现 -extension AzureSpeechPlugin: AudioDataListener { - public func onAudioData(_ data: Data) { - if ttsEventSink == nil { return } - - let eventMap: [String: Any] = [ - "type": "audio_data", - "data": FlutterStandardTypedData(bytes: data) - ] - - sendTtsEvent(eventMap) - } -} // MARK: - 音频数据回调实现 @@ -978,6 +1043,7 @@ private class AudioDataCallbackImpl: SimpleAudioReceiver.AudioDataCallback { * @param data 音频数据 */ func onAudio(_ data: Data) { + print("音频数据回调方法: \(data.count)") callback(data) } } diff --git a/local_plugins/azure_speech/ios/azure_speech/Sources/tools/SimpleAudioReceiver.swift b/local_plugins/azure_speech/ios/azure_speech/Sources/tools/SimpleAudioReceiver.swift index f9900b3b2..0cf7951ae 100644 --- a/local_plugins/azure_speech/ios/azure_speech/Sources/tools/SimpleAudioReceiver.swift +++ b/local_plugins/azure_speech/ios/azure_speech/Sources/tools/SimpleAudioReceiver.swift @@ -140,8 +140,10 @@ public class SimpleAudioReceiver: NSObject { guard let dataToWrite = self.writeQueue.take() else { continue } do { - if let callback = self.audioDataCallback { - callback.onAudio(dataToWrite) + + if self.audioDataCallback != nil { + print("写入数据长度: \(dataToWrite.count)") + self.audioDataCallback!.onAudio(dataToWrite) } try self.pushAudioStream?.write(dataToWrite) if self.recordfile != nil { From b516385ac58cf27636445f5ebdb5c873f4da1ba6 Mon Sep 17 00:00:00 2001 From: fdp <1286779656@qq.com> Date: Thu, 21 Aug 2025 20:51:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=AF=9D?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IntegratedSpeechTranslationService.swift | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/IntegratedSpeechTranslationService.swift b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/IntegratedSpeechTranslationService.swift index 538a5b66e..cd0269c34 100644 --- a/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/IntegratedSpeechTranslationService.swift +++ b/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/IntegratedSpeechTranslationService.swift @@ -485,22 +485,13 @@ import os.log // 合成进行中事件 - 修改为返回音频数据 synthesizer?.addSynthesizingEventHandler { [weak self] (synthesizer, event) in guard let self = self else { return } - - // 安全解包audioData + // 安全解包audioData guard let audioData = event.result.audioData else { os_log("合成进行中事件，音频数据为空", log: self.log, type: .debug) return } - - os_log("合成进行中事件，音频数据长度: %d bytes", log: self.log, type: .debug, audioData.count) - + os_log("合成进行中事件，音频数据长度: %d bytes", log: self.log, type: .debug, audioData.count) - - DispatchQueue.main.async { - - // 立即返回当前生成的音频数据 - self.eventCallback?.onSynthesisAudioGenerated(text: "", audioData: audioData) - } } // 合成完成事件 @@ -508,11 +499,19 @@ import os.log guard let self = self else { return } os_log("合成完成事件", log: self.log, type: .info) - + // 安全解包audioData + guard let audioData = event.result.audioData else { + os_log("合成完成事件，音频数据为空", log: self.log, type: .debug) + return + } + os_log("合成完成事件，音频数据长度: %d bytes", log: self.log, type: .debug, audioData.count) DispatchQueue.main.async { - self.serviceState.isSynthesizing = false - self.eventCallback?.onStateChanged(component: "Synthesis", isActive: false) + self.serviceState.isSynthesizing = false + // 立即返回当前生成的音频数据 + self.eventCallback?.onSynthesisAudioGenerated(text: "", audioData: audioData) + self.eventCallback?.onStateChanged(component: "Synthesis", isActive: false) } + } // 合成取消事件 From 95b16ab923118c067f31d7f471d74ca655f28ac6 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 21 Aug 2025 20:51:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunqiinnovation/chat_api/ChatApiService.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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) { From 16ac274254325e7e393c3259dea0dce766740c53 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 21 Aug 2025 21:16:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0iOS=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/chat_api/ChatApiService.swift | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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 { From ca4050c414f8b38a8a7a6be510af2955d86f2412 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 21 Aug 2025 21:47:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0iOS=E7=9A=84mcp=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E8=BF=87=E6=BB=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat_api/ios/chat_api/Sources/chat_api/MCPClient.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From b4d16a9562065803d55e91d421ff15fac5097bc3 Mon Sep 17 00:00:00 2001 From: lxm <1274844347@qq.com> Date: Thu, 21 Aug 2025 21:49:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=B9=B6=E7=A7=BB=E9=99=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84opus=E8=A7=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除设置界面中不再需要的opus解码测试功能，并更新应用版本号至1.0.10+20 --- lib/modules/settings/views/settings_view.dart | 42 +++++++++---------- pubspec.yaml | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) 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/pubspec.yaml b/pubspec.yaml index 329b96551..847868ba3 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"