From 42f873d5c34e9fb71d2e832ca06a63597e028041 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 2 Jan 2025 18:14:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=201=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=83=BD=E5=85=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/addLock/selectLockType/selectLockType_page.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mine/addLock/selectLockType/selectLockType_page.dart b/lib/mine/addLock/selectLockType/selectLockType_page.dart index 511b4e01..3688d0ae 100755 --- a/lib/mine/addLock/selectLockType/selectLockType_page.dart +++ b/lib/mine/addLock/selectLockType/selectLockType_page.dart @@ -83,13 +83,13 @@ class _SelectLockTypePageState extends State Get.toNamed(Routers.addLockPage, arguments: {'getLockType': 1}); }), - if (!F.isLite) + // if (!F.isLite) lockTypeItem('images/lockType/lockType_NFCLock.png', 'NFC无源锁'.tr, () { CommonDataManage().seletLockType = 2; // Navigator.pushNamed(context, Routers.addLockPage); logic.getNearByLimits(); }), - if (!F.isLite) + // if (!F.isLite) lockTypeItem('images/lockType/lockType_padlock.png', '挂锁'.tr, () { CommonDataManage().seletLockType = 3; // Navigator.pushNamed(context, Routers.addLockPage); From 830d4ae9384abc7ca64e505cb5a9b74a38d11bb9 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Thu, 2 Jan 2025 18:52:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dalexa=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=AF=AD=E8=A8=80=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mineSet/mineSet/mineSet_logic.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/mine/mineSet/mineSet/mineSet_logic.dart b/lib/mine/mineSet/mineSet/mineSet_logic.dart index 40dbc7be..d888914a 100755 --- a/lib/mine/mineSet/mineSet/mineSet_logic.dart +++ b/lib/mine/mineSet/mineSet/mineSet_logic.dart @@ -184,4 +184,10 @@ class MineSetLogic extends BaseGetXController { // state.currentLanguage.value = CurrentLocaleTool.getCurrentLocaleString(); // }); // } + + @override + Future onReady() async { + super.onReady(); + getUserInfoRequest(); + } } From 8159c7cedaeee8a5d7d0c4f78a4a230e7c128add Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 3 Jan 2025 11:35:58 +0800 Subject: [PATCH 3/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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01d706a8..1c09e949 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,8 @@ generate_git_tag: - bash pre_build.sh sky - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///') - echo "project_url:$project_url" - - git remote set-url origin http://gitlab-ci-token:${GITLAB_ACCESS_TOKEN}@$project_url.git + - echo "CI_SERVER_FQDN:$CI_SERVER_FQDN" + - git remote set-url origin git@$CI_SERVER_FQDN:StarlockTeam/app-starlock.git script: - bash tag_generator.sh generate_tag