diff --git a/assets/miniapp/mhtControl_1.0.90.zip b/assets/miniapp/mhtControl_1.0.90.zip index 3d5ba18..4c6a547 100644 Binary files a/assets/miniapp/mhtControl_1.0.90.zip and b/assets/miniapp/mhtControl_1.0.90.zip differ diff --git a/lib/common/color/appConstants.dart b/lib/common/color/appConstants.dart index 287ea99..7841385 100644 --- a/lib/common/color/appConstants.dart +++ b/lib/common/color/appConstants.dart @@ -8,6 +8,9 @@ import 'package:vbvs_app/enum/APPPackageType.dart'; class AppConstants { // App-related constants + static const String zhmht_app_version = "SWES_1.2026.1.8";//眠花糖 + static const String theh_app_version = "1.2601.08";//太和 + // 1. 纯字符串列表格式 static const List integerTimeZones = [ 'UTC-12', diff --git a/lib/main.dart b/lib/main.dart index f04bb49..323eeb4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -25,7 +25,6 @@ import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/JPushUtil.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/common/util/requestWithLog.dart'; -import 'package:vbvs_app/config/ConfigReader.dart'; import 'package:vbvs_app/controller/date/CalendarController.dart'; import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/body_device_controller.dart'; @@ -747,6 +746,17 @@ Future initLogin() async { final box = GetStorage(); UserInfoController userInfoController = Get.find(); String? token = box.read('token'); + + if (AppConstants().ent_type == APPPackageType.MHT.code) { + EasyDartModule.dio.queryParameters = { + "ver": AppConstants.zhmht_app_version + }; + } else if (AppConstants().ent_type == APPPackageType.TH.code) { + EasyDartModule.dio.queryParameters = {"ver": AppConstants.theh_app_version}; + } else { + EasyDartModule.dio.queryParameters = {"ver": AppConstants.theh_app_version}; + } + if (token != null) { // 根据token去请求 // await userInfoController.autoLogin(token); diff --git a/lib/pages/main_bottom/mine_page.dart b/lib/pages/main_bottom/mine_page.dart index e1f742e..f572a50 100644 --- a/lib/pages/main_bottom/mine_page.dart +++ b/lib/pages/main_bottom/mine_page.dart @@ -703,7 +703,7 @@ class _MinePageState extends State { mainAxisSize: MainAxisSize.max, children: [ Text( - 'V1.0.2601.08', + '${AppConstants.theh_app_version}', style: TextStyle( fontFamily: 'Inter', // color: Color(0xFFD9E3EB), diff --git a/lib/pages/mh_page/new_settingPage.dart b/lib/pages/mh_page/new_settingPage.dart index fd9f261..f25b5f0 100644 --- a/lib/pages/mh_page/new_settingPage.dart +++ b/lib/pages/mh_page/new_settingPage.dart @@ -253,7 +253,7 @@ class _SettingPageState extends State { ), ].divide(SizedBox(width: 22.rpx)), ), - Text('SWES2026.1.8', + Text('${AppConstants.zhmht_app_version}', style: TextStyle( color: Colors.white, fontSize: 26.rpx, diff --git a/lib/pages/sleep_report/component/BreatheCard.dart b/lib/pages/sleep_report/component/BreatheCard.dart index 0ce68ff..808c73f 100644 --- a/lib/pages/sleep_report/component/BreatheCard.dart +++ b/lib/pages/sleep_report/component/BreatheCard.dart @@ -93,7 +93,7 @@ class _BreatheCardState extends State return Container( width: double.infinity, decoration: BoxDecoration( - color: themeController.currentColor.sc5, + // color: themeController.currentColor.sc5, borderRadius: BorderRadius.circular(AppConstants().normal_container_radius), ),