Merge branch 'master' into develop

.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
 

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),
           ],
         ),