diff --git a/lib/app.dart b/lib/app.dart index d4ae7596..c81290a1 100755 --- a/lib/app.dart +++ b/lib/app.dart @@ -86,8 +86,7 @@ class _MyAppState extends State with WidgetsBindingObserver, BaseWidget { locale: StoreService.to.getLanguageCode()!.isNotEmpty ? appDept.deptSupportedLocales .where((Locale element) => - element.languageCode.toString() == - StoreService.to.getLanguageCode()) + element.toString() == StoreService.to.getLanguageCode()) .first : Get.deviceLocale, // locale: Get.deviceLocale, diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart index 2f8f208e..1cf70a9e 100644 --- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart @@ -88,10 +88,10 @@ class GatewayConfigurationWifiLogic extends BaseGetXController { // WIFI配网结果 Future _replySenderConfiguringWifiResult(Reply reply) async { final int status = reply.data[2]; + state.sureBtnState.value = 0; switch (status) { case 0x00: //成功 - state.sureBtnState.value = 0; cancelBlueConnetctToastTimer(); dismissEasyLoading(); final int secretKeyJsonLength = (reply.data[3] << 8) + reply.data[4]; diff --git a/lib/network/request_interceptor.dart b/lib/network/request_interceptor.dart index d40188a8..95617873 100755 --- a/lib/network/request_interceptor.dart +++ b/lib/network/request_interceptor.dart @@ -39,8 +39,7 @@ String getLanguageCode() { final Locale locale = StoreService.to.getLanguageCode()!.isNotEmpty ? appDept.deptSupportedLocales .where((Locale element) => - element.languageCode.toString() == - StoreService.to.getLanguageCode()) + element.toString() == StoreService.to.getLanguageCode()) .first : Get.locale!; // Get.deviceLocale; String languageCode = diff --git a/pubspec.yaml b/pubspec.yaml index 6b1cb9ef..2d34dcf6 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -104,7 +104,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.85+2024120301:完善网关功能 # 1.0.85+2024120401:修复网关问题,打包给谢敬调试 -version: 1.0.85+2024121201 +version: 1.0.85+2024121301 environment: sdk: '>=2.12.0 <3.0.0'