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 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); 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(); + } }