From 0ee31a0f6273892e4a0a483af6446b91505e9865 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 3 Jan 2025 11:45:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20=E4=BF=AE=E5=A4=8Dgitlab=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E6=9B=B4=E6=8D=A2=E5=90=8E=E6=97=A0=E6=B3=95=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=9F=9F=E5=90=8D=E6=8E=A8=E9=80=81tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c09e949..6ae1079e 100644 --- a/.gitlab-ci.yml +++ b/.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 From 5dd0423c5903f4c1c8ec54b21676663b7ac63d50 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Tue, 7 Jan 2025 16:44:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E9=9A=90=E7=A7=81=E5=90=88=E8=A7=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tools/appFirstEnterHandle.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/tools/appFirstEnterHandle.dart b/lib/tools/appFirstEnterHandle.dart index a465063b..f18faea1 100755 --- a/lib/tools/appFirstEnterHandle.dart +++ b/lib/tools/appFirstEnterHandle.dart @@ -104,7 +104,6 @@ class AppFirstEnterHandle { ), TextSpan( text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意,将无法使用我们的产品和服务,并会退出应用。' - .tr .tr), ], ), @@ -175,7 +174,6 @@ class AppFirstEnterHandle { ), TextSpan( text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意,将无法使用我们的产品和服务,并会退出应用。' - .tr .tr), ], ), From d2f54efded78c85088a7c239732ee0d4129321c7 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Wed, 8 Jan 2025 18:17:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20umeng=20=E9=9A=90=E7=A7=81=E5=90=88?= =?UTF-8?q?=E8=A7=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner/AppDelegate.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 4b399780..f4187699 100755 --- a/ios/Runner/AppDelegate.m +++ b/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;