diff --git a/assets/file.json b/assets/file.json index b0b2804..434206f 100644 --- a/assets/file.json +++ b/assets/file.json @@ -1,3 +1,3 @@ [ - "assets/miniapp/mhtControl_1.0.63.zip" + "assets/miniapp/mhtControl_1.0.65.zip" ] \ No newline at end of file diff --git a/assets/miniapp/mhtControl_1.0.63.zip b/assets/miniapp/mhtControl_1.0.65.zip similarity index 97% rename from assets/miniapp/mhtControl_1.0.63.zip rename to assets/miniapp/mhtControl_1.0.65.zip index 80623c2..ab3e0ef 100644 Binary files a/assets/miniapp/mhtControl_1.0.63.zip and b/assets/miniapp/mhtControl_1.0.65.zip differ diff --git a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart index 7b1e197..3036e56 100644 --- a/lib/pages/mh_page/device/component/DeviceComponentWidget.dart +++ b/lib/pages/mh_page/device/component/DeviceComponentWidget.dart @@ -81,7 +81,7 @@ class _DeviceComponentWidgetState extends State { child: CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - Colors.white, + stringToColor("#929699"), ), ), ); diff --git a/lib/pages/mh_page/device/mht_wifi_page.dart b/lib/pages/mh_page/device/mht_wifi_page.dart index a353de8..bb1f3fe 100644 --- a/lib/pages/mh_page/device/mht_wifi_page.dart +++ b/lib/pages/mh_page/device/mht_wifi_page.dart @@ -184,7 +184,7 @@ class _MHTWifiPageState extends State { child: CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, + Colors.white, ), ), ); @@ -197,7 +197,7 @@ class _MHTWifiPageState extends State { child: CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, + Colors.white, ), ), ); @@ -648,9 +648,7 @@ class _MHTWifiPageState extends State { valueColor: AlwaysStoppedAnimation< Color>( - themeController - .currentColor - .sc1, + Colors.white, ), ), ) diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index ebde0e4..16f0fcc 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -591,8 +591,7 @@ class _NewHomePageState extends State { valueColor: AlwaysStoppedAnimation< Color>( - themeController - .currentColor.sc1, + Colors.white, ), ), ), diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index 9050d34..89ea0eb 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -182,8 +182,14 @@ class _NewSleepReportPageState extends State { return Column( children: [ Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 30.rpx, 0, 0), + padding: EdgeInsetsDirectional.fromSTEB( + 0, + (widget.data['reportPadding'] != null && + widget.data['reportPadding'] == false) + ? 0.rpx + : 30.rpx, + 0, + 0), child: Container( width: double.infinity, constraints: BoxConstraints(