sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into build-addGateway-20240814

Browse Source
This commit is contained in:
魏少阳 2025-01-03 14:36:22 +08:00
commit 404fcb7a8d
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -95,7 +95,8 @@ generate_git_tag:
- bash pre_build.sh sky - bash pre_build.sh sky
- project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///') - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///')
- echo "project_url:$project_url" - 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: script:
- bash tag_generator.sh generate_tag - bash tag_generator.sh generate_tag

4
lib/mine/addLock/selectLockType/selectLockType_page.dart
View File

@ -83,13 +83,13 @@ class _SelectLockTypePageState extends State<SelectLockTypePage>
Get.toNamed(Routers.addLockPage, Get.toNamed(Routers.addLockPage,
arguments: <String, int>{'getLockType': 1}); arguments: <String, int>{'getLockType': 1});
}), }),
if (!F.isLite) // if (!F.isLite)
lockTypeItem('images/lockType/lockType_NFCLock.png', 'NFC无源锁'.tr, () { lockTypeItem('images/lockType/lockType_NFCLock.png', 'NFC无源锁'.tr, () {
CommonDataManage().seletLockType = 2; CommonDataManage().seletLockType = 2;
// Navigator.pushNamed(context, Routers.addLockPage); // Navigator.pushNamed(context, Routers.addLockPage);
logic.getNearByLimits(); logic.getNearByLimits();
}), }),
if (!F.isLite) // if (!F.isLite)
lockTypeItem('images/lockType/lockType_padlock.png', '挂锁'.tr, () { lockTypeItem('images/lockType/lockType_padlock.png', '挂锁'.tr, () {
CommonDataManage().seletLockType = 3; CommonDataManage().seletLockType = 3;
// Navigator.pushNamed(context, Routers.addLockPage); // Navigator.pushNamed(context, Routers.addLockPage);

6
lib/mine/mineSet/mineSet/mineSet_logic.dart
View File

@ -184,4 +184,10 @@ class MineSetLogic extends BaseGetXController {
// state.currentLanguage.value = CurrentLocaleTool.getCurrentLocaleString(); // state.currentLanguage.value = CurrentLocaleTool.getCurrentLocaleString();
// }); // });
// } // }
@override
Future<void> onReady() async {
super.onReady();
getUserInfoRequest();
}
} }