Merge branch 'develop' into build-addGateway-20240814

.gitlab-ci.yml

@@ -95,8 +95,8 @@ generate_git_tag:
     - bash pre_build.sh sky
     - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///')
     - echo "project_url:$project_url"
-    - echo "CI_SERVER_FQDN:$CI_SERVER_FQDN"
-    - git remote set-url origin git@$CI_SERVER_FQDN:StarlockTeam/app-starlock.git
+    - echo "CI_SERVER_FQDN:$CI_SERVER_FQDN/CI_PROJECT_ROOT_NAMESPACE:$CI_PROJECT_ROOT_NAMESPACE/CI_PROJECT_NAME:$CI_PROJECT_NAME"
+    - git remote set-url origin git@$CI_SERVER_FQDN:$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME.git
   script:
     - bash tag_generator.sh generate_tag
 

android/app/src/main/kotlin/com/skychip/lock/MainActivity.kt

@@ -20,9 +20,12 @@ class MainActivity : FlutterActivity() {
         GeneratedPluginRegistrant.registerWith(flutterEngine!!)
 
         // 初始化 Umeng SDK
-        UMConfigure.init(this, "671244cf80464b33f6df9648", "Product", UMConfigure.DEVICE_TYPE_PHONE, null)
+//        UMConfigure.init(this, "671244cf80464b33f6df9648", "Product", UMConfigure.DEVICE_TYPE_PHONE, null)
 
-        MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result ->
+        MethodChannel(
+            flutterEngine?.dartExecutor!!.binaryMessenger,
+            "starLockFlutterSend"
+        ).setMethodCallHandler { call, result ->
             if (call.method == "loadNativeShare") {
                 val map = call.arguments as Map<String, String>
                 val shareText = map["shareText"]
@@ -32,7 +35,7 @@ class MainActivity : FlutterActivity() {
                 } else {
                     shareText(shareText, "分享")
                 }
-            }  else if (call.method == "sendGetBlueStatus") {
+            } else if (call.method == "sendGetBlueStatus") {
                 // 蓝牙是否开启
 //                println("收到原生的信息了 methodmethodmethod: ${call.method}")
                 val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter()
@@ -50,7 +53,10 @@ class MainActivity : FlutterActivity() {
                     status = "-1"
                 }
                 val flutterEngine: FlutterEngine? = this.flutterEngine // 获取你的 FlutterEngine 实例
-                MethodChannel(flutterEngine?.dartExecutor!!.binaryMessenger, "starLockFlutterReceive").invokeMethod("getBlueStatus", status)
+                MethodChannel(
+                    flutterEngine?.dartExecutor!!.binaryMessenger,
+                    "starLockFlutterReceive"
+                ).invokeMethod("getBlueStatus", status)
             } else {
                 result.notImplemented() // 没有实现的方法
             }
@@ -96,7 +102,10 @@ class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "starLockFlutterSend").setMethodCallHandler { call, result ->
+        MethodChannel(
+            flutterEngine.dartExecutor.binaryMessenger,
+            "starLockFlutterSend"
+        ).setMethodCallHandler { call, result ->
             if (call.method == "loadNativeShare") {
                 val map = call.arguments as Map<String, String>
                 val shareText = map["shareText"]

ios/Runner/AppDelegate.m

@@ -19,7 +19,7 @@
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
-    [UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"];
+//     [UMConfigure initWithAppkey:@"671244ae80464b33f6df9646" channel:@"Product"];
 
     XSFlutterManager *VC = [[XSFlutterManager alloc] init];
     self.window.rootViewController = VC;

lib/tools/appFirstEnterHandle.dart

@@ -107,7 +107,6 @@ class AppFirstEnterHandle {
             ),
             TextSpan(
                 text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
-                    .tr
                     .tr),
           ],
         ),
@@ -178,7 +177,6 @@ class AppFirstEnterHandle {
             ),
             TextSpan(
                 text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
-                    .tr
                     .tr),
           ],
         ),