feat: 代码合并

.gitlab-ci.yml

@@ -20,7 +20,6 @@ variables:
     - if: $CI_COMMIT_BRANCH == "release"
     - if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
     - if: $CI_COMMIT_BRANCH == "canary_release"
-    - if: $CI_COMMIT_BRANCH == "develop_liyi"
     - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/
 
 .notify_rule:
@@ -173,7 +172,7 @@ create-release:
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.apk'
           link_type: 'package'
         - name: 'xhj bundle binary package'
-          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.aab'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj_bundle-release-${CI_COMMIT_TAG}.aab'
           link_type: 'package'
         - name: 'sky apk binary package'
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.apk'

android/app/src/xhj_bundle/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"ltd.xhjcn.lock"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"ltd.xhjcn.lock"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"ltd.xhjcn.lock",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"ltd.xhjcn.lock",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/xhj_bundle/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "448746601330",
+    "project_id": "smart-lock-12b8c",
+    "storage_bucket": "smart-lock-12b8c.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:448746601330:android:1a8056175e1dad5e317beb",
+        "android_client_info": {
+          "package_name": "ltd.xhjcn.lock"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAm8dJlBY5hjslJDVDBNd2bkWrJlGjAMqw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/xhj_bundle/res/values-en-rUS/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Star Lock</string>
+</resources>

android/app/src/xhj_bundle/res/values-zh-rCN/string.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">星星锁</string>
+</resources>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 #use_modular_headers!
 use_frameworks! :linkage => :static
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.

ios/Podfile.lock

@@ -79,6 +79,49 @@ PODS:
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
+  - Firebase/Analytics (11.0.0):
+    - Firebase/Core
+  - Firebase/Core (11.0.0):
+    - Firebase/CoreOnly
+    - FirebaseAnalytics (~> 11.0.0)
+  - Firebase/CoreOnly (11.0.0):
+    - FirebaseCore (= 11.0.0)
+  - firebase_analytics (11.3.0):
+    - Firebase/Analytics (= 11.0.0)
+    - firebase_core
+    - Flutter
+  - firebase_core (3.4.0):
+    - Firebase/CoreOnly (= 11.0.0)
+    - Flutter
+  - FirebaseAnalytics (11.0.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.0.0)
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/AdIdSupport (11.0.0):
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleAppMeasurement (= 11.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseCore (11.0.0):
+    - FirebaseCoreInternal (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreInternal (11.7.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseInstallations (11.4.0):
+    - FirebaseCore (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
   - Flutter (1.0.0)
   - flutter_blue_plus (0.0.1):
     - Flutter
@@ -106,11 +149,58 @@ PODS:
   - google_maps_flutter_ios (0.0.1):
     - Flutter
     - GoogleMaps (< 9.0)
+  - GoogleAppMeasurement (11.0.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/AdIdSupport (11.0.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.0.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
   - GoogleMaps (6.2.1):
     - GoogleMaps/Maps (= 6.2.1)
   - GoogleMaps/Base (6.2.1)
   - GoogleMaps/Maps (6.2.1):
     - GoogleMaps/Base
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.0.2):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.0.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/MethodSwizzler (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.0.2):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - image_gallery_saver (2.0.2):
     - Flutter
   - image_picker_ios (0.0.1):
@@ -125,6 +215,11 @@ PODS:
     - JPush (= 5.3.0)
   - just_audio (0.0.1):
     - Flutter
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
   - network_info_plus (0.0.1):
     - Flutter
   - open_filex (0.0.2):
@@ -136,6 +231,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
+  - PromisesObjC (2.4.0)
   - SDWebImage (5.19.2):
     - SDWebImage/Core (= 5.19.2)
   - SDWebImage/Core (5.19.2)
@@ -180,6 +276,8 @@ DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - fast_rsa (from `.symlinks/plugins/fast_rsa/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
+  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - Flutter (from `Flutter`)
   - flutter_blue_plus (from `.symlinks/plugins/flutter_blue_plus/ios`)
   - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
@@ -225,10 +323,19 @@ SPEC REPOS:
     - Bugly
     - DKImagePickerController
     - DKPhotoGallery
+    - Firebase
+    - FirebaseAnalytics
+    - FirebaseCore
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - GoogleAppMeasurement
     - GoogleMaps
+    - GoogleUtilities
     - ios-voice-processor
     - JCore
     - JPush
+    - nanopb
+    - PromisesObjC
     - SDWebImage
     - SwiftyGif
     - Toast
@@ -263,6 +370,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/fast_rsa/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
+  firebase_analytics:
+    :path: ".symlinks/plugins/firebase_analytics/ios"
+  firebase_core:
+    :path: ".symlinks/plugins/firebase_core/ios"
   Flutter:
     :path: Flutter
   flutter_blue_plus:
@@ -342,6 +453,13 @@ SPEC CHECKSUMS:
   EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475
   fast_rsa: a1fed69b074093d2e2e3fefae6b821a071649d4c
   file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
+  firebase_analytics: 1a66fe8d4375eccff44671ea37897683a78b2675
+  firebase_core: ceec591a66629daaee82d3321551692c4a871493
+  FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
+  FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
+  FirebaseCoreInternal: d6c17dafc8dc33614733a8b52df78fcb4394c881
+  FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
   flutter_bugly: bf35df32a9c5d50b8aacdd35bd8ddc5b55150dae
@@ -352,7 +470,9 @@ SPEC CHECKSUMS:
   fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   fluwx: c18fd6c16b03a2187cd07d6e48e32a7801962849
   google_maps_flutter_ios: f135b968a67c05679e0a53538e900b5c174b0d99
+  GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de
   GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
@@ -360,11 +480,13 @@ SPEC CHECKSUMS:
   JPush: b71f497a3c1b825c7843fd97f290b05d5cd75f2e
   jpush_flutter: c87be254790933c0363684169ef9d3d279a5adc5
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
@@ -379,6 +501,6 @@ SPEC CHECKSUMS:
   webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
   WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f
 
-PODFILE CHECKSUM: a4d4747e9f246a7c5b9d643d5efa33799112963a
+PODFILE CHECKSUM: 728f9c851a19709391c77c54ed3556e484b54db6
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -1080,7 +1080,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1178,7 +1178,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1205,7 +1205,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1231,7 +1231,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1477,7 +1477,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1575,7 +1575,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1673,7 +1673,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NAQ5PL2DYC;
 				INFOPLIST_FILE = Runner/info_sky.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1771,7 +1771,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1869,7 +1869,7 @@
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8997RW3V8;
 				INFOPLIST_FILE = Runner/info_xhj.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",

ios/build.sh

@@ -23,7 +23,7 @@ elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then
     echo "===build dev===${NEXT_VERSION}"
     bundle exec fastlane beta flavor:xhj env:Dev --verbose
     bundle exec fastlane beta flavor:sky env:Dev --verbose
-elif [[ "${ENV_BUILD_BRANCH}" == "release" ]] || [[ "${ENV_BUILD_BRANCH}" == "feat_devops" ]] || [[ "${ENV_BUILD_BRANCH}" == "develop_liyi" ]] ; then
+elif [[ "${ENV_BUILD_BRANCH}" == "release" ]] || [[ "${ENV_BUILD_BRANCH}" == "feat_devops" ]] ; then
     echo "===build pre===${NEXT_VERSION}"
     bundle exec fastlane beta flavor:xhj env:Pre --verbose
     bundle exec fastlane beta flavor:sky env:Pre --verbose

lan/lan_en.json

@@ -1,6 +1,6 @@
 {
   "星锁": "Star Lock",
-  "锁通通": "Lock Through",
+  "锁通通": "TTLock Pro",
   "点击开锁，长按闭锁": "Touch to Unlock,Hold to Lock",
   "考勤": "Attendance",
   "考勤设置": "Attendance Settings",

lan/lan_hu.json

@@ -1,6 +1,6 @@
 {
     "星锁": "Star lock",
-    "锁通通": "Lock through",
+    "锁通通": "TTLock Pro",
     "点击开锁，长按闭锁": "Érintse fel, hogy kinyit, tartsa zárni",
     "考勤": "Látogatottság",
     "考勤设置": "Látogatottsági beállítások",

lan/lan_lt.json

@@ -1,6 +1,6 @@
 {
     "星锁": "Žvaigždžių užraktas",
-    "锁通通": "Lock through",
+    "锁通通": "TTLock Pro",
     "点击开锁，长按闭锁": "Palieskite atrakinti, laikykite užrakinti",
     "考勤": "Lankomumas",
     "考勤设置": "Lankomumo nustatymai",

lib/appRouters.dart

@@ -60,7 +60,7 @@ import 'package:star_lock/mine/mineSet/transferSmartLock/transferSmartLockList/t
 import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_page.dart';
 import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_page.dart';
 import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart';
-import 'package:star_lock/talk/startChart/views/talkView/talk_view_page.dart';
+import 'package:star_lock/talk/starChart/views/talkView/talk_view_page.dart';
 
 import 'common/safetyVerification/safetyVerification_page.dart';
 import 'login/forgetPassword/starLock_forgetPassword_page.dart';

lib/blue/io_tool/manager_event_bus.dart

@@ -1,32 +1,28 @@
-
-
 import 'package:event_bus/event_bus.dart';
 
 class EventBusManager {
-
   factory EventBusManager() => shareManager();
-  EventBusManager._init(){
+
+  EventBusManager._init() {
     eventBus = EventBus(sync: false);
   }
+
   EventBus? eventBus;
 
   static EventBusManager? _manager;
 
-  static EventBusManager shareManager(){
+  static EventBusManager shareManager() {
     _manager ??= EventBusManager._init();
     return _manager!;
   }
+
   EventBusManager get manager => shareManager();
+
   //发送事件
   eventBusFir(dynamic event) {
     eventBus?.fire(event);
   }
 
-  // 发送事件
-  void fireEvent(dynamic event) {
-    eventBus?.fire(event);
-  }
-
   // 获取 EventBus 实例
   EventBus? get bus => eventBus;
 }

lib/login/login/starLock_login_logic.dart

@@ -8,7 +8,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/mine/mine/starLockMine_state.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart';
-import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart';
+import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../main/lockMian/lockMain/lockMain_logic.dart';

lib/login/login/starLock_login_page.dart

@@ -4,8 +4,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/flavors.dart';
 import 'package:star_lock/login/login/starLock_login_state.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_ping_handler.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_ping_handler.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/appFirstEnterHandle.dart';
 import 'package:star_lock/tools/storage.dart';
 import 'package:star_lock/tools/wechat/customer_tool.dart';

lib/main.dart

@@ -13,8 +13,8 @@ import 'package:star_lock/mine/about/debug/debug_tool.dart';
 import 'package:star_lock/network/api_provider.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/network/start_chart_api.dart';
-import 'package:star_lock/talk/startChart/handle/impl/debug_Info_model.dart';
-import 'package:star_lock/talk/startChart/status/appLifecycle_observer.dart';
+import 'package:star_lock/talk/starChart/handle/impl/debug_Info_model.dart';
+import 'package:star_lock/talk/starChart/status/appLifecycle_observer.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
 import 'package:star_lock/tools/device_info_service.dart';
 import 'package:star_lock/tools/platform_info_services.dart';

lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -12,6 +12,8 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockTime/getServerDatetime_entity.dart';
 import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
 import 'package:star_lock/tools/throttler.dart';
 import 'package:star_lock/widget/permission/permission_dialog.dart';
@@ -48,7 +50,7 @@ class LockDetailLogic extends BaseGetXController {
     state.replySubscription =
         EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // 开门
-      if (reply is OpenDoorReply && state.ifCurrentScreen.value == true) {
+      if (reply is OpenDoorReply) {
         _replyOpenLock(reply);
       }
 
@@ -116,6 +118,11 @@ class LockDetailLogic extends BaseGetXController {
 
         //锁数据更新
         getLockRecordLastUploadDataTime();
+        // 只有接听状态时才可以重发开门指令
+        if (StartChartManage().talkStatus.status ==
+            TalkStatus.answeredSuccessfully) {
+          showToast('开锁成功'.tr);
+        }
         break;
       case 0x06:
         //无权限
@@ -143,6 +150,12 @@ class LockDetailLogic extends BaseGetXController {
           signKey: signKeyDataList,
           privateKey: getPrivateKeyList,
         );
+        // 只有接听状态时才可以重发开门指令
+        if (StartChartManage().talkStatus.status ==
+            TalkStatus.answeredSuccessfully) {
+          sendStarChartOpenLockMessage(reply);
+        }
+
         break;
       case 0x16:
         // 正在开锁中...
@@ -198,6 +211,43 @@ class LockDetailLogic extends BaseGetXController {
     }
   }
 
+  /// 发送星图的开门蓝牙透传命令
+  void sendStarChartOpenLockMessage(Reply reply) async {
+    /// 无权限开门时，重新发送一个带token信息的开门信息
+    final List<String>? privateKey =
+        await Storage.getStringList(saveBluePrivateKey);
+    final List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+
+    final List<String>? signKey = await Storage.getStringList(saveBlueSignKey);
+    final List<int> signKeyDataList = changeStringListToIntList(signKey!);
+
+    final List<int> tokenData = reply.data.sublist(2, 6);
+    final List<String> saveStrList = changeIntListToStringList(tokenData);
+    Storage.setStringList(saveBlueToken, saveStrList);
+
+    final OpenLockCommand openLockCommand = OpenLockCommand(
+      lockID: BlueManage().connectDeviceName,
+      userID: await Storage.getUid(),
+      openMode: state.openDoorModel,
+      openTime: getUTCNetTime(),
+      onlineToken: state.lockNetToken,
+      token: tokenData,
+      needAuthor: 1,
+      signKey: signKeyDataList,
+      privateKey: getPrivateKeyList,
+    );
+    final messageDetail = openLockCommand.packageData();
+    // 将 List<int> 转换为十六进制字符串
+    String hexString = messageDetail
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join(' ');
+    // 发送远程开门消息
+    StartChartManage().sendRemoteUnLockMessage(
+      bluetoothDeviceName: BlueManage().connectDeviceName,
+      openLockCommand: messageDetail,
+    );
+  }
+
   Future<void> loadData(
       {required LockListInfoItemEntity lockListInfoItemEntity,
       required bool isOnlyOneData}) async {

lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -13,7 +13,7 @@ import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dar
 import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart';
 import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/aliyunRealNameAuth/aliyunRealNameAuthHandle.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/bugly/bugly_tool.dart';
@@ -1584,11 +1584,12 @@ class _LockDetailPageState extends State<LockDetailPage>
       if (mac != null && mac.isNotEmpty) {
         final DeviceNetwork deviceNetworkInfo = await ApiRepository.to
             .getDeviceNetwork(deviceType: 2, deviceMac: mac);
-        if (deviceNetworkInfo.data?.wifiName == null) {
+        if (deviceNetworkInfo.data?.wifiName == null ||
+            deviceNetworkInfo.data?.wifiName == '') {
           return;
         } else {
           final peerId = deviceNetworkInfo?.data?.peerId;
-          if (peerId == null || peerId.isEmpty) {
+          if (peerId == null || peerId.isEmpty || peerId == '') {
             throw Exception('设备peerId为空');
           }
           // 设置锁的peerID

lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart

@@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/cat
 import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_state.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/storage.dart';
 

lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart

@@ -7,7 +7,7 @@ import 'package:star_lock/blue/io_tool/io_tool.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/storage.dart';
 import 'package:star_lock/versionUndate/versionUndate_entity.dart';

lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart

@@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_
 import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/dateTool.dart';
 import 'package:star_lock/tools/storage.dart';

lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart

@@ -15,8 +15,8 @@ import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifiEntity.dart';
 import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart';
 import 'package:star_lock/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart';
-import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../../blue/blue_manage.dart';

lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_logic.dart

@@ -4,7 +4,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/blue/io_gateway/io_gateway_getWifiList.dart';
 import 'package:star_lock/blue/io_protocol/io_getWifiList.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../../../blue/blue_manage.dart';

lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart

@@ -7,7 +7,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_
 import 'package:star_lock/main/lockDetail/lockSet/liveVideo/liveVideo_state.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/storage.dart';
 import 'package:star_lock/versionUndate/versionUndate_entity.dart';

lib/main/lockMian/lockMain/lockMain_logic.dart

@@ -11,7 +11,7 @@ import 'package:star_lock/flavors.dart';
 import 'package:star_lock/login/login/entity/LoginEntity.dart';
 import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_logic.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/showTipView.dart';

lib/main/lockMian/lockMain/lockMain_page.dart

@@ -12,11 +12,11 @@ import 'package:star_lock/blue/blue_manage.dart';
 import 'package:star_lock/main/lockMian/lockList/lockList_xhj_page.dart';
 import 'package:star_lock/main/lockMian/lockMain/lockMain_state.dart';
 import 'package:star_lock/talk/call/g711.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart';
-import 'package:star_lock/talk/startChart/proto/test.pb.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart';
+import 'package:star_lock/talk/starChart/proto/test.pb.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/submitBtn.dart';
 

lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart

@@ -8,7 +8,7 @@ import 'package:star_lock/main/lockMian/lockMain/lockMain_page.dart';
 import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_state.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/storage.dart';

lib/main_xhj_bundle_lite.dart

@@ -0,0 +1,11 @@
+import 'app_settings/app_settings.dart';
+import 'flavors.dart';
+
+import 'main.dart' as runner;
+
+Future<void> main() async {
+  F.appFlavor = Flavor.xhj;
+  F.isLite = true;
+  // AppLog.log('xhj_lite调用了main函数');
+  await runner.main();
+}

lib/mine/mineSet/mineSet/mineSet_logic.dart

@@ -10,7 +10,7 @@ import 'package:star_lock/mine/mineSet/lockUserManage/expireLockList/expireElect
 import 'package:star_lock/mine/mineSet/mineSet/mineSet_state.dart';
 import 'package:star_lock/mine/mineSet/mineSet/userSettingInfoEntity.dart';
 import 'package:star_lock/mine/mineSet/mineSet/weChatQRCodeEntity.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 import 'package:star_lock/tools/push/xs_jPhush.dart';
 import 'package:star_lock/tools/showCupertinoAlertView.dart';
 import 'package:star_lock/tools/storage.dart';

lib/network/api_provider.dart

@@ -2747,6 +2747,7 @@ class ApiProvider extends BaseProvider {
             'deviceMac': deviceMac,
           }),
           isShowNetworkErrorMsg: false,
+          isShowErrMsg: false,
           isUnShowLoading: true);
 }
 

lib/network/start_chart_api.dart

@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'package:get/get.dart';
 import 'package:star_lock/network/api_provider.dart';
 import 'package:star_lock/network/api_provider_base.dart';
-import 'package:star_lock/talk/startChart/entity/relay_info_entity.dart';
-import 'package:star_lock/talk/startChart/entity/report_information_data.dart';
-import 'package:star_lock/talk/startChart/entity/star_chart_register_node_entity.dart';
+import 'package:star_lock/talk/starChart/entity/relay_info_entity.dart';
+import 'package:star_lock/talk/starChart/entity/report_information_data.dart';
+import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart';
 
 class StartChartApi extends BaseProvider {
   // 星图url

lib/talk/other/audio_player_manager.dart

@@ -1,8 +1,8 @@
 import 'package:audioplayers/audioplayers.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/talk/startChart/constant/udp_constant.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/constant/udp_constant.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 
 class AudioPlayerManager {
   // 私有构造函数，防止外部创建实例

lib/talk/starChart/command/message_command.dart

@@ -1,22 +1,22 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/protocol_flag_constant.dart';
-import 'package:star_lock/talk/startChart/constant/udp_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/proto/ble_message.pb.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_accept.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_hangup.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_ping.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_reject.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/protocol_flag_constant.dart';
+import 'package:star_lock/talk/starChart/constant/udp_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/proto/ble_message.pb.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_accept.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_hangup.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_ping.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_reject.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart';
 
 class MessageCommand {
   // 全局字典，用于存储每个 ToPeerId 对应的当前 messageId

lib/talk/starChart/entity/scp_message.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'dart:typed_data';
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/talk/startChart/exception/start_chart_message_exception.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_heart_beat_handler.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handler_factory.dart';
+import 'package:star_lock/talk/starChart/exception/start_chart_message_exception.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_heart_beat_handler.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handler_factory.dart';
 
 class ScpMessage {
   ScpMessage({

lib/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart

@@ -0,0 +1,80 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:get/get.dart';
+import 'package:star_lock/appRouters.dart';
+import 'package:star_lock/app_settings/app_settings.dart';
+import 'package:star_lock/blue/blue_manage.dart';
+import 'package:star_lock/blue/io_protocol/io_openLock.dart';
+import 'package:star_lock/blue/io_reply.dart';
+import 'package:star_lock/blue/io_tool/io_tool.dart';
+import 'package:star_lock/blue/io_tool/manager_event_bus.dart';
+import 'package:star_lock/blue/reciver_data.dart';
+import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart';
+import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_state.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/tools/bugly/bugly_tool.dart';
+import 'package:star_lock/tools/dateTool.dart';
+import 'package:star_lock/tools/eventBusEventManage.dart';
+import 'package:star_lock/tools/storage.dart';
+import 'package:umeng_common_sdk/umeng_common_sdk.dart';
+
+import '../../star_chart_manage.dart';
+
+class UdpBlePassThroughHandler extends ScpMessageBaseHandle
+    implements ScpMessageHandler {
+  @override
+  void handleReq(ScpMessage scpMessage) {
+    //TODO 收到蓝牙透传请求指令
+  }
+
+  @override
+  void handleResp(ScpMessage scpMessage) async {
+    final BleResp bleResp = scpMessage.Payload;
+    String hexString = bleResp.structData
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join(' ');
+    AppLog.log('收到蓝牙透传回复：$hexString');
+
+    // 触发数据对应的事件
+    await CommandReciverManager.appDataReceive(bleResp.structData);
+  }
+
+  @override
+  void handleInvalidReq(ScpMessage scpMessage) {}
+
+  @override
+  void handleRealTimeData(ScpMessage scpMessage) {}
+
+  @override
+  deserializePayload(
+      {required int payloadType,
+      required int messageType,
+      required List<int> byte,
+      int? offset,
+      int? PayloadLength,
+      int? spTotal,
+      int? spIndex,
+      int? messageId}) {
+    if (messageType == MessageTypeConstant.Resp) {
+      final BleResp bleResp = BleResp();
+      bleResp.mergeFromBuffer(byte);
+      return bleResp;
+    } else if (messageType == MessageTypeConstant.Req) {
+      final BleReq talkExpect = BleReq();
+      talkExpect.mergeFromBuffer(byte);
+      return talkExpect;
+    } else {
+      String payload = utf8.decode(byte);
+      return payload;
+    }
+  }
+}

lib/talk/starChart/handle/impl/udp_echo_test_handler.dart

@@ -3,12 +3,12 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpEchoTestHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_gateway_reset_handler.dart

@@ -3,13 +3,13 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpGateWayResetHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart

@@ -3,15 +3,15 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_transfer.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_transfer.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpGateWayTransferHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_go_online_handler.dart

@@ -1,12 +1,12 @@
 import 'dart:typed_data';
 
-import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/login_response.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/login_response.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpGoOnlineHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_heart_beat_handler.dart

@@ -1,13 +1,13 @@
 import 'dart:typed_data';
 
-import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/heartbeat_response.dart';
-import 'package:star_lock/talk/startChart/entity/login_response.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/heartbeat_response.dart';
+import 'package:star_lock/talk/starChart/entity/login_response.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpHeartBeatHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart

@@ -1,12 +1,12 @@
 import 'package:star_lock/login/selectCountryRegion/common/index.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart';
 
 class UdpRbcuInfoHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_rbcuProBe_handler.dart

@@ -1,12 +1,12 @@
 import 'package:star_lock/login/selectCountryRegion/common/index.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/rbcu.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/rbcu.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart';
 
 class UdpRbcuProBeHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart

@@ -4,16 +4,16 @@ import 'dart:typed_data';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/ble_message.pbserver.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/remote_unlock.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/ble_message.pbserver.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/remote_unlock.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpRemoteUnLockHandler extends ScpMessageBaseHandle implements ScpMessageHandler  {
 

lib/talk/starChart/handle/impl/udp_talk_accept_handler.dart

@@ -4,17 +4,17 @@ import 'dart:typed_data';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_pcm_sound/flutter_pcm_sound.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_accept.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_accept.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkAcceptHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_data_handler.dart

@@ -1,12 +1,12 @@
 import 'dart:typed_data';
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pbserver.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data_h264_frame.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pbserver.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data_h264_frame.pb.dart';
 
 // class UdpTalkDataHandler extends ScpMessageBaseHandle
 //     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_expect_handler.dart

@@ -4,19 +4,19 @@ import 'dart:typed_data';
 import 'package:flutter/services.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart';
-import 'package:star_lock/talk/startChart/views/talkView/talk_view_logic.dart';
-import 'package:star_lock/talk/startChart/views/talkView/talk_view_state.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
+import 'package:star_lock/talk/starChart/views/talkView/talk_view_logic.dart';
+import 'package:star_lock/talk/starChart/views/talkView/talk_view_state.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkExpectHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_hangup_handler.dart

@@ -2,40 +2,40 @@ import 'dart:convert';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_hangup.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_hangup.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkHangUpHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {
   @override
   void handleReq(ScpMessage scpMessage) {
-    // if (talkStatus.status != TalkStatus.answeredSuccessfully) {
-    //   // 如果不是接听中，不处理通话中挂断请求
-    //   return;
-    // }
+    // 只有接听成功或者等待接听时才处理挂断请求
+    if (talkStatus.status == TalkStatus.answeredSuccessfully ||
+        talkStatus.status == TalkStatus.passiveCallWaitingAnswer ||
+        talkStatus.status == TalkStatus.proactivelyCallWaitingAnswer) {
+      // 回复请求
+      replySuccessMessage(scpMessage);
+      talkStatus.setHangingUpDuring();
+      stopRingtone();
+      startChartManage.stopTalkExpectMessageTimer();
+      startChartManage.stopTalkPingMessageTimer();
+      // 挂断之后，停止对讲请求超时监听定时器
 
-    // 回复请求
-    replySuccessMessage(scpMessage);
-    talkStatus.setHangingUpDuring();
-    stopRingtone();
-    startChartManage.stopTalkExpectMessageTimer();
-    startChartManage.stopTalkPingMessageTimer();
-    // 挂断之后，停止对讲请求超时监听定时器
+      talkeRequestOverTimeTimerManager.cancel();
+      talkePingOverTimeTimerManager.cancel();
+      talkDataOverTimeTimerManager.cancel();
 
-    talkeRequestOverTimeTimerManager.cancel();
-    talkePingOverTimeTimerManager.cancel();
-    talkDataOverTimeTimerManager.cancel();
-
-    // EasyLoading.showToast('已挂断'.tr);
-    Get.back();
+      EasyLoading.showToast('已挂断'.tr);
+      Get.back();
+    }
   }
 
   @override

lib/talk/starChart/handle/impl/udp_talk_ping_handler.dart

@@ -1,13 +1,13 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_ping.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_ping.pb.dart';
 
 class UdpTalkPingHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_push_handler.dart

@@ -3,15 +3,15 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_push.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_push.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkPushHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart

@@ -3,15 +3,15 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_receiver_transfer.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_receiver_transfer.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkReceiverTransferHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_reject_handler.dart

@@ -3,15 +3,15 @@ import 'dart:typed_data';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_reject.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_reject.pb.dart';
 
-import '../../start_chart_manage.dart';
+import '../../star_chart_manage.dart';
 
 class UdpTalkRejectHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/impl/udp_talk_request_handler.dart

@@ -5,15 +5,15 @@ import 'package:flutter/services.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
-import 'package:star_lock/talk/startChart/constant/message_type_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
-import 'package:star_lock/talk/startChart/proto/gateway_reset.pb.dart';
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_expect.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_request.pb.dart';
+import 'package:star_lock/talk/starChart/constant/message_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/proto/gateway_reset.pb.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_expect.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_request.pb.dart';
 import 'package:star_lock/tools/storage.dart';
 
 class UdpTalkRequestHandler extends ScpMessageBaseHandle

lib/talk/starChart/handle/impl/unknow_payload_type_handler.dart

@@ -1,9 +1,9 @@
 import 'dart:typed_data';
 
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_base_handle.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_base_handle.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
 class UnKnowPayloadTypeHandler extends ScpMessageBaseHandle
     implements ScpMessageHandler {

lib/talk/starChart/handle/other/do_sign.dart

@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:pointycastle/export.dart' as pc;
 import 'dart:convert';
 import 'package:asn1lib/asn1lib.dart' as asn1lib;
-import 'package:star_lock/talk/startChart/exception/start_chart_message_exception.dart'; // Prefix for asn1lib
+import 'package:star_lock/talk/starChart/exception/start_chart_message_exception.dart'; // Prefix for asn1lib
 
 class DoSign {
   // 生成签名sing

lib/talk/starChart/handle/other/talk_data_repository.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
 
 class TalkDataRepository {
   // 创建一个私有的构造函数，防止外部创建实例

lib/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/talk/other/audio_player_manager.dart';
-import 'package:star_lock/talk/startChart/constant/talk_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
-import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart';
+import 'package:star_lock/talk/starChart/constant/talk_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
+import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart';
 
 class TalkDataOverTimeTimerManager {
   // 单例实例

lib/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/talk/startChart/constant/talk_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
-import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart';
+import 'package:star_lock/talk/starChart/constant/talk_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
+import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart';
 
 class TalkePingOverTimeTimerManager {
   // 单例实例

lib/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:get/get.dart';
-import 'package:star_lock/talk/startChart/constant/talk_constant.dart';
-import 'package:star_lock/talk/startChart/constant/talk_status.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
-import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart';
+import 'package:star_lock/talk/starChart/constant/talk_constant.dart';
+import 'package:star_lock/talk/starChart/constant/talk_status.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
+import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart';
 
 class TalkeRequestOverTimeTimerManager {
   // 单例实例

lib/talk/starChart/handle/scp_message_base_handle.dart

@@ -9,21 +9,21 @@ import 'package:get/get.dart';
 
 import 'package:star_lock/app_settings/app_settings.dart';
 import 'package:star_lock/talk/other/audio_player_manager.dart';
-import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart';
+import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart';
 
-import 'package:star_lock/talk/startChart/constant/udp_constant.dart';
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/constant/udp_constant.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
 
-import 'package:star_lock/talk/startChart/handle/other/talk_data_repository.dart';
-import 'package:star_lock/talk/startChart/handle/other/talke_data_over_time_timer_manager.dart';
-import 'package:star_lock/talk/startChart/handle/other/talke_ping_over_time_timer_manager.dart';
-import 'package:star_lock/talk/startChart/handle/other/talke_request_over_time_timer_manager.dart';
+import 'package:star_lock/talk/starChart/handle/other/talk_data_repository.dart';
+import 'package:star_lock/talk/starChart/handle/other/talke_data_over_time_timer_manager.dart';
+import 'package:star_lock/talk/starChart/handle/other/talke_ping_over_time_timer_manager.dart';
+import 'package:star_lock/talk/starChart/handle/other/talke_request_over_time_timer_manager.dart';
 
-import 'package:star_lock/talk/startChart/proto/generic.pb.dart';
-import 'package:star_lock/talk/startChart/proto/talk_data.pb.dart';
-import 'package:star_lock/talk/startChart/start_chart_manage.dart';
+import 'package:star_lock/talk/starChart/proto/generic.pb.dart';
+import 'package:star_lock/talk/starChart/proto/talk_data.pb.dart';
+import 'package:star_lock/talk/starChart/star_chart_manage.dart';
 
-import 'package:star_lock/talk/startChart/status/start_chart_talk_status.dart';
+import 'package:star_lock/talk/starChart/status/star_chart_talk_status.dart';
 
 class ScpMessageBaseHandle {
   /// 使用单例 TimerManager

lib/talk/starChart/handle/scp_message_handle.dart

@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:star_lock/talk/startChart/entity/scp_message.dart';
+import 'package:star_lock/talk/starChart/entity/scp_message.dart';
 
 abstract class ScpMessageHandler {
   // 处理请求

lib/talk/starChart/handle/scp_message_handler_factory.dart

@@ -1,23 +1,23 @@
-import 'package:star_lock/talk/startChart/constant/payload_type_constant.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_rbcuInfo_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_request_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_echo_test_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_gateway_reset_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_go_online_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_heart_beat_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_accept_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_data_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_expect_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_hangup_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_ping_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_push_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/udp_talk_reject_handler.dart';
-import 'package:star_lock/talk/startChart/handle/impl/unknow_payload_type_handler.dart';
-import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart';
+import 'package:star_lock/talk/starChart/constant/payload_type_constant.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_ble_passthrough_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_rbcuInfo_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_request_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_echo_test_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_gateway_reset_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_gateway_transfer_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_go_online_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_heart_beat_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_remote_un_lock_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_accept_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_data_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_expect_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_hangup_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_ping_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_push_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_receiver_transfer_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/udp_talk_reject_handler.dart';
+import 'package:star_lock/talk/starChart/handle/impl/unknow_payload_type_handler.dart';
+import 'package:star_lock/talk/starChart/handle/scp_message_handle.dart';
 
 class ScpMessageHandlerFactory {
   /// 构造工厂