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

develop_sky #1

Merged
liyi merged 62 commits from develop_sky into develop_sky_liyi 2025-09-22 17:48:20 +08:00
Conversation 0 Commits 62 Files Changed 2 +107 -113
15 changed files with 107 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9edb18deb5 - Show all commits

9
lib/main/lockDetail/card/cardList/cardList_page.dart
View File

@ -69,8 +69,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -148,8 +147,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
SlidableAction(
onPressed: (BuildContext context) async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
false;
await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -180,7 +178,8 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
arguments: <String, FingerprintItemData>{
'fingerprintItemData': fingerprintItemData,
})!
.then((value) => logic.getICCardListData(isRefresh: true));
.then((value) =>
logic.getICCardListData(isRefresh: true));
// if (data != null) {
// logic.getICCardListData(isRefresh: true);
// }

4
lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
View File

@ -335,7 +335,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
thumbColor: CupertinoColors.white,
value: state.isRemoteUnlock.value,
onChanged: (bool value) async {
final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -352,7 +352,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
thumbColor: CupertinoColors.white,
value: state.onlyManageYouCreatesUser.value,
onChanged: (bool value) async {
final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

3
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart
View File

@ -68,8 +68,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
final bool? isDemoMode =
await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

6
lib/main/lockDetail/face/faceList/faceList_page.dart
View File

@ -48,8 +48,7 @@ class _FaceListPageState extends State<FaceListPage> with RouteAware {
onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -160,8 +159,7 @@ class _FaceListPageState extends State<FaceListPage> with RouteAware {
Widget _buildDeleteBtn(FingerprintItemData faceItemData) {
return GestureDetector(
onTap: () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

6
lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -54,8 +54,7 @@ class _FingerprintListPageState extends State<FingerprintListPage>
onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -133,8 +132,7 @@ class _FingerprintListPageState extends State<FingerprintListPage>
SlidableAction(
onPressed: (BuildContext context) async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
false;
await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

84
lib/main/lockDetail/iris/irisList/irisList_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -46,8 +45,7 @@ class _IrisListPageState extends State<IrisListPage> {
onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -80,11 +78,11 @@ class _IrisListPageState extends State<IrisListPage> {
// "lockId": state.lockId.value,
// "fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
// });
final data =
await Get.toNamed(Routers.addIrisTypeManagePage, arguments: <String, int>{
'lockId': state.lockId.value,
'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
});
final data = await Get.toNamed(Routers.addIrisTypeManagePage,
arguments: <String, int>{
'lockId': state.lockId.value,
'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
});
if (data != null) {
// logic.getFaceListData();
}
@ -130,10 +128,10 @@ class _IrisListPageState extends State<IrisListPage> {
// ? "永久"
// : "${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())}",
() async {
final data =
await Get.toNamed(Routers.faceDetailPage, arguments: <String, FingerprintItemData>{
'faceItemData': getFaceItemData,
});
final data = await Get.toNamed(Routers.faceDetailPage,
arguments: <String, FingerprintItemData>{
'faceItemData': getFaceItemData,
});
if (data != null) {
// logic.getFaceListData();
}
@ -254,35 +252,35 @@ class _IrisListPageState extends State<IrisListPage> {
);
}
// void showDeletAlertDialog(BuildContext context) {
// showCupertinoDialog(
// context: context,
// builder: (BuildContext context) {
// return CupertinoAlertDialog(
// title: const Text('提示'),
// content: const Text('重置后，该锁的人脸都将被删除哦，确认要重置吗？'),
// actions: <Widget>[
// CupertinoDialogAction(
// child: Text('取消'.tr),
// onPressed: () {
// Navigator.pop(context);
// },
// ),
// CupertinoDialogAction(
// child: Text('确定'.tr),
// onPressed: () {
// Navigator.pop(context);
// state.isDeletFaceData = true;
// state.isDeletAll = true;
// state.deletKeyID = '1';
// state.deletUserID = 'DeleteAll!@#';
// state.deletFaceNo = 255;
// // logic.senderAddFace();
// },
// ),
// ],
// );
// },
// );
// }
// void showDeletAlertDialog(BuildContext context) {
// showCupertinoDialog(
// context: context,
// builder: (BuildContext context) {
// return CupertinoAlertDialog(
// title: const Text('提示'),
// content: const Text('重置后，该锁的人脸都将被删除哦，确认要重置吗？'),
// actions: <Widget>[
// CupertinoDialogAction(
// child: Text('取消'.tr),
// onPressed: () {
// Navigator.pop(context);
// },
// ),
// CupertinoDialogAction(
// child: Text('确定'.tr),
// onPressed: () {
// Navigator.pop(context);
// state.isDeletFaceData = true;
// state.isDeletAll = true;
// state.deletKeyID = '1';
// state.deletUserID = 'DeleteAll!@#';
// state.deletFaceNo = 255;
// // logic.senderAddFace();
// },
// ),
// ],
// );
// },
// );
// }
}

2
lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -1432,7 +1432,7 @@ class _LockDetailPageState extends State<LockDetailPage>
//如果需要实名认证，需认证完成，方可开锁
Future<void> isNeedRealNameAuthThenOpenLock() async {
final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
final bool isOpenLockNeedOnline = state.isOpenLockNeedOnline.value == 0;
if (!isOpenLockNeedOnline && !isNetWork) {
return;

59
lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -22,9 +21,12 @@ class UploadElectricQuantityPage extends StatefulWidget {
_UploadElectricQuantityPageState();
}
class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage> with RouteAware {
final UploadElectricQuantityLogic logic = Get.put(UploadElectricQuantityLogic());
final UploadElectricQuantityState state = Get.find<UploadElectricQuantityLogic>().state;
class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
with RouteAware {
final UploadElectricQuantityLogic logic =
Get.put(UploadElectricQuantityLogic());
final UploadElectricQuantityState state =
Get.find<UploadElectricQuantityLogic>().state;
@override
Widget build(BuildContext context) {
@ -42,7 +44,8 @@ class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text('电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新'.tr,
child: Text(
'电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新'.tr,
style: TextStyle(fontSize: 20.sp),
)),
],
@ -51,39 +54,42 @@ class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
height: 40.h,
),
Obx(() => Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
"${"电池1电量".tr}:${state.lockBasicInfo.value.electricQuantity ?? ""}%",
style: TextStyle(fontSize: 20.sp),
)),
],
)),
],
)),
Visibility(
visible: (state.lockSetInfoData.value.lockFeature ?? LockFeature()).isSupportBackupBattery == 1,
visible:
(state.lockSetInfoData.value.lockFeature ?? LockFeature())
.isSupportBackupBattery ==
1,
child: Obx(() => Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
"${"电池2电量".tr}:${state.lockBasicInfo.value.electricQuantityStandby ?? ""}%",
style: TextStyle(fontSize: 20.sp),
)),
],
)),
],
)),
),
SizedBox(height: 10.h),
Obx(() => Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
"${"电量更新时间".tr}:${state.uploadElectricQuantityDate.value == 0 ? "-" : DateTool().dateToYMDHNString(state.uploadElectricQuantityDate.value.toString())}",
style: TextStyle(fontSize: 20.sp),
)),
],
)),
],
)),
SizedBox(
height: 30.h,
),
@ -94,7 +100,7 @@ class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
// margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w),
padding: EdgeInsets.only(top: 20.w, bottom: 20.w),
onClick: () async {
final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -102,8 +108,7 @@ class _UploadElectricQuantityPageState extends State<UploadElectricQuantityPage>
}),
],
),
)
);
));
}
@override

30
lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -19,7 +18,7 @@ class BurglarAlarmPage extends StatefulWidget {
State<BurglarAlarmPage> createState() => _BurglarAlarmPageState();
}
class _BurglarAlarmPageState extends State<BurglarAlarmPage> with RouteAware{
class _BurglarAlarmPageState extends State<BurglarAlarmPage> with RouteAware {
final BurglarAlarmLogic logic = Get.put(BurglarAlarmLogic());
final BurglarAlarmState state = Get.find<BurglarAlarmLogic>().state;
@ -49,27 +48,28 @@ class _BurglarAlarmPageState extends State<BurglarAlarmPage> with RouteAware{
height: 20.h,
),
Obx(() => Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
"${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}",
style:
TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w600),
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Expanded(
child: Text(
"${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}",
style: TextStyle(
fontSize: 22.sp, fontWeight: FontWeight.w600),
)),
],
)),
],
)),
SizedBox(
height: 40.h,
),
Obx(() => SubmitBtn(
btnName: state.burglarAlarmEnable.value == 1 ? '关闭'.tr : '开启'.tr,
btnName:
state.burglarAlarmEnable.value == 1 ? '关闭'.tr : '开启'.tr,
borderRadius: 20.w,
fontSize: 32.sp,
// margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w),
padding: EdgeInsets.only(top: 20.w, bottom: 20.w),
onClick: () async {
final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -77,8 +77,7 @@ class _BurglarAlarmPageState extends State<BurglarAlarmPage> with RouteAware{
})),
],
),
)
);
));
}
@override
@ -137,5 +136,4 @@ class _BurglarAlarmPageState extends State<BurglarAlarmPage> with RouteAware{
state.ifCurrentScreen.value = false;
state.sureBtnState.value = 0;
}
}

3
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -182,8 +182,7 @@ class _LockSetPageState extends State<LockSetPage>
// logic.deletLockInfoData();
// showDeletAlertDialog(context);
// showDeletPasswordAlertDialog(context);
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
final bool isNetWork = await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

4
lib/main/lockDetail/palm/palmList/palmList_page.dart
View File

@ -68,7 +68,7 @@ class _PalmListPageState extends State<PalmListPage> with RouteAware {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -143,7 +143,7 @@ class _PalmListPageState extends State<PalmListPage> with RouteAware {
SlidableAction(
onPressed: (BuildContext context) async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
await logic.isConnected() ??
false;
if (!isNetWork) {
return;

2
lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart
View File

@ -156,7 +156,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
SlidableAction(
onPressed: (BuildContext context) async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
await logic.isConnected() ??
false;
if (!isNetWork) {
return;

2
lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart
View File

@ -207,7 +207,7 @@ class _RemoteControlDetailPageState extends State<RemoteControlDetailPage> with
padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
onClick: () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}

4
lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart
View File

@ -68,7 +68,7 @@ class _RemoteControlListPageState extends State<RemoteControlListPage> with Rout
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? false;
await logic.isConnected() ?? false;
if (!isNetWork) {
return;
}
@ -144,7 +144,7 @@ class _RemoteControlListPageState extends State<RemoteControlListPage> with Rout
SlidableAction(
onPressed: (BuildContext context) async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
await logic.isConnected() ??
false;
if (!isNetWork) {
return;

2
lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart
View File

@ -62,7 +62,7 @@ class _MinePersonInfoResetPasswordPageState
onClick: state.canSub.value
? () async {
final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ??
await logic.isConnected() ??
false;
if (!isNetWork) {
return;