From f7523a943deb506a3dbe45207f08b23484cc004e Mon Sep 17 00:00:00 2001
From: geyun <1556375442@qq.com>
Date: Tue, 24 Mar 2026 08:58:50 +0800
Subject: [PATCH 1/3] ios
---
.metadata | 25 +---
ios/Flutter/AppFrameworkInfo.plist | 2 -
ios/Flutter/Debug.xcconfig | 1 +
ios/Flutter/Release.xcconfig | 1 +
ios/Podfile.lock | 186 +++++++++++++++++++++++++
ios/Runner.xcodeproj/project.pbxproj | 132 ++++++++++++++++++
ios/Runner/AppDelegate.swift | 7 +-
ios/Runner/Info.plist | 40 ++++--
ios/Runner/SceneDelegate.swift | 6 +
macos/Flutter/Flutter-Debug.xcconfig | 1 +
macos/Flutter/Flutter-Release.xcconfig | 1 +
pubspec.lock | 20 +--
pubspec.yaml | 2 +-
13 files changed, 378 insertions(+), 46 deletions(-)
create mode 100644 ios/Podfile.lock
create mode 100644 ios/Runner/SceneDelegate.swift
diff --git a/.metadata b/.metadata
index 2c6187b3..ffe4f3b0 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.
version:
- revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
+ revision: "2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa"
channel: "stable"
project_type: app
@@ -13,26 +13,11 @@ project_type: app
migration:
platforms:
- platform: root
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- - platform: android
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+ create_revision: 2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa
+ base_revision: 2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa
- platform: ios
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- - platform: linux
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- - platform: macos
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- - platform: web
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- - platform: windows
- create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
- base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+ create_revision: 2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa
+ base_revision: 2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa
# User provided section
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 1dc6cf76..391a902b 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
????
CFBundleVersion
1.0
- MinimumOSVersion
- 13.0
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
index 592ceee8..ec97fc6f 100644
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
index 592ceee8..c4855bfe 100644
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 00000000..17bb4b6f
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,186 @@
+PODS:
+ - device_info_plus (0.0.1):
+ - Flutter
+ - Flutter (1.0.0)
+ - flutter_webrtc (1.2.0):
+ - Flutter
+ - WebRTC-SDK (= 137.7151.04)
+ - geolocator_apple (1.2.0):
+ - Flutter
+ - FlutterMacOS
+ - GoogleDataTransport (9.4.1):
+ - GoogleUtilities/Environment (~> 7.7)
+ - nanopb (< 2.30911.0, >= 2.30908.0)
+ - PromisesObjC (< 3.0, >= 1.2)
+ - GoogleMLKit/BarcodeScanning (4.0.0):
+ - GoogleMLKit/MLKitCore
+ - MLKitBarcodeScanning (~> 3.0.0)
+ - GoogleMLKit/MLKitCore (4.0.0):
+ - MLKitCommon (~> 9.0.0)
+ - GoogleToolboxForMac/DebugUtils (2.3.2):
+ - GoogleToolboxForMac/Defines (= 2.3.2)
+ - GoogleToolboxForMac/Defines (2.3.2)
+ - GoogleToolboxForMac/Logger (2.3.2):
+ - GoogleToolboxForMac/Defines (= 2.3.2)
+ - "GoogleToolboxForMac/NSData+zlib (2.3.2)":
+ - GoogleToolboxForMac/Defines (= 2.3.2)
+ - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)":
+ - GoogleToolboxForMac/DebugUtils (= 2.3.2)
+ - GoogleToolboxForMac/Defines (= 2.3.2)
+ - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
+ - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
+ - GoogleUtilities/Environment (7.13.3):
+ - GoogleUtilities/Privacy
+ - PromisesObjC (< 3.0, >= 1.2)
+ - GoogleUtilities/Logger (7.13.3):
+ - GoogleUtilities/Environment
+ - GoogleUtilities/Privacy
+ - GoogleUtilities/Privacy (7.13.3)
+ - GoogleUtilities/UserDefaults (7.13.3):
+ - GoogleUtilities/Logger
+ - GoogleUtilities/Privacy
+ - GoogleUtilitiesComponents (1.1.0):
+ - GoogleUtilities/Logger
+ - GTMSessionFetcher/Core (2.3.0)
+ - image_picker_ios (0.0.1):
+ - Flutter
+ - isar_community_flutter_libs (1.0.0):
+ - Flutter
+ - MLImage (1.0.0-beta4)
+ - MLKitBarcodeScanning (3.0.0):
+ - MLKitCommon (~> 9.0)
+ - MLKitVision (~> 5.0)
+ - MLKitCommon (9.0.0):
+ - GoogleDataTransport (~> 9.0)
+ - GoogleToolboxForMac/Logger (~> 2.1)
+ - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+ - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
+ - GoogleUtilities/UserDefaults (~> 7.0)
+ - GoogleUtilitiesComponents (~> 1.0)
+ - GTMSessionFetcher/Core (< 3.0, >= 1.1)
+ - MLKitVision (5.0.0):
+ - GoogleToolboxForMac/Logger (~> 2.1)
+ - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
+ - GTMSessionFetcher/Core (< 3.0, >= 1.1)
+ - MLImage (= 1.0.0-beta4)
+ - MLKitCommon (~> 9.0)
+ - mobile_scanner (3.5.6):
+ - Flutter
+ - GoogleMLKit/BarcodeScanning (~> 4.0.0)
+ - nanopb (2.30910.0):
+ - nanopb/decode (= 2.30910.0)
+ - nanopb/encode (= 2.30910.0)
+ - nanopb/decode (2.30910.0)
+ - nanopb/encode (2.30910.0)
+ - package_info_plus (0.4.5):
+ - Flutter
+ - permission_handler_apple (9.3.0):
+ - Flutter
+ - PromisesObjC (2.4.0)
+ - Sentry/HybridSDK (8.56.2)
+ - sentry_flutter (9.11.0):
+ - Flutter
+ - FlutterMacOS
+ - Sentry/HybridSDK (= 8.56.2)
+ - shared_preferences_foundation (0.0.1):
+ - Flutter
+ - FlutterMacOS
+ - url_launcher_ios (0.0.1):
+ - Flutter
+ - WebRTC-SDK (137.7151.04)
+ - webview_flutter_wkwebview (0.0.1):
+ - Flutter
+ - FlutterMacOS
+
+DEPENDENCIES:
+ - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+ - Flutter (from `Flutter`)
+ - flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
+ - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
+ - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+ - isar_community_flutter_libs (from `.symlinks/plugins/isar_community_flutter_libs/ios`)
+ - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
+ - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+ - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+ - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
+ - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+ - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+ - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
+
+SPEC REPOS:
+ trunk:
+ - GoogleDataTransport
+ - GoogleMLKit
+ - GoogleToolboxForMac
+ - GoogleUtilities
+ - GoogleUtilitiesComponents
+ - GTMSessionFetcher
+ - MLImage
+ - MLKitBarcodeScanning
+ - MLKitCommon
+ - MLKitVision
+ - nanopb
+ - PromisesObjC
+ - Sentry
+ - WebRTC-SDK
+
+EXTERNAL SOURCES:
+ device_info_plus:
+ :path: ".symlinks/plugins/device_info_plus/ios"
+ Flutter:
+ :path: Flutter
+ flutter_webrtc:
+ :path: ".symlinks/plugins/flutter_webrtc/ios"
+ geolocator_apple:
+ :path: ".symlinks/plugins/geolocator_apple/darwin"
+ image_picker_ios:
+ :path: ".symlinks/plugins/image_picker_ios/ios"
+ isar_community_flutter_libs:
+ :path: ".symlinks/plugins/isar_community_flutter_libs/ios"
+ mobile_scanner:
+ :path: ".symlinks/plugins/mobile_scanner/ios"
+ package_info_plus:
+ :path: ".symlinks/plugins/package_info_plus/ios"
+ permission_handler_apple:
+ :path: ".symlinks/plugins/permission_handler_apple/ios"
+ sentry_flutter:
+ :path: ".symlinks/plugins/sentry_flutter/ios"
+ shared_preferences_foundation:
+ :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+ url_launcher_ios:
+ :path: ".symlinks/plugins/url_launcher_ios/ios"
+ webview_flutter_wkwebview:
+ :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
+
+SPEC CHECKSUMS:
+ device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+ Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+ flutter_webrtc: c3e21fc0dcd9d8eb246ae4d5256fcbeb2f5ecd22
+ geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
+ GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+ GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e
+ GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
+ GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+ GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
+ GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
+ image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
+ isar_community_flutter_libs: bede843185a61a05ff364a05c9b23209523f7e0d
+ MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b
+ MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505
+ MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390
+ MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49
+ mobile_scanner: b67191637a5ea7ba15652ca208069d2bae1900ab
+ nanopb: 438bc412db1928dac798aa6fd75726007be04262
+ package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+ permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+ PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+ Sentry: b53951377b78e21a734f5dc8318e333dbfc682d7
+ sentry_flutter: 8621fa384e86f069bd88b29258c55c19f43e24f2
+ shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+ url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
+ WebRTC-SDK: 40d4f5ba05cadff14e4db5614aec402a633f007e
+ webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
+
+PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
+
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 387432f0..4e20d5ea 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -11,9 +11,11 @@
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+ 7AC68D23B3BE0EF34FDD754A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A08266595A1E44EF35D90A /* 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 */; };
+ FC621772690A5D01227F0DAD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57956806A5D67B2C5C191177 /* Pods_Runner.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -42,12 +44,17 @@
/* Begin PBXFileReference section */
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 = ""; };
+ 2A86BCB4EDCEFC6667886142 /* 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 = ""; };
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; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; };
+ 57956806A5D67B2C5C191177 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 6768D1FD2EC70C3092224AEE /* 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 = ""; };
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 = ""; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; };
+ 7D425FDF9E4D482376D29066 /* 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 = ""; };
+ 7ED068C4687E58110A53B3E3 /* 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 = ""; };
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; };
@@ -55,13 +62,25 @@
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 = ""; };
+ A1A08266595A1E44EF35D90A /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ A92B97C45EAD1787A088536D /* 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 = ""; };
+ D8EA0D36023B5B2EAFD36D75 /* 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 = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 1CF154E5C9251305B05EEC54 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 7AC68D23B3BE0EF34FDD754A /* Pods_RunnerTests.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
97C146EB1CF9000F007C117D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ FC621772690A5D01227F0DAD /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -76,6 +95,15 @@
path = RunnerTests;
sourceTree = "";
};
+ 8DF8A0A7F5556257D035C69E /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 57956806A5D67B2C5C191177 /* Pods_Runner.framework */,
+ A1A08266595A1E44EF35D90A /* Pods_RunnerTests.framework */,
+ );
+ name = Frameworks;
+ sourceTree = "";
+ };
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
@@ -94,6 +122,8 @@
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
331C8082294A63A400263BE5 /* RunnerTests */,
+ BCECFDF30F46C7FBFA5004F3 /* Pods */,
+ 8DF8A0A7F5556257D035C69E /* Frameworks */,
);
sourceTree = "";
};
@@ -121,6 +151,19 @@
path = Runner;
sourceTree = "";
};
+ BCECFDF30F46C7FBFA5004F3 /* Pods */ = {
+ isa = PBXGroup;
+ children = (
+ 7ED068C4687E58110A53B3E3 /* Pods-Runner.debug.xcconfig */,
+ 2A86BCB4EDCEFC6667886142 /* Pods-Runner.release.xcconfig */,
+ 6768D1FD2EC70C3092224AEE /* Pods-Runner.profile.xcconfig */,
+ 7D425FDF9E4D482376D29066 /* Pods-RunnerTests.debug.xcconfig */,
+ D8EA0D36023B5B2EAFD36D75 /* Pods-RunnerTests.release.xcconfig */,
+ A92B97C45EAD1787A088536D /* Pods-RunnerTests.profile.xcconfig */,
+ );
+ path = Pods;
+ sourceTree = "";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -128,8 +171,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
buildPhases = (
+ 0A58A9EED5128CAE78410D5B /* [CP] Check Pods Manifest.lock */,
331C807D294A63A400263BE5 /* Sources */,
331C807F294A63A400263BE5 /* Resources */,
+ 1CF154E5C9251305B05EEC54 /* Frameworks */,
);
buildRules = (
);
@@ -145,12 +190,15 @@
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
+ 8D9F7E86DB13853BD835583D /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+ 5D6680FF4C674AC7ECC89AFA /* [CP] Embed Pods Frameworks */,
+ AB623CB97858D5569C7AD0C7 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -222,6 +270,28 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
+ 0A58A9EED5128CAE78410D5B /* [CP] Check Pods Manifest.lock */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+ "${PODS_ROOT}/Manifest.lock",
+ );
+ name = "[CP] Check Pods Manifest.lock";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+ );
+ 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";
+ showEnvVarsInLog = 0;
+ };
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -238,6 +308,45 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
+ 5D6680FF4C674AC7ECC89AFA /* [CP] Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+ );
+ name = "[CP] Embed Pods Frameworks";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
+ 8D9F7E86DB13853BD835583D /* [CP] Check Pods Manifest.lock */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+ "${PODS_ROOT}/Manifest.lock",
+ );
+ name = "[CP] Check Pods Manifest.lock";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+ );
+ 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";
+ showEnvVarsInLog = 0;
+ };
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -253,6 +362,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
+ AB623CB97858D5569C7AD0C7 /* [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;
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -362,6 +488,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ DEVELOPMENT_TEAM = R5KTW5WPS3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -378,6 +505,7 @@
};
331C8088294A63A400263BE5 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 7D425FDF9E4D482376D29066 /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
@@ -395,6 +523,7 @@
};
331C8089294A63A400263BE5 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = D8EA0D36023B5B2EAFD36D75 /* Pods-RunnerTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
@@ -410,6 +539,7 @@
};
331C808A294A63A400263BE5 /* Profile */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = A92B97C45EAD1787A088536D /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
@@ -541,6 +671,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ DEVELOPMENT_TEAM = R5KTW5WPS3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -563,6 +694,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ DEVELOPMENT_TEAM = R5KTW5WPS3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 62666446..c30b367e 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,12 +2,15 @@ import Flutter
import UIKit
@main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
override func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
- GeneratedPluginRegistrant.register(with: self)
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
+
+ func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+ GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+ }
}
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index c51b485c..3235e537 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
+ CADisableMinimumFrameDurationOnPhone
+
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
@@ -24,6 +26,33 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ NSCameraUsageDescription
+ 我们需要访问您的摄像头以扫描二维码绑定设备
+ NSLocationWhenInUseUsageDescription
+ 需要访问您的位置以显示地图
+ UIApplicationSceneManifest
+
+ UIApplicationSupportsMultipleScenes
+
+ UISceneConfigurations
+
+ UIWindowSceneSessionRoleApplication
+
+
+ UISceneClassName
+ UIWindowScene
+ UISceneConfigurationName
+ flutter
+ UISceneDelegateClassName
+ FlutterSceneDelegate
+ UISceneStoryboardFile
+ Main
+
+
+
+
+ UIApplicationSupportsIndirectInputEvents
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -41,16 +70,5 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
- NSLocationWhenInUseUsageDescription
- 需要访问您的位置以显示地图
-
- NSCameraUsageDescription
- 我们需要访问您的摄像头以扫描二维码绑定设备
-
-
diff --git a/ios/Runner/SceneDelegate.swift b/ios/Runner/SceneDelegate.swift
new file mode 100644
index 00000000..b9ce8ea2
--- /dev/null
+++ b/ios/Runner/SceneDelegate.swift
@@ -0,0 +1,6 @@
+import Flutter
+import UIKit
+
+class SceneDelegate: FlutterSceneDelegate {
+
+}
diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig
index c2efd0b6..4b81f9b2 100644
--- a/macos/Flutter/Flutter-Debug.xcconfig
+++ b/macos/Flutter/Flutter-Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig
index c2efd0b6..5caa9d15 100644
--- a/macos/Flutter/Flutter-Release.xcconfig
+++ b/macos/Flutter/Flutter-Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/pubspec.lock b/pubspec.lock
index b2bb7c93..f4999771 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -132,10 +132,10 @@ packages:
dependency: transitive
description:
name: characters
- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+ sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.4.0"
+ version: "1.4.1"
checked_yaml:
dependency: transitive
description:
@@ -531,10 +531,10 @@ packages:
dependency: "direct main"
description:
name: google_fonts
- sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982
+ sha256: "2776c66b3e97c6cdd58d1bd3281548b074b64f1fd5c8f82391f7456e38849567"
url: "https://pub.flutter-io.cn"
source: hosted
- version: "5.1.0"
+ version: "4.0.5"
google_nav_bar:
dependency: "direct main"
description:
@@ -811,18 +811,18 @@ packages:
dependency: transitive
description:
name: matcher
- sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+ sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.12.17"
+ version: "0.12.19"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+ sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.11.1"
+ version: "0.13.0"
meta:
dependency: transitive
description:
@@ -1280,10 +1280,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+ sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.7.7"
+ version: "0.7.10"
time:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 61823876..5428cdb3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -79,7 +79,7 @@ dependencies:
google_nav_bar: ^5.0.7
# ===== 字体 =====
- google_fonts: ^5.1.0 # 或其他稳定版本
+ google_fonts: ^4.0.4 # 或其他稳定版本
# ===== WebView =====
# flutter_inappwebview: ^6.1.5
From 8772b1cb43a4696fff72b830ae955752dc297dad Mon Sep 17 00:00:00 2001
From: Songzex <2402265378@qq.com>
Date: Tue, 24 Mar 2026 17:09:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=BF=9C=E7=A8=8B?=
=?UTF-8?q?=E9=81=A5=E6=8E=A7=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=20=E6=8A=98=E5=8F=A0=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E6=A0=8F=20=E7=82=B9=E5=87=BB=E6=8C=AF=E5=8A=A8?=
=?UTF-8?q?=E5=8F=8D=E9=A6=88=20=EF=BC=8C=E6=80=A5=E5=81=9C=E7=9A=84?=
=?UTF-8?q?=E8=AF=BB=E7=A7=92=E8=BF=9B=E5=BA=A6=E6=9D=A1=20=EF=BC=8C?=
=?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9A=84=E6=8C=AF=E5=8A=A8=E5=8F=8D=E9=A6=88?=
=?UTF-8?q?=20=EF=BC=8C=E9=94=81=E5=B1=8F=E7=9A=84=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E5=BC=80=E5=8F=91(=E7=A6=81?=
=?UTF-8?q?=E7=94=A8=E4=B8=8A=E4=B8=8B=E5=B7=A6=E5=8F=B3=E7=9A=84=E6=BB=91?=
=?UTF-8?q?=E8=BD=AE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
android/app/src/main/AndroidManifest.xml | 1 +
assets/svgs/remote_recognition_off.svg | 1 +
assets/svgs/remote_recognition_on.svg | 1 +
lib/core/error/failure.dart | 4 +
lib/core/network/net_message_dispatcher.dart | 3 +
.../route_planning_repository_impl.dart | 2 +-
.../bloc/remote_control_cubit.dart | 67 +++++-
.../bloc/remote_control_state.dart | 16 ++
.../pages/remote_control_page.dart | 16 +-
.../widgets/center_control_area.dart | 3 +
.../widgets/emergency_stop_button.dart | 167 ++++++++------
.../widgets/left_joystick_area.dart | 17 +-
.../widgets/right_joystick_area.dart | 22 +-
.../presentation/widgets/top_status_bar.dart | 208 +++++++++++++++---
.../cc_ui_kit/lib/src/cc_expand_slider.dart | 98 ++++++++-
pubspec.lock | 16 ++
pubspec.yaml | 2 +-
17 files changed, 525 insertions(+), 119 deletions(-)
create mode 100644 assets/svgs/remote_recognition_off.svg
create mode 100644 assets/svgs/remote_recognition_on.svg
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f282b750..0f9a999b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
+
diff --git a/assets/svgs/remote_recognition_off.svg b/assets/svgs/remote_recognition_off.svg
new file mode 100644
index 00000000..f4ece88e
--- /dev/null
+++ b/assets/svgs/remote_recognition_off.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/svgs/remote_recognition_on.svg b/assets/svgs/remote_recognition_on.svg
new file mode 100644
index 00000000..30ccedf3
--- /dev/null
+++ b/assets/svgs/remote_recognition_on.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/lib/core/error/failure.dart b/lib/core/error/failure.dart
index 7d2e1cb4..96dfe2de 100644
--- a/lib/core/error/failure.dart
+++ b/lib/core/error/failure.dart
@@ -2,3 +2,7 @@ class Failure {
final String message;
Failure(this.message);
}
+
+class NetworkFailure extends Failure {
+ NetworkFailure(super.message);
+}
diff --git a/lib/core/network/net_message_dispatcher.dart b/lib/core/network/net_message_dispatcher.dart
index 6503620b..0eca1058 100644
--- a/lib/core/network/net_message_dispatcher.dart
+++ b/lib/core/network/net_message_dispatcher.dart
@@ -223,6 +223,9 @@ class NetMessageDispatcher {
fullData[1] == 0xAA &&
fullData[2] == 0x01) {
+ if(fullData[5] == 0x02){
+ debugPrint('下位机回复收到指令 - 完整数据包:${fullData.join(" ")}');
+ }
debugPrint('[Dispatcher] 下位机回复成功 - 完整数据包:${fullData.join(" ")}');
// 检查状态位 (索引 5 对应 payload 的第 2 个字节)
if (fullData.length > 5 && fullData[5] == 0x01) {
diff --git a/lib/features/devices/data/repositories/route_planning_repository_impl.dart b/lib/features/devices/data/repositories/route_planning_repository_impl.dart
index 926b571c..5c1e97ca 100644
--- a/lib/features/devices/data/repositories/route_planning_repository_impl.dart
+++ b/lib/features/devices/data/repositories/route_planning_repository_impl.dart
@@ -265,7 +265,7 @@ class PathPlanner {
final routePlanSendEntity = RoutePlanSendEntity(
commandType: 0x01,
- pointCounts: pointIndex, // 🔥 使用点编号,而不是固定的 1
+ pointCounts: 1, // 🔥 使用点编号,而不是固定的 1
targetLatitude: entity.latitude,
targetLongitude: entity.longitude,
speed: 1000,
diff --git a/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart b/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
index a519114c..6b9f1474 100644
--- a/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
+++ b/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
@@ -18,6 +18,7 @@ class RemoteControlCubit extends Cubit {
Timer? _timer;
StreamSubscription? _kickOutSub; // 新增:用于管理监听生命周期
final NetMessageDispatcher dispatcher;
+ StreamSubscription? _deviceStatusSub;//🔥 新增:用于监听 DeviceStat
RemoteControlCubit(this._repository, this._requestControlPermissionUseCase, this.dispatcher)
: super(
@@ -30,6 +31,59 @@ class RemoteControlCubit extends Cubit {
}
+ // 🔥 新增:监听 DeviceStatusBloc 的状态更新
+ void subscribeToDeviceStatus(Stream deviceStatusStream) {
+ _deviceStatusSub?.cancel();
+
+ _deviceStatusSub = deviceStatusStream.listen((deviceState) {
+ try {
+ // 🔥 关键:从 DeviceStatusBloc 的 state 中提取数据
+ // 这里假设 deviceState 是 DevicesCubit 的 state
+ // 你需要根据实际的 DevicesCubit state 类型来调整
+
+ debugPrint('📡 [收到设备状态更新] deviceState: $deviceState');
+
+ // 如果 DevicesCubit 的 state 中有 runningStatusModel 或类似字段
+ // 方式 1:直接同步整个 RunningStatusModel
+ if (deviceState is Map && deviceState.containsKey('runningStatusModel')) {
+ final newStatus = deviceState['runningStatusModel'] as RunningStatusModel;
+ _updateStatusFromDevice(newStatus);
+ }
+ // 方式 2:如果 DevicesCubit 直接暴露 voltage, battery 等字段
+ else if (deviceState is Map) {
+ final voltage = deviceState['voltage'] as int? ?? 0;
+ final battery = deviceState['battery'] as int? ?? 0;
+
+ emit(state.copyWith(
+ voltage: voltage,
+ battery: battery,
+ ));
+
+ debugPrint('📡 [同步设备状态] 电压:${voltage}V, 电量:${battery}%');
+ }
+ } catch (e) {
+ debugPrint('❌ [同步设备状态失败] $e');
+ }
+ });
+
+ debugPrint('✅ [DeviceStatus] 已建立监听');
+ }
+
+
+ // 🔥 辅助方法:更新运行状态
+ void _updateStatusFromDevice(RunningStatusModel newStatus) {
+ if (!isClosed) {
+ emit(state.copyWith(
+ runningStatusModel: newStatus,
+ voltage:int.tryParse(newStatus.voltage) ?? 0,
+ battery: int.tryParse(newStatus.voltage) ?? 0,
+ // 如果需要同步其他字段,在这里添加
+ // controlMode: newStatus.controlMode,
+ ));
+
+ debugPrint('✅ [更新运行状态] 电压:${newStatus.voltage}V, 电量:${newStatus.battery}%');
+ }
+ }
// 1. 初始化回包监听 (如 0x12 权限)
// void _initPacketListener() {
// _repository.responseStream.listen((packet) {
@@ -170,7 +224,9 @@ class RemoteControlCubit extends Cubit {
emit(state.copyWith(status: RemoteControlStatus.initial));
}
- void toggleLock() {}
+ void toggleLock() {
+ emit(state.copyWith(isLocked: !state.isLocked));
+ }
void togglePermissionDialog(bool show) {
emit(state.copyWith(showPermissionRequestDialog: show));
@@ -188,6 +244,7 @@ class RemoteControlCubit extends Cubit {
@override
Future close() {
_timer?.cancel(); // 退出页面时务必销毁定时器
+ _deviceStatusSub?.cancel(); // 🔥 确保清理订阅
return super.close();
}
@@ -268,6 +325,14 @@ class RemoteControlCubit extends Cubit {
debugPrint(' [点火指令] ${i}');
updateFunction(ignition: i);
}
+ // 发送障碍物识别指令
+ void toggleObstacleRecognition() {
+ emit(state.copyWith(obstacleRecognitionFlag: !state.obstacleRecognitionFlag));
+ }
+
+ void toggleTopLeftExpand() {
+ emit(state.copyWith(topRightIsExpanded: !state.topRightIsExpanded));
+ }
diff --git a/lib/features/remote_control/presentation/bloc/remote_control_state.dart b/lib/features/remote_control/presentation/bloc/remote_control_state.dart
index 6226ee83..2942376d 100644
--- a/lib/features/remote_control/presentation/bloc/remote_control_state.dart
+++ b/lib/features/remote_control/presentation/bloc/remote_control_state.dart
@@ -25,6 +25,9 @@ class RemoteControlState extends Equatable {
final bool showLeftPip;
final bool showRightPip;
+ final bool topRightIsExpanded; // 顶部右侧按钮展开状态
+ final bool obstacleRecognitionFlag; // 障碍物识别标志位(这是UI显示的)
+
final String obstacleFlag; //障碍物标志位
const RemoteControlState({
@@ -44,6 +47,8 @@ class RemoteControlState extends Equatable {
this.showRightPip = true,
this.obstacleFlag = '',
required this.runningStatusModel,
+ this.topRightIsExpanded = false,
+ this.obstacleRecognitionFlag = true,
});
// 方便 UI 更新部分属性
@@ -64,6 +69,9 @@ class RemoteControlState extends Equatable {
bool? showRightPip,
RunningStatusModel? runningStatusModel,
String? obstacleFlag,
+ bool? topRightIsExpanded,
+ bool? obstacleRecognitionFlag,
+
}) {
return RemoteControlState(
status: status ?? this.status,
@@ -83,6 +91,9 @@ class RemoteControlState extends Equatable {
showRightPip: showRightPip ?? this.showRightPip,
runningStatusModel: runningStatusModel ?? this.runningStatusModel,
obstacleFlag: obstacleFlag ?? this.obstacleFlag,
+ topRightIsExpanded: topRightIsExpanded ?? this.topRightIsExpanded,
+ obstacleRecognitionFlag: obstacleRecognitionFlag ?? this.obstacleRecognitionFlag,
+
);
}
@@ -104,5 +115,10 @@ class RemoteControlState extends Equatable {
showRightPip,
runningStatusModel,
obstacleFlag,
+ topRightIsExpanded,
+ obstacleRecognitionFlag,
];
+
+
+
}
diff --git a/lib/features/remote_control/presentation/pages/remote_control_page.dart b/lib/features/remote_control/presentation/pages/remote_control_page.dart
index 52861c86..45a9a575 100644
--- a/lib/features/remote_control/presentation/pages/remote_control_page.dart
+++ b/lib/features/remote_control/presentation/pages/remote_control_page.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -25,6 +27,7 @@ class RemoteControlPage extends StatefulWidget {
class _RemoteControlPageState extends State {
String _videoStreamUrl = "";
+ StreamSubscription? _deviceStatusSubscription;
@override
void initState() {
super.initState();
@@ -33,8 +36,17 @@ class _RemoteControlPageState extends State {
// 2. 隐藏状态栏和虚拟按键
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+ // 🔥 关键:订阅 DeviceStatusBloc 的状态流
+
WidgetsBinding.instance.addPostFrameCallback((_) {
- context.read().startControlLoop();
+ final remoteCubit = context.read();
+ final devicesCubit = context.read();
+
+ remoteCubit.startControlLoop();
+ // 🔥 关键:订阅 DeviceStatusBloc 的状态流
+ remoteCubit.subscribeToDeviceStatus(devicesCubit.stream);
+
+ debugPrint('🚀 [遥控页面] 已启动控制循环和设备状态监听');
});
}
@@ -42,6 +54,8 @@ class _RemoteControlPageState extends State {
void dispose() {
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+ _deviceStatusSubscription?.cancel();
+ context.read().stopControlLoop();
super.dispose();
}
diff --git a/lib/features/remote_control/presentation/widgets/center_control_area.dart b/lib/features/remote_control/presentation/widgets/center_control_area.dart
index 71378143..d0bc6247 100644
--- a/lib/features/remote_control/presentation/widgets/center_control_area.dart
+++ b/lib/features/remote_control/presentation/widgets/center_control_area.dart
@@ -1,5 +1,6 @@
import 'package:cc_ui_kit/cc_ui_kit.dart';
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../bloc/remote_control_cubit.dart';
@@ -121,6 +122,8 @@ class CenterControlArea extends StatelessWidget {
default:
debugPrint('⚠️ 未知的 label: $label');
}
+ // 🔥 在指令执行后触发震动反馈(增强手感)
+ HapticFeedback.mediumImpact();
}
// 🔥 底盘的业务逻辑(左滑块)
diff --git a/lib/features/remote_control/presentation/widgets/emergency_stop_button.dart b/lib/features/remote_control/presentation/widgets/emergency_stop_button.dart
index 4626ebee..c00ba6e9 100644
--- a/lib/features/remote_control/presentation/widgets/emergency_stop_button.dart
+++ b/lib/features/remote_control/presentation/widgets/emergency_stop_button.dart
@@ -17,7 +17,7 @@ class EmergencyStopButton extends StatefulWidget {
}
class _EmergencyStopButtonState extends State
- with TickerProviderStateMixin {
+ with SingleTickerProviderStateMixin {
late AnimationController _progressController;
bool _isPressing = false;
@@ -28,6 +28,13 @@ class _EmergencyStopButtonState extends State
vsync: this,
duration: const Duration(seconds: 3),
);
+
+ // 添加监听器,确保动画值变化时重建 UI
+ _progressController.addListener(() {
+ if (mounted) {
+ setState(() {});
+ }
+ });
}
@override
@@ -36,94 +43,118 @@ class _EmergencyStopButtonState extends State
super.dispose();
}
+ void _resetProgress() {
+ setState(() => _isPressing = false);
+ _progressController.stop();
+ _progressController.value = 0;
+ }
+
@override
Widget build(BuildContext context) {
- // 监听 Cubit 中的急停状态
final isEmergencyActive = context
.watch()
.state
.isEmergency;
final width = widget.width * 0.65;
- final double indicatorSize = width + 10;
+ final double indicatorSize = width + 20;
- return GestureDetector(
- // 1. 处理点击:仅在未急停时触发
- onTap: () {
- if (!isEmergencyActive) {
- context.read().updateEmergency(true);
- HapticFeedback.heavyImpact(); // 震动反馈
- }
- },
- // 2. 处理长按开始:仅在已急停时触发解除逻辑
- onLongPressStart: (_) {
- if (isEmergencyActive) {
- setState(() => _isPressing = true);
- _progressController.forward(from: 0).then((_) {
- if (_isPressing) {
- // 进度走完且仍在按压
- context.read().updateEmergency(false);
- HapticFeedback.vibrate();
- setState(() => _isPressing = false);
- }
- });
- }
- },
- // 3. 处理松手:重置进度
- onLongPressEnd: (_) {
- _isPressing = false;
- _progressController.stop();
- _progressController.value = 0;
- setState(() {});
- },
+ return SizedBox(
+ width: indicatorSize,
+ height: indicatorSize,
child: Stack(
alignment: Alignment.center,
children: [
- // 对应 Compose 的 Canvas 绘制进度环
- if (_isPressing)
- SizedBox(
+ // 进度环 - 只在按压时显示
+ AnimatedOpacity(
+ opacity: _isPressing ? 1.0 : 0.0,
+ duration: const Duration(milliseconds: 200),
+ child: SizedBox(
width: indicatorSize,
height: indicatorSize,
child: CircularProgressIndicator(
value: _progressController.value,
- strokeWidth: 10,
- color: Colors.red.withOpacity(0.8),
+ strokeWidth: 6,
+ color: Colors.red.withOpacity(0.9),
backgroundColor: Colors.red.withValues(alpha: 0.2),
),
),
+ ),
- Container(
- width: width,
- height: width,
- decoration: BoxDecoration(
- shape: BoxShape.circle,
- // 根据状态切换颜色,对应 Color(0x80C53030)
- color: isEmergencyActive
- ? Colors.red.withOpacity(0.5)
- : const Color(0x80C53030),
- boxShadow: isEmergencyActive
- ? [
- BoxShadow(
- color: Colors.red.withValues(alpha: 0.5),
- blurRadius: 20,
- ),
- ]
- : [],
- ),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- SvgPicture.asset('assets/svgs/remote_alert.svg',width: width * 0.4,color: Colors.white.withValues(alpha: 0.5),),
- const SizedBox(height: 6),
- Text(
- isEmergencyActive ? "急停中" : "急停",
- style: TextStyle(
- color: Colors.white.withValues(alpha: 0.5),
- fontSize: 14,
- fontWeight: FontWeight.w900,
+ // 按钮主体
+ GestureDetector(
+ onTap: () {
+ debugPrint('🔴 [点击] 触发急停');
+ if (!isEmergencyActive) {
+ context.read().updateEmergency(true);
+ HapticFeedback.heavyImpact();
+ }
+ },
+ onLongPressStart: (_) {
+ debugPrint('🔴 [长按开始] isEmergency=$isEmergencyActive');
+ if (isEmergencyActive && !_isPressing) {
+ setState(() => _isPressing = true);
+ debugPrint('🔴 [开始动画] 从 0 开始');
+ _progressController.reset();
+ _progressController.forward().then((_) {
+ debugPrint('🔴 [动画完成] _isPressing=$_isPressing');
+ if (_isPressing && mounted) {
+ debugPrint('✅ [解除急停] 执行');
+ context.read().updateEmergency(false);
+ HapticFeedback.vibrate();
+ setState(() => _isPressing = false);
+ }
+ });
+ }
+ },
+ onLongPressEnd: (_) {
+ debugPrint('🔴 [长按结束]');
+ if (_isPressing) {
+ _resetProgress();
+ }
+ },
+ onLongPressCancel: () {
+ debugPrint('🔴 [长按取消]');
+ if (_isPressing) {
+ _resetProgress();
+ }
+ },
+ child: Container(
+ width: width,
+ height: width,
+ decoration: BoxDecoration(
+ shape: BoxShape.circle,
+ color: isEmergencyActive
+ ? Colors.red.withOpacity(0.5)
+ : const Color(0x80C53030),
+ boxShadow: isEmergencyActive
+ ? [
+ BoxShadow(
+ color: Colors.red.withValues(alpha: 0.5),
+ blurRadius: 20,
),
- ),
- ],
+ ]
+ : [],
+ ),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ SvgPicture.asset(
+ 'assets/svgs/remote_alert.svg',
+ width: width * 0.4,
+ color: Colors.white.withValues(alpha: 0.5),
+ ),
+ const SizedBox(height: 6),
+ Text(
+ isEmergencyActive ? "急停中" : "急停",
+ style: TextStyle(
+ color: Colors.white.withValues(alpha: 0.5),
+ fontSize: 14,
+ fontWeight: FontWeight.w900,
+ ),
+ ),
+ ],
+ ),
),
),
],
diff --git a/lib/features/remote_control/presentation/widgets/left_joystick_area.dart b/lib/features/remote_control/presentation/widgets/left_joystick_area.dart
index 04653f8e..241f7e7d 100644
--- a/lib/features/remote_control/presentation/widgets/left_joystick_area.dart
+++ b/lib/features/remote_control/presentation/widgets/left_joystick_area.dart
@@ -2,6 +2,7 @@ import 'package:cc_ui_kit/cc_ui_kit.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:vibration/vibration.dart';
import '../bloc/remote_control_cubit.dart';
@@ -32,10 +33,12 @@ class LeftJoystickArea extends StatelessWidget {
onValueChanged: (value) {
// 对应 viewModel.updateOriginY(y)
context.read().updateOriginY(value.y);
+ _triggerVibration();
},
onPress: () {
// 对应 VibrateOnce(current, 100)
- HapticFeedback.mediumImpact();
+ //HapticFeedback.mediumImpact();
+ _triggerVibration();
},
),
),
@@ -53,4 +56,16 @@ class LeftJoystickArea extends StatelessWidget {
],
);
}
+ void _triggerVibration() {
+ Vibration.hasVibrator().then((hasVibrator) {
+ if (hasVibrator ?? false) {
+ Vibration.vibrate(duration: 100);
+ debugPrint('📳 [右摇杆] 震动执行 - 100ms');
+ } else {
+ debugPrint('⚠️ [右摇杆] 设备不支持震动');
+ }
+ }).catchError((e) {
+ debugPrint('❌ [右摇杆] 震动失败:$e');
+ });
+ }
}
diff --git a/lib/features/remote_control/presentation/widgets/right_joystick_area.dart b/lib/features/remote_control/presentation/widgets/right_joystick_area.dart
index 04fb2921..e111c221 100644
--- a/lib/features/remote_control/presentation/widgets/right_joystick_area.dart
+++ b/lib/features/remote_control/presentation/widgets/right_joystick_area.dart
@@ -2,6 +2,7 @@ import 'package:cc_ui_kit/cc_ui_kit.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:vibration/vibration.dart';
import '../bloc/remote_control_cubit.dart';
@@ -33,11 +34,12 @@ class RightJoystickArea extends StatelessWidget {
// 对应 viewModel.updateOriginX(x)
/// context.read().updateOriginY(value.x);
context.read().updateOriginX(value.x);
+ _triggerVibration();
},
- onPress: () {
- // 对应 VibrateOnce(current, 100)
- HapticFeedback.mediumImpact();
- },
+ onPress: () {
+ _triggerVibration();
+ }
+ ,
),
),
),
@@ -55,4 +57,16 @@ class RightJoystickArea extends StatelessWidget {
],
);
}
+ void _triggerVibration() {
+ Vibration.hasVibrator().then((hasVibrator) {
+ if (hasVibrator ?? false) {
+ Vibration.vibrate(duration: 100);
+ debugPrint('📳 [右摇杆] 震动执行 - 100ms');
+ } else {
+ debugPrint('⚠️ [右摇杆] 设备不支持震动');
+ }
+ }).catchError((e) {
+ debugPrint('❌ [右摇杆] 震动失败:$e');
+ });
+ }
}
diff --git a/lib/features/remote_control/presentation/widgets/top_status_bar.dart b/lib/features/remote_control/presentation/widgets/top_status_bar.dart
index 3643e4df..9e786e95 100644
--- a/lib/features/remote_control/presentation/widgets/top_status_bar.dart
+++ b/lib/features/remote_control/presentation/widgets/top_status_bar.dart
@@ -17,6 +17,7 @@ class TopStatusBar extends StatelessWidget {
// 监听全局设备状态
final deviceState = context.watch().state;
final device = deviceState.selectedDevice;
+ var _remoteControlCubit = context.read();
ControlMode _parseControlMode(String modeString) {
switch (modeString.toUpperCase()) {
case 'BLE':
@@ -38,12 +39,12 @@ class TopStatusBar extends StatelessWidget {
final remoteState = context.watch().state;
return Padding(
- padding: const EdgeInsets.all(12.0),
+ padding: const EdgeInsets.fromLTRB(1, 12, 1, 12),
child: Row(
children: [
// 1. 返回按钮 (对应 SimpleSmallFunctionButton)
_buildIconButton("assets/svgs/remote_back.svg", () => context.pop()),
- const SizedBox(width: 16),
+ const SizedBox(width: 8),
// 2. 控制状态 (对应 StatusChipLeft)
StatusChip(
@@ -74,28 +75,81 @@ class TopStatusBar extends StatelessWidget {
// 4. 刷新按钮
_buildIconButton("assets/svgs/remote_refresh.svg", () {}),
- const SizedBox(width: 25),
+ // const SizedBox(width: 8),
// 5. 火技能按钮 (对应 SmallFunctionButton)
//_buildIconButton("assets/svgs/fire.svg", () {}),
- _buildSliderBox("割刀", false,context),
+ _buildSliderBox("火技能按钮", false,context),
- const Spacer(),
+ const Spacer(),
+ _buildExpandIconButton(
+ iconPath: "assets/svgs/remote_expand.svg",
+ selectedIconPath: "assets/svgs/remote_unexpand.svg",
+ isSelected: remoteState.topRightIsExpanded,
+ onTap: (){
+ _remoteControlCubit.toggleTopLeftExpand();
+ },
+ ),
+ AnimatedSize(
+ duration: const Duration(milliseconds: 100),
+ curve: Curves.easeInOut,
+ child: Row(
+ children: !remoteState.topRightIsExpanded
+ ? [
+ const SizedBox(width: 8),
+ _buildSwitchIconButton(
+ iconPath: "assets/svgs/remote_recognition_off.svg",
+ selectedIconPath: "assets/svgs/remote_recognition_on.svg",
+ isSelected: remoteState.obstacleRecognitionFlag,
+ onTap: (){
+ _remoteControlCubit.toggleObstacleRecognition();
+ },
+ ),
+ const SizedBox(width: 8),
+ _buildSwitchIconButton(
+ iconPath: "assets/svgs/remote_video_left_off.svg",
+ selectedIconPath: "assets/svgs/remote_video_left.svg",
+ isSelected: remoteState.showLeftPip,
+ onTap: (){
+ _remoteControlCubit.toggleLeftPip();
+ },
+ ),
+ const SizedBox(width: 8),
+ _buildSwitchIconButton(
+ iconPath: "assets/svgs/remote_video_right_off.svg",
+ selectedIconPath: "assets/svgs/remote_video_right.svg",
+ isSelected: remoteState.showRightPip,
+ onTap: (){
+ _remoteControlCubit.toggleRightPip();
+ },
+ ),
+ const SizedBox(width: 8),
+ _buildControlModeChip(remoteState.runningStatusModel.controlMode),
+ const SizedBox(width: 8),
+ _buildVoltageChip(remoteState.runningStatusModel.voltage),
+ const SizedBox(width: 8),
+ _buildPingChip(remoteState.ping),
+ const SizedBox(width: 8),
+ ]
+ : [], // 折叠时数组为空
+ ),
+ ),
// TODO
- _buildControlModeChip( _parseControlMode(remoteState.runningStatusModel.controlMode)),
+ // _buildControlModeChip( _parseControlMode(remoteState.runningStatusModel.controlMode)),
- const SizedBox(width: 8),
+ // const SizedBox(width: 8),
- _buildVoltageChip(remoteState.voltage),
+ //_buildVoltageChip(remoteState.voltage),
- const SizedBox(width: 8),
+ // const SizedBox(width: 8),
// 5. 信号延迟 (对应 pingStatusChip)
- _buildPingChip(remoteState.ping),
- const SizedBox(width: 8),
+ //_buildPingChip(remoteState.ping),
+ // const SizedBox(width: 8),
// 6. 电量 (对应 StatusChipRight)
_buildBatteryChip(remoteState.battery),
+ const SizedBox(width: 8),
],
),
);
@@ -129,6 +183,53 @@ class TopStatusBar extends StatelessWidget {
);
}
+ Widget _buildSwitchIconButton({
+ required String iconPath, // 默认图标路径
+ required String selectedIconPath, // 选中后的图标路径
+ required VoidCallback onTap, // 点击事件
+ bool isSelected = false, // 是否选中状态
+ double size = 32, // 按钮尺寸
+ }) {
+ return InkWell(
+ onTap: onTap,
+ borderRadius: BorderRadius.circular(10),
+ child: AnimatedContainer(
+ duration: const Duration(milliseconds: 200),
+ // 增加颜色切换动画
+ width: size,
+ height: size,
+ decoration: BoxDecoration(
+ // 选中时为深蓝色,未选中时为半透明灰色
+ color: isSelected
+ ? const Color(0xFF0078D4)
+ : Colors.grey.withOpacity(0.4),
+ borderRadius: BorderRadius.circular(10),
+ border: Border.all(
+ color: isSelected
+ ? Colors.transparent
+ : Colors.white.withOpacity(0.3),
+ width: 0.5,
+ ),
+ boxShadow: isSelected
+ ? [
+ BoxShadow(
+ color: const Color(0xFF0078D4).withOpacity(0.4),
+ blurRadius: 8,
+ offset: const Offset(0, 2),
+ ),
+ ]
+ : null,
+ ),
+ padding: const EdgeInsets.all(7),
+ child: SvgPicture.asset(
+ // 根据状态切换图片
+ isSelected ? selectedIconPath : iconPath,
+ colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
+ ),
+ ),
+ );
+ }
+
Widget _buildPingChip(int ping) {
Color color = ping < 100
? Colors.green
@@ -141,27 +242,32 @@ class TopStatusBar extends StatelessWidget {
);
}
- Widget _buildControlModeChip(ControlMode mode) {
+ Widget _buildControlModeChip(String mode) {
String displayText;
- switch (mode) {
- case ControlMode.BLE:
- displayText = '蓝牙模式';
- break;
- case ControlMode.LOCAL:
- displayText = '本地模式';
- break;
- case ControlMode.TCP:
- displayText = 'TCP模式';
- break;
- case ControlMode.NONE:
- displayText = '无模式';
- break;
- case ControlMode.OTHER:
- displayText = '其他模式';
- break;
- default:
- displayText = '未知模式';
+ if(mode == ''){
+ displayText = '无模式';
+ }else{
+ displayText = mode;
}
+ // switch (mode) {
+ // case "蓝牙模式":
+ // displayText = '蓝牙模式';
+ // break;
+ // case "本地模式":
+ // displayText = '本地模式';
+ // break;
+ // case "TCP模式":
+ // displayText = 'TCP模式';
+ // break;
+ // case "":
+ // displayText = '无模式';
+ // break;
+ // case "其他模式":
+ // displayText = '其他模式';
+ // break;
+ // default:
+ // displayText = '未知模式';
+ // }
return StatusChip(
text: displayText,
@@ -171,7 +277,43 @@ class TopStatusBar extends StatelessWidget {
);
}
- Widget _buildVoltageChip(int voltage) {
+ Widget _buildExpandIconButton({
+ required String iconPath, // 默认图标路径
+ required String selectedIconPath, // 选中后的图标路径
+ required VoidCallback onTap, // 点击事件
+ bool isSelected = false, // 是否选中状态
+ double size = 28, // 按钮尺寸
+ }) {
+ return InkWell(
+ onTap: onTap,
+ borderRadius: BorderRadius.circular(10),
+ child: AnimatedContainer(
+ duration: const Duration(milliseconds: 200),
+ // 增加颜色切换动画
+ width: size,
+ height: size,
+ decoration: BoxDecoration(
+ // 选中时为深蓝色,未选中时为半透明灰色
+ color: Colors.grey.withOpacity(0.4),
+ borderRadius: BorderRadius.circular(15),
+ border: Border.all(
+ color: Colors.white.withOpacity(0.3),
+ width: 0.5,
+ ),
+ boxShadow: null,
+ ),
+ padding: const EdgeInsets.all(7),
+ child: SvgPicture.asset(
+ // 根据状态切换图片
+ isSelected ? selectedIconPath : iconPath,
+ colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
+ ),
+ ),
+ );
+ }
+
+
+ Widget _buildVoltageChip(String voltage) {
return StatusChip(
text: "$voltage V",
color: Color(0xFFFACC15).withValues(alpha: 0.6),
@@ -205,7 +347,7 @@ class TopStatusBar extends StatelessWidget {
// 2. 使用 StatusChip 包装,但 icon 传入 SvgPicture
return StatusChip(
text: "$level%",
- color: color.withValues(alpha: 0.6),
+ color: color.withValues(alpha: 0.5),
svgColor: color,
// 如果你的 StatusChip 已经改为接受 Widget,则直接传 SvgPicture
// 如果 StatusChip 目前只接受 IconData,你需要按我之前的建议给它加个 leading 参数
@@ -215,7 +357,7 @@ class TopStatusBar extends StatelessWidget {
Widget _buildSliderBox(String label, bool isLeft, BuildContext context) {
// 1. 核心尺寸调整:足够宽的容器解决拥挤,高度匹配状态栏
- const double boxWidth = 96; // 水平宽度放大,容纳左右图标
+ const double boxWidth = 76; // 水平宽度放大,容纳左右图标
const double boxHeight = 32; // 高度和其他按钮保持一致
const double iconSize = 20; // 图标尺寸放大,避免过小拥挤
diff --git a/packages/cc_ui_kit/lib/src/cc_expand_slider.dart b/packages/cc_ui_kit/lib/src/cc_expand_slider.dart
index 23a231a6..356e6278 100644
--- a/packages/cc_ui_kit/lib/src/cc_expand_slider.dart
+++ b/packages/cc_ui_kit/lib/src/cc_expand_slider.dart
@@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import 'package:vibration/vibration.dart';
enum SliderAxis { horizontal, vertical }
@@ -41,25 +42,91 @@ class _CCExpandSliderState extends State {
double _alignmentValue = 0.0;
bool _isExpanded = false;
Timer? _tickTimer;
+ int? _lastVibrationState;
+ Timer? _continuousVibrateTimer;
+ bool _hasCheckedVibrator = false;
+ bool? _hasVibrator;
+
+ @override
+ void initState() {
+ super.initState();
+ _checkVibrator();
+ }
+
+ Future _checkVibrator() async {
+ _hasVibrator = await Vibration.hasVibrator();
+ setState(() {
+ _hasCheckedVibrator = true;
+ });
+ debugPrint('🔍 震动器检测:${_hasVibrator == true ? "有" : "无"}');
+ }
@override
void dispose() {
_tickTimer?.cancel();
+ _continuousVibrateTimer?.cancel();
super.dispose();
}
+ Future _triggerVibration(int duration, String reason) async {
+ if (!_hasCheckedVibrator) return;
+
+ try {
+ if (_hasVibrator == true) {
+ await Vibration.vibrate(duration: duration);
+ debugPrint('📳 $reason - 震动 ${duration}ms');
+ } else {
+ debugPrint('⚠️ $reason - 设备不支持震动');
+ }
+ } catch (e) {
+ debugPrint('❌ $reason - 震动失败:$e');
+ }
+ }
+
+ void _vibrate(int state) {
+ if (state != _lastVibrationState) {
+ _triggerVibration(50, '状态变化');
+ _lastVibrationState = state;
+ }
+ }
+
+ void _startContinuousVibration() {
+ _continuousVibrateTimer?.cancel();
+ _continuousVibrateTimer = Timer.periodic(const Duration(milliseconds: 300), (_) {
+ if (!_isExpanded) return;
+
+ if (_alignmentValue < -0.5 || _alignmentValue > 0.5) {
+ _triggerVibration(30, '连续震动');
+ }
+ });
+ }
+
+ void _stopContinuousVibration() {
+ _continuousVibrateTimer?.cancel();
+ _continuousVibrateTimer = null;
+ }
+
void _startTicking() {
_tickTimer?.cancel();
_tickTimer = Timer.periodic(const Duration(milliseconds: 100), (timer) {
if (!_isExpanded) return;
+
+ int currentState;
if (_alignmentValue < -0.5) {
+ currentState = -1;
widget.onStart?.call();
} else if (_alignmentValue > 0.5) {
+ currentState = 1;
widget.onEnd?.call();
} else {
+ currentState = 0;
widget.onCenter?.call();
}
+
+ _vibrate(currentState);
});
+
+ _startContinuousVibration();
}
void _safeSetExpanded(bool expanded) {
@@ -70,6 +137,8 @@ class _CCExpandSliderState extends State {
if (!expanded) {
_alignmentValue = 0.0;
_tickTimer?.cancel();
+ _continuousVibrateTimer?.cancel();
+ _lastVibrationState = null;
}
});
if (expanded) _startTicking();
@@ -88,7 +157,13 @@ class _CCExpandSliderState extends State {
return GestureDetector(
behavior: HitTestBehavior.opaque,
- onPanDown: (_) => _safeSetExpanded(true),
+ onPanDown: (_) {
+ debugPrint('👆 按下');
+ if (_hasCheckedVibrator) {
+ _triggerVibration(40, '按下');
+ }
+ _safeSetExpanded(true);
+ },
onPanUpdate: (details) {
if (!_isExpanded) return;
setState(() {
@@ -97,16 +172,23 @@ class _CCExpandSliderState extends State {
});
},
onPanEnd: (_) {
+ debugPrint('✋ 松开');
if (widget.isSpring) widget.onCenter?.call();
- HapticFeedback.lightImpact();
+ if (_hasCheckedVibrator) {
+ _triggerVibration(40, '松开');
+ }
+ _lastVibrationState = null;
+ _stopContinuousVibration();
+ _safeSetExpanded(false);
+ },
+ onPanCancel: () {
+ debugPrint('❌ 取消');
_safeSetExpanded(false);
},
- onPanCancel: () => _safeSetExpanded(false),
child: Stack(
alignment: Alignment.center,
clipBehavior: Clip.none,
children: [
- // 1. 轨道背景:从中向外展开
AnimatedContainer(
duration: const Duration(milliseconds: 200),
curve: Curves.easeOutCubic,
@@ -120,10 +202,8 @@ class _CCExpandSliderState extends State {
child: _buildSegmentedContent(isVertical, maxLength, minLength),
),
- // 2. 核心修改:文字位置固定逻辑
- // 我们用一个和“缩起状态”一样大的 SizedBox 作为参考
if (!_isExpanded)
- IgnorePointer( // 防止文字遮挡点击
+ IgnorePointer(
child: SizedBox(
width: minLength,
height: minLength,
@@ -132,7 +212,7 @@ class _CCExpandSliderState extends State {
alignment: Alignment.center,
children: [
Positioned(
- bottom: -22, // 这里的 -22 是相对于“缩起时正方形”的底部
+ bottom: -22,
child: Text(
widget.label,
style: TextStyle(
@@ -220,4 +300,4 @@ class _CCExpandSliderState extends State {
colorFilter: ColorFilter.mode(color, BlendMode.srcIn),
);
}
-}
\ No newline at end of file
+}
diff --git a/pubspec.lock b/pubspec.lock
index f4999771..67f6c7d6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1420,6 +1420,22 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
+ vibration:
+ dependency: "direct main"
+ description:
+ name: vibration
+ sha256: "9bb06614c69260f8bd11c80fe01ed7988905cf00e3417d656c2647e41f261d87"
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "3.1.8"
+ vibration_platform_interface:
+ dependency: transitive
+ description:
+ name: vibration_platform_interface
+ sha256: "4134fbfcd427b59a7a91f8733292e4e9b29a7f1e8224ff0d80f5745fbf0743c6"
+ url: "https://pub.flutter-io.cn"
+ source: hosted
+ version: "0.1.1"
visibility_detector:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5428cdb3..a92c796d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -125,7 +125,7 @@ dependencies:
flutter_markdown: ^0.7.1
#qr_code_scanner: ^1.0.1 # 用于扫描二维码
-
+ vibration: ^3.1.8
dev_dependencies:
flutter_test:
From 59912b76fd1d53bbda6a037544ba44b1b3e718e1 Mon Sep 17 00:00:00 2001
From: Songzex <2402265378@qq.com>
Date: Wed, 25 Mar 2026 08:48:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B5=E9=87=8F?=
=?UTF-8?q?=E7=9A=84=E5=8F=96=E6=95=B0=E6=8D=AE=E5=92=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../presentation/bloc/remote_control_cubit.dart | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart b/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
index 6b9f1474..b5cca598 100644
--- a/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
+++ b/lib/features/remote_control/presentation/bloc/remote_control_cubit.dart
@@ -76,7 +76,7 @@ class RemoteControlCubit extends Cubit {
emit(state.copyWith(
runningStatusModel: newStatus,
voltage:int.tryParse(newStatus.voltage) ?? 0,
- battery: int.tryParse(newStatus.voltage) ?? 0,
+ battery: int.tryParse(newStatus.battery) ?? 0,
// 如果需要同步其他字段,在这里添加
// controlMode: newStatus.controlMode,
));
@@ -238,8 +238,7 @@ class RemoteControlCubit extends Cubit {
}
void toggleLeftPip() => emit(state.copyWith(showLeftPip: !state.showLeftPip));
- void toggleRightPip() =>
- emit(state.copyWith(showRightPip: !state.showRightPip));
+ void toggleRightPip() => emit(state.copyWith(showRightPip: !state.showRightPip));
@override
Future close() {