1,新增与后台约定code值弹出公用组件提示

2,修复开锁页-消息提醒-半自动锁和XHJ 的锁应没有有人出现在门口
This commit is contained in:
Daisy 2024-06-07 15:58:24 +08:00
parent 1b4a6aaee3
commit 8593088ab0
5 changed files with 39 additions and 8 deletions

View File

@ -1160,6 +1160,7 @@ class _LockDetailPageState extends State<LockDetailPage>
state.bottomBtnisEable.value, () {
Get.toNamed(Routers.msgNotificationPage, arguments: <String, int?>{
'lockId': state.keyInfos.value.lockId,
'isSupportCatEye': state.keyInfos.value.lockFeature!.isSupportCatEye,
});
}),
);

View File

@ -143,13 +143,15 @@ class _MsgNotificationPageState extends State<MsgNotificationPage> {
SizedBox(
height: 10.h,
),
Obx(() => CommonItem(
leftTitel: '有人出现在门口'.tr,
rightTitle: "",
isHaveLine: true,
isHaveRightWidget: true,
rightWidget:
SizedBox(width: 60.w, height: 50.h, child: _switch(4)))),
Obx(() => Visibility(
visible: state.isSupportCatEye.value,
child: CommonItem(
leftTitel: '有人出现在门口'.tr,
rightTitle: "",
isHaveLine: true,
isHaveRightWidget: true,
rightWidget:
SizedBox(width: 60.w, height: 50.h, child: _switch(4))))),
SizedBox(
height: 60.h,
),

View File

@ -15,12 +15,16 @@ class MsgNotificationState {
final String notifyEnable = '已启用'.tr;
final String notifyDisable = '未启用'.tr;
final String settingSuccess = '设置成功'.tr;
var isSupportCatEye = false.obs;
MsgNotificationState() {
Map map = Get.arguments;
if (map['lockId'] != null) {
getLockId.value = map['lockId'];
}
if (map['isSupportCatEye'] != null) {
isSupportCatEye.value = map['isSupportCatEye'] == 1;
}
nDaysNotOpenDoor.value = notifyEnable;
isLowBattery.value = notifyEnable;

View File

@ -2,6 +2,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_settings.dart';
import 'package:star_lock/tools/showTipView.dart';
import '../appRouters.dart';
import '../flavors.dart';
import 'api.dart';
@ -100,6 +101,9 @@ class BaseProvider extends GetConnect with Api {
case 10001:
EasyLoading.showToast('数据不存在', duration: 2000.milliseconds);
break;
case 434: //
ShowTipView().showSureBtnTipsAlert(T['errorMsg']);
break;
}
}
}

View File

@ -13,7 +13,8 @@ typedef BlockIsHaveAllDataCallback = void Function(bool isAllData);
class ShowTipView {
//
void showSureAlertDialog(String contentStr, {String? tipTitle, String? sureStr}) {
void showSureAlertDialog(String contentStr,
{String? tipTitle, String? sureStr}) {
showCupertinoDialog(
context: Get.context!,
builder: (BuildContext context) {
@ -121,4 +122,23 @@ class ShowTipView {
},
);
}
//
void showSureBtnTipsAlert(String tipsText) {
showCupertinoDialog(
context: Get.context!,
builder: (BuildContext context) {
return CupertinoAlertDialog(
content: Text(tipsText),
actions: <Widget>[
CupertinoDialogAction(
child:
Text('确定'.tr, style: TextStyle(color: AppColors.mainColor)),
onPressed: Get.back,
),
],
);
},
);
}
}