diff --git a/lib/main_local.dart b/lib/main_local.dart index f56b6d65..ca85c5fa 100755 --- a/lib/main_local.dart +++ b/lib/main_local.dart @@ -4,7 +4,7 @@ import 'flavors.dart'; import 'main.dart' as runner; Future main() async { - F.appFlavor = Flavor.xhj_pre; + F.appFlavor = Flavor.sky_pre; // AppLog.log('local调用了main函数'); await runner.main(); } diff --git a/lib/mine/addLock/selectLockType/selectLockType_page.dart b/lib/mine/addLock/selectLockType/selectLockType_page.dart index bb8dfa20..511b4e01 100755 --- a/lib/mine/addLock/selectLockType/selectLockType_page.dart +++ b/lib/mine/addLock/selectLockType/selectLockType_page.dart @@ -18,7 +18,8 @@ class SelectLockTypePage extends StatefulWidget { State createState() => _SelectLockTypePageState(); } -class _SelectLockTypePageState extends State with BaseWidget { +class _SelectLockTypePageState extends State + with BaseWidget { final SelectLockTypeLogic logic = Get.put(SelectLockTypeLogic()); final SelectLockTypeState state = Get.find().state; @@ -79,36 +80,34 @@ class _SelectLockTypePageState extends State with BaseWidget return [ lockTypeItem('images/lockType/lockType_doorLock.png', '门锁'.tr, () { CommonDataManage().seletLockType = 1; - Navigator.pushNamed(context, Routers.addLockPage, + Get.toNamed(Routers.addLockPage, arguments: {'getLockType': 1}); }), if (!F.isLite) - lockTypeItem('images/lockType/lockType_NFCLock.png', - 'NFC无源锁'.tr, () { + lockTypeItem('images/lockType/lockType_NFCLock.png', 'NFC无源锁'.tr, () { CommonDataManage().seletLockType = 2; // Navigator.pushNamed(context, Routers.addLockPage); + logic.getNearByLimits(); }), if (!F.isLite) - lockTypeItem('images/lockType/lockType_padlock.png', - '挂锁'.tr, () { - CommonDataManage().seletLockType = 3; + lockTypeItem('images/lockType/lockType_padlock.png', '挂锁'.tr, () { + CommonDataManage().seletLockType = 3; // Navigator.pushNamed(context, Routers.addLockPage); + logic.getNearByLimits(); }), - lockTypeItem('images/lockType/lockType_safeLock.png', - '保险箱锁'.tr, () { - CommonDataManage().seletLockType = 4; + lockTypeItem('images/lockType/lockType_safeLock.png', '保险箱锁'.tr, () { + CommonDataManage().seletLockType = 4; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 4}); }), - lockTypeItem('images/lockType/lockType_parkingLock.png', - '车位锁'.tr, () { - CommonDataManage().seletLockType = 5; + lockTypeItem('images/lockType/lockType_parkingLock.png', '车位锁'.tr, () { + CommonDataManage().seletLockType = 5; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 5}); }), - lockTypeItem('images/lockType/lockType_entranceGuardLock.png', - '智能门禁'.tr, () { - CommonDataManage().seletLockType = 6; + lockTypeItem('images/lockType/lockType_entranceGuardLock.png', '智能门禁'.tr, + () { + CommonDataManage().seletLockType = 6; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 6}); }), @@ -117,17 +116,17 @@ class _SelectLockTypePageState extends State with BaseWidget // TranslationLoader.lanKeys!.bicycleLock!.tr, () { // Navigator.pushNamed(context, Routers.addLockPage); // }), - if (!F.isLite) - lockTypeItem('images/lockType/lockType_gatewayLock.png', - '网关'.tr, () { - CommonDataManage().seletLockType = 7; - Get.toNamed(Routers.selectGatewayTypeNextTipPage); - }), - if (!F.isLite) - lockTypeItem('images/lockType/lockType_camera.png', '网络摄像头'.tr, () { - CommonDataManage().seletLockType = 8; - // Navigator.pushNamed(context, Routers.gatewayListPage); - }), + // if (!F.isLite) + lockTypeItem('images/lockType/lockType_gatewayLock.png', '网关'.tr, () { + CommonDataManage().seletLockType = 7; + Get.toNamed(Routers.selectGatewayTypeNextTipPage); + }), + // if (!F.isLite) + lockTypeItem('images/lockType/lockType_camera.png', '网络摄像头'.tr, () { + CommonDataManage().seletLockType = 8; + // Navigator.pushNamed(context, Routers.gatewayListPage); + logic.getNearByLimits(); + }), ]; }