diff --git a/assets/file.json b/assets/file.json index 1a9180a..1b56589 100644 --- a/assets/file.json +++ b/assets/file.json @@ -1,4 +1,4 @@ [ - "assets/miniapp/mhtControl_1.0.90.zip", + "assets/miniapp/mhtControl_1.0.94.zip", "assets/xiaoe/xiaoe_1.0.0.zip" ] \ No newline at end of file diff --git a/assets/miniapp/mhtControl_1.0.90.zip b/assets/miniapp/mhtControl_1.0.90.zip deleted file mode 100644 index 445f197..0000000 Binary files a/assets/miniapp/mhtControl_1.0.90.zip and /dev/null differ diff --git a/lib/pages/mh_page/homepage/controller/mht_home_controller.dart b/lib/pages/mh_page/homepage/controller/mht_home_controller.dart index c1f3036..02c3add 100644 --- a/lib/pages/mh_page/homepage/controller/mht_home_controller.dart +++ b/lib/pages/mh_page/homepage/controller/mht_home_controller.dart @@ -537,7 +537,7 @@ class MHTHomeController extends GetControllerEx { String serviceName = ServiceConstant.server_service; String serviceApi = ServiceConstant.user_setting; String type = "control_${tmp}"; - if(tmp['type'] != null){ + if (tmp['type'] != null) { type = "control_${tmp['mac']}_${tmp['type']}"; } String queryUrl = @@ -561,4 +561,30 @@ class MHTHomeController extends GetControllerEx { return data; } + + //查询是否需要更新提示 + selectUpdateTips() async { + bool tips = false; + String serviceAddress = ServiceConstant.service_address; + String serviceName = ServiceConstant.server_service; + String serviceApi = ServiceConstant.user_setting; + String type = "web_control_tip"; + String queryUrl = + "${serviceAddress}${serviceName}${serviceApi}?type=$type&code=mht"; + await requestWithLog( + logTitle: "查询更新提示", + method: MyHttpMethod.get, + queryUrl: queryUrl, + onSuccess: (res) { + if (res.data != null) { + tips = res.data["tip"]; + } + updateAll(); + }, + onFailure: (res) { + print(res); + }, + ); + return tips; + } } diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index 1167387..e67019d 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -94,35 +94,40 @@ class _NewHomePageState extends State { //未登录 return; } - showTipUpgradeDialog( - context, - Column( - children: [ - SizedBox( - width: 94.rpx, - height: 70.rpx, - child: SvgPicture.asset( - 'assets/img/icon/upgrade.svg', - fit: BoxFit.cover, - // color: themeController.currentColor.sc3, // 若你想加颜色控制可取消注释 - ), - ), - Text( - "web控制更新".tr, - style: TextStyle( - color: stringToColor("#333333"), - fontSize: AppConstants().title_text_fontSize, - ), - ), - Text("新版本号".tr + - ":" + - "${pkg.version}" + - "," + - "点击确认退出app,重新进入".tr), - ].divide(SizedBox( - height: 37.rpx, - )), - )); + homeController.selectUpdateTips().then((bool tips) { + //眠花糖更新提示 + if (tips) { + showTipUpgradeDialog( + context, + Column( + children: [ + SizedBox( + width: 94.rpx, + height: 70.rpx, + child: SvgPicture.asset( + 'assets/img/icon/upgrade.svg', + fit: BoxFit.cover, + // color: themeController.currentColor.sc3, // 若你想加颜色控制可取消注释 + ), + ), + Text( + "web控制更新".tr, + style: TextStyle( + color: stringToColor("#333333"), + fontSize: AppConstants().title_text_fontSize, + ), + ), + Text("新版本号".tr + + ":" + + "${pkg.version}" + + "," + + "点击确认退出app,重新进入".tr), + ].divide(SizedBox( + height: 37.rpx, + )), + )); + } + }); }); } catch (e) { print(e); @@ -573,7 +578,7 @@ class _NewHomePageState extends State { onTap: () { if (formFieldController .value != - null) { + null) { sleepReportController .initParams( macValue: