2024-01-12 会议确定去掉部分:提示音、触摸开锁、锁屏、微信二维码、蓝牙广播 已注释并标注
This commit is contained in:
parent
0fba9fcf75
commit
e93f8624cf
@ -118,7 +118,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance?.addObserver(this);
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
|
||||
openBlueScan();
|
||||
|
||||
|
||||
@ -42,8 +42,7 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
|
||||
body: ListView(
|
||||
children: [
|
||||
CommonItem(
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.lockNumber!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.lockNumber!.tr,
|
||||
rightTitle: state.lockBasicInfo.value.lockName,
|
||||
allHeight: 70.h,
|
||||
isHaveLine: true),
|
||||
@ -56,19 +55,18 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
|
||||
height: 10.h,
|
||||
),
|
||||
CommonItem(
|
||||
leftTitel: TranslationLoader
|
||||
.lanKeys!.electricQuantity!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.electricQuantity!.tr,
|
||||
rightTitle: "${state.lockBasicInfo.value.electricQuantity}%",
|
||||
isHaveLine: true,
|
||||
isHaveDirection: true,
|
||||
action: () {
|
||||
Navigator.pushNamed(context,
|
||||
Routers.uploadElectricQuantityPage,
|
||||
arguments: {'lockSetInfoData': state.lockSetInfoData.value});
|
||||
Navigator.pushNamed(
|
||||
context, Routers.uploadElectricQuantityPage, arguments: {
|
||||
'lockSetInfoData': state.lockSetInfoData.value
|
||||
});
|
||||
}),
|
||||
CommonItem(
|
||||
leftTitel: TranslationLoader
|
||||
.lanKeys!.periodValidity!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr,
|
||||
rightTitle: getUseDateStr(state.lockBasicInfo.value),
|
||||
allHeight: 70.h,
|
||||
isHaveLine: false),
|
||||
@ -76,28 +74,28 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
|
||||
height: 10.h,
|
||||
),
|
||||
CommonItem(
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.lockName!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.lockName!.tr,
|
||||
rightTitle: state.lockBasicInfo.value.lockAlias,
|
||||
isHaveLine: true,
|
||||
isHaveDirection: true,
|
||||
action: () async {
|
||||
var data = await Get.toNamed(Routers.editLockNamePage, arguments: {'lockSetInfoData': state.lockSetInfoData.value});
|
||||
if(data != null) {
|
||||
var data = await Get.toNamed(Routers.editLockNamePage,
|
||||
arguments: {
|
||||
'lockSetInfoData': state.lockSetInfoData.value
|
||||
});
|
||||
if (data != null) {
|
||||
setState(() {
|
||||
state.lockBasicInfo.value = data["lockBasicInfo"];
|
||||
});
|
||||
}
|
||||
}),
|
||||
CommonItem(
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.lockGrouping!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.lockGrouping!.tr,
|
||||
// rightTitle: state.getKeyInfosData.value.groupName == "" ? _groupName : itemData.groupName,
|
||||
isHaveLine: true,
|
||||
isHaveDirection: true,
|
||||
action: () async {
|
||||
Navigator.pushNamed(
|
||||
context, Routers.lockSeletGroupingPage,
|
||||
Navigator.pushNamed(context, Routers.lockSeletGroupingPage,
|
||||
arguments: {
|
||||
'lockSetInfoData': state.lockSetInfoData.value
|
||||
}).then((val) {
|
||||
@ -108,16 +106,22 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
|
||||
});
|
||||
}),
|
||||
Visibility(
|
||||
visible: (state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1) ? true : false,
|
||||
visible: (state.lockBasicInfo.value.isLockOwner == 1 ||
|
||||
state.lockBasicInfo.value.keyRight == 1)
|
||||
? true
|
||||
: false,
|
||||
child: CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.adminOpenLockPassword!.tr,
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.adminOpenLockPassword!.tr,
|
||||
rightTitle: "",
|
||||
isHaveLine: true,
|
||||
isHaveDirection: true,
|
||||
action: () {
|
||||
Navigator.pushNamed(context, Routers.adminOpenLockPasswordPage);
|
||||
Navigator.pushNamed(
|
||||
context, Routers.adminOpenLockPasswordPage);
|
||||
}),
|
||||
),
|
||||
/* 2024-01-12 会议确定去掉“微信二维码” by DaisyWu
|
||||
CommonItem(
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.unlockQRCode!.tr,
|
||||
@ -127,9 +131,9 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
|
||||
action: () {
|
||||
Get.toNamed(Routers.unlockQRCodePage);
|
||||
}),
|
||||
*/
|
||||
],
|
||||
)
|
||||
);
|
||||
));
|
||||
}
|
||||
|
||||
//使用期限
|
||||
|
||||
@ -60,7 +60,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
List<Widget> getListWidget() {
|
||||
print(
|
||||
"state.lockBasicInfo.value.isLockOwner:${state.lockBasicInfo.value.isLockOwner} state.lockBasicInfo.value.keyRight:${state.lockBasicInfo.value.keyRight}");
|
||||
if (state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1) {
|
||||
if (state.lockBasicInfo.value.isLockOwner == 1 ||
|
||||
state.lockBasicInfo.value.keyRight == 1) {
|
||||
// 超级管理员、授权管理员
|
||||
return getAllWidget();
|
||||
} else {
|
||||
@ -105,7 +106,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
// 常开模式
|
||||
Obx(() => Visibility(
|
||||
// visible: state.lockFeature.value.passageMode == 1 ? true : false,
|
||||
visible:true,
|
||||
visible: true,
|
||||
child: CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr,
|
||||
rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1
|
||||
@ -418,8 +419,9 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
Get.toNamed(Routers.motorPowerPage);
|
||||
})),
|
||||
// 蓝牙广播(关闭则不能使用蓝牙主动开锁)
|
||||
/* 2024-01-12 会议确定去掉“蓝牙广播” by DaisyWu
|
||||
Obx(() => Visibility(
|
||||
visible: true,
|
||||
visible: true,
|
||||
child: CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.bluetoothBroadcast!.tr,
|
||||
rightTitle: "",
|
||||
@ -427,6 +429,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
isHaveRightWidget: true,
|
||||
rightWidget: _lockBlueBroadcastSwitch()))),
|
||||
SizedBox(height: 10.h),
|
||||
*/
|
||||
//-----新增至此
|
||||
// 标记房态
|
||||
Obx(() {
|
||||
@ -450,7 +453,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
}));
|
||||
}),
|
||||
// 考勤
|
||||
Obx(() => Visibility(
|
||||
Obx(
|
||||
() => Visibility(
|
||||
visible: state.lockFeature.value.attendance == 1 ? true : false,
|
||||
child: CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr,
|
||||
@ -596,7 +600,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
|
||||
// 开启考勤
|
||||
CupertinoSwitch _openCheckInSwitch() {
|
||||
print("111111state.lockSettingInfo.value.attendance:${state.lockSettingInfo.value.attendance}");
|
||||
print(
|
||||
"111111state.lockSettingInfo.value.attendance:${state.lockSettingInfo.value.attendance}");
|
||||
return CupertinoSwitch(
|
||||
activeColor: CupertinoColors.activeBlue,
|
||||
trackColor: CupertinoColors.systemGrey5,
|
||||
@ -814,10 +819,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
print("lockSet===didPop");
|
||||
logic.cancelBlueConnetctToastTimer();
|
||||
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true);
|
||||
if(state.deletWaitScanTimer != null){
|
||||
if (state.deletWaitScanTimer != null) {
|
||||
state.deletWaitScanTimer!.cancel();
|
||||
}
|
||||
if(state.deletWaitScanCompleter != null && !state.deletWaitScanCompleter!.isCompleted){
|
||||
if (state.deletWaitScanCompleter != null &&
|
||||
!state.deletWaitScanCompleter!.isCompleted) {
|
||||
state.deletWaitScanCompleter!.complete();
|
||||
}
|
||||
BlueManage().stopScan();
|
||||
@ -840,10 +846,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
|
||||
logic.cancelBlueConnetctToastTimer();
|
||||
|
||||
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true);
|
||||
if(state.deletWaitScanTimer != null){
|
||||
if (state.deletWaitScanTimer != null) {
|
||||
state.deletWaitScanTimer!.cancel();
|
||||
}
|
||||
if(state.deletWaitScanCompleter != null && !state.deletWaitScanCompleter!.isCompleted){
|
||||
if (state.deletWaitScanCompleter != null &&
|
||||
!state.deletWaitScanCompleter!.isCompleted) {
|
||||
state.deletWaitScanCompleter!.complete();
|
||||
}
|
||||
BlueManage().stopScan();
|
||||
|
||||
@ -45,6 +45,7 @@ class _MineSetPageState extends State<MineSetPage> {
|
||||
Widget getListDataView() {
|
||||
return Column(
|
||||
children: [
|
||||
/* 2024-01-12 会议确定去掉“提示音、触摸开锁” by DaisyWu
|
||||
CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.prompTone!.tr,
|
||||
rightTitle: "",
|
||||
@ -63,6 +64,7 @@ class _MineSetPageState extends State<MineSetPage> {
|
||||
width: 60.w,
|
||||
height: 50.h,
|
||||
child: Obx(() => _isTouchUnlockSwitch()))),
|
||||
*/
|
||||
CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.pushNotification!.tr,
|
||||
rightTitle: "",
|
||||
@ -137,6 +139,7 @@ class _MineSetPageState extends State<MineSetPage> {
|
||||
state.currentLanguage.value = result['currentLanguage'];
|
||||
}
|
||||
})),
|
||||
/* 2024-01-12 会议确定去掉“锁屏” by DaisyWu
|
||||
Obx(() => CommonItem(
|
||||
leftTitel: TranslationLoader.lanKeys!.lockScreen!.tr,
|
||||
rightTitle: (state.lockScreen.value == 1
|
||||
@ -150,6 +153,7 @@ class _MineSetPageState extends State<MineSetPage> {
|
||||
logic.userSettingsInfoRequest();
|
||||
});
|
||||
})),
|
||||
*/
|
||||
Obx(() => CommonItem(
|
||||
leftTitel:
|
||||
TranslationLoader.lanKeys!.hideInvalidUnlockPermissions!.tr,
|
||||
@ -197,8 +201,7 @@ class _MineSetPageState extends State<MineSetPage> {
|
||||
logic.showToast("功能暂未开放");
|
||||
}),
|
||||
CommonItem(
|
||||
leftTitel: TranslationLoader
|
||||
.lanKeys!.xiaomiIOTPlatform!.tr,
|
||||
leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr,
|
||||
rightTitle: "",
|
||||
isHaveLine: false,
|
||||
isHaveDirection: true,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user