diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 9519b563..2fba48b9 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -840,5 +840,7 @@ "手动升级": "Manual upgrade", "设备连接中...": "Device Connecting...", "升级过程中无法开锁,请先开锁后再升级": "The lock cannot be unlocked during the upgrade, please unlock the lock before upgrading", - "钥匙无效": "The key is invalid" + "钥匙无效": "The key is invalid", + "操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。": "The operation failed. Please confirm whether the lock is nearby, or restart your phone's Bluetooth and try again.", + "如果是全自动锁,请使屏幕变亮": "If it is a fully automatic lock, please make the screen brighter" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index 19c60d8f..e62f6b5f 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -868,5 +868,7 @@ "手动升级": "手动升级", "设备连接中...": "设备连接中...", "升级过程中无法开锁,请先开锁后再升级": "升级过程中无法开锁,请先开锁后再升级", - "钥匙无效": "钥匙无效" + "钥匙无效": "钥匙无效", + "操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。": "操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。", + "如果是全自动锁,请使屏幕变亮": "如果是全自动锁,请使屏幕变亮" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 4cfe31db..bcba9e43 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -838,6 +838,7 @@ "手动升级": "手动升级", "设备连接中...": "设备连接中...", "升级过程中无法开锁,请先开锁后再升级": "升级过程中无法开锁,请先开锁后再升级", - "钥匙无效": "钥匙无效" - + "钥匙无效": "钥匙无效", + "操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。": "操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。", + "如果是全自动锁,请使屏幕变亮": "如果是全自动锁,请使屏幕变亮" } diff --git a/star_lock/lib/tools/baseGetXController.dart b/star_lock/lib/tools/baseGetXController.dart index 29de5361..af626b74 100644 --- a/star_lock/lib/tools/baseGetXController.dart +++ b/star_lock/lib/tools/baseGetXController.dart @@ -56,14 +56,17 @@ class BaseGetXController extends GetxController { void showEasyLoading() => EasyLoading.show(); void dismissEasyLoading() { - if(EasyLoading.isShow) EasyLoading.dismiss(); + if (EasyLoading.isShow) EasyLoading.dismiss(); } - void showTitleEasyLoading(String showContent) => EasyLoading.show(status: showContent); + void showTitleEasyLoading(String showContent) => + EasyLoading.show(status: showContent); Timer? _timer; + // CancelableOperation? _operation; - void showBlueConnetctToastTimer({bool isShowBlueConnetctToast = true, Function? action}) { + void showBlueConnetctToastTimer( + {bool isShowBlueConnetctToast = true, Function? action}) { if (_timer != null && _timer!.isActive) { _timer!.cancel(); _timer = null; @@ -88,9 +91,9 @@ class BaseGetXController extends GetxController { } void showBlueConnetctToast() { - bool isContains = BlueManage().connectDeviceName!.contains("T9A"); + bool isContains = BlueManage().connectDeviceName.contains("T9A"); showToast( - "连接设备失败,请确保在设备附近,设备未被连接,设备已打开${isContains == true ? "。如果是全自动锁,请使屏幕变亮" : ""}"); + "${'操作失败,请确认锁是否在附近,或重启手机蓝牙后再试。'.tr}${isContains == true ? "如果是全自动锁,请使屏幕变亮" : ""}"); } void showToast(String status, {Function? something}) { @@ -116,6 +119,7 @@ class BaseGetXController extends GetxController { void showOperationSuccessful({String? status, Function? something}) => showSuccess(status ?? "成功", something: something); + void showOperationFailed({String? status, Function? something}) => showError(status ?? "失败", something: something); @@ -171,7 +175,8 @@ class BaseGetXController extends GetxController { String useDateStr = ''; if (keyType == XSConstantMacro.keyTypeTime) { //限期 - useDateStr = "${DateTool().dateToYMDHNString(startDate.toString())}-${DateTool().dateToYMDHNString(endDate.toString())} ${"限时".tr}"; + useDateStr = + "${DateTool().dateToYMDHNString(startDate.toString())}-${DateTool().dateToYMDHNString(endDate.toString())} ${"限时".tr}"; } else if (keyType == XSConstantMacro.keyTypeLong) { //永久 // DateTime dateStr = DateTime.fromMillisecondsSinceEpoch(indexEntity.date!); @@ -184,7 +189,8 @@ class BaseGetXController extends GetxController { useDateStr = '单次'.tr; } else if (keyType == XSConstantMacro.keyTypeLoop) { //循环 - useDateStr = "${DateTool().dateToYMDString(startDate.toString())}-${DateTool().dateToYMDString(endDate.toString())} ${"循环".tr}"; + useDateStr = + "${DateTool().dateToYMDString(startDate.toString())}-${DateTool().dateToYMDString(endDate.toString())} ${"循环".tr}"; } return useDateStr; @@ -214,5 +220,6 @@ class BaseGetXController extends GetxController { ///Extension_Int extension Extension_Int on int { bool get codeIsSuccessful => this == 0; + bool get msgCodeIsSuccessful => this == 1; }