diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 1e994b2d..a065ef36 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -662,6 +662,7 @@ "。如果是全自动锁,请使屏幕变亮": ". If it is a fully automatic lock, please make the screen brighter", "用户无权限": "User has no permission", "创建公司后,考勤功能才能使用": "After creating the company, the attendance function can be used", + "是否删除钥匙?": "Whether to delete the key?", "相机": "camera", "相册": "photos", diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index db7f805f..1736c2f9 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -661,6 +661,7 @@ "。如果是全自动锁,请使屏幕变亮": "。如果是全自动锁,请使屏幕变亮", "用户无权限": "用户无权限", "创建公司后,考勤功能才能使用": "创建公司后,考勤功能才能使用", + "是否删除钥匙?": "是否删除钥匙?", "相机": "相机", "相册": "相册", diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 1edc5369..665c8725 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -663,6 +663,7 @@ "。如果是全自动锁,请使屏幕变亮": "。如果是全自动锁,请使屏幕变亮", "用户无权限": "用户无权限", "创建公司后,考勤功能才能使用": "创建公司后,考勤功能才能使用", + "是否删除钥匙?": "是否删除钥匙?", "相机": "相机", "相册": "相册", diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index a6305515..5c2554c6 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -858,8 +858,7 @@ class LockDetailLogic extends BaseGetXController { Future positionPermissionAlert() async { //安卓平台下首次进入应用需向用户告知获取权限用途弹窗 if (Platform.isAndroid) { - AppFirstEnterHandle() - .getAppFirstEnter(state.widgetContext, isAgreePosition); + AppFirstEnterHandle().getAppFirstEnter(state.widgetContext, isAgreePosition); var getFlag = await Storage.getString(isAgreePosition); if (getFlag == isAgreePosition) { openBlueSet(); diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 008fe933..93036dee 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -34,8 +34,7 @@ class LockDetailPage extends StatefulWidget { State createState() => _LockDetailPageState(); } -class _LockDetailPageState extends State - with TickerProviderStateMixin, RouteAware { +class _LockDetailPageState extends State with TickerProviderStateMixin, RouteAware { // with RouteAware final logic = Get.put(LockDetailLogic()); final state = Get.find().state; @@ -123,8 +122,7 @@ class _LockDetailPageState extends State Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey - List signKeyData = - state.keyInfos.value.bluetooth!.signKey!.cast(); + List signKeyData = state.keyInfos.value.bluetooth!.signKey!.cast(); var saveSignKeyList = changeIntListToStringList(signKeyData); Storage.setStringList(saveBlueSignKey, saveSignKeyList); diff --git a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart index afd07a2b..3aa3d470 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart @@ -535,7 +535,9 @@ class LockSetLogic extends BaseGetXController { }); } else{ // 普通用户直接删除 - deletKeyData(); + ShowTipView().showIosTipWithContentDialog("是否删除钥匙?".tr, (){ + deletKeyData(); + }); } } diff --git a/star_lock/lib/main/lockMian/lockList/lockList_logic.dart b/star_lock/lib/main/lockMian/lockList/lockList_logic.dart index e0316bcd..379dbd20 100644 --- a/star_lock/lib/main/lockMian/lockList/lockList_logic.dart +++ b/star_lock/lib/main/lockMian/lockList/lockList_logic.dart @@ -133,10 +133,11 @@ class LockListLogic extends BaseGetXController{ state.deleteAdministratorIsHaveAllData.value = a; deletKeyData(); }); - // showDeleteAdministratorIsHaveAllDataDialog(); } else{ // 普通用户直接删除 - deletKeyData(); + ShowTipView().showIosTipWithContentDialog("是否删除钥匙?".tr, (){ + deletKeyData(); + }); } }