diff --git a/lib/common/color/appConstants.dart b/lib/common/color/appConstants.dart index eecc702..402cf4c 100644 --- a/lib/common/color/appConstants.dart +++ b/lib/common/color/appConstants.dart @@ -8,8 +8,8 @@ import 'package:vbvs_app/enum/APPPackageType.dart'; class AppConstants { // App-related constants - static const String zhmht_app_version = "SWES_1.2026.04.03"; //眠花糖 - static const String theh_app_version = "1.2604.02"; //太和 + static const String zhmht_app_version = "SWES_1.2026.04.07"; //眠花糖 + static const String theh_app_version = "1.2604.07"; //太和 // 1. 纯字符串列表格式 static const List integerTimeZones = [ @@ -91,8 +91,8 @@ class AppConstants { //系统参数 //运行打包APP模式 - int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 - // int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖 + // int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 + int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖 // int ent_type = APPPackageType.HUANSHUI.code; //1.默认太和 2.欢睡 3.眠花糖 // int ent_type = APPPackageType.DONGHUA.code; //1.默认太和 2.欢睡 3.眠花糖 4.东华 // int ent_type = APPPackageType.HAIER.code; //1.默认太和 2.欢睡 3.眠花糖 4.东华 5.海尔沃棣 diff --git a/lib/language/AppLanguage.dart b/lib/language/AppLanguage.dart index ca9c8b2..32cd6b2 100644 --- a/lib/language/AppLanguage.dart +++ b/lib/language/AppLanguage.dart @@ -49,12 +49,11 @@ class AppLanguage extends Translations { // } // } - Future loadLanguage(String languageCode, - {int project = 1}) async { + Future loadLanguage(String languageCode, {int project = 1}) async { try { final jsonString; // 加载 JSON 文件 - if (project ==APPPackageType.TH.code ) { + if (project == APPPackageType.TH.code) { jsonString = await rootBundle.loadString('assets/langs/$languageCode.json'); } else if (project == APPPackageType.MHT.code) { @@ -115,6 +114,6 @@ class AppLanguage extends Translations { } bool isChinese() { - return _currentLanguageCode == "zh_CN"||_currentLanguageCode == "zh_TW"; + return _currentLanguageCode == "zh_CN" || _currentLanguageCode == "zh_TW"; } } diff --git a/lib/main.dart b/lib/main.dart index 40dc17a..a13d77f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -698,7 +698,7 @@ void initEasyDartModule() { EasyDartModule.init( loggerConfig: LoggerConfig( host: "https://zhmht.swes.com.cn:27020/vsbs_log", - serviceName: "智慧眠花糖2026-04-03-test"), + serviceName: "智慧眠花糖2026-04-07"), webSocketConfig: WebSocketConfig(ServiceConstant.webSocketService, (data) { // 接收到服务消息 diff --git a/lib/pages/device/BodyDeviceWidget.dart b/lib/pages/device/BodyDeviceWidget.dart index fe41632..b56850f 100644 --- a/lib/pages/device/BodyDeviceWidget.dart +++ b/lib/pages/device/BodyDeviceWidget.dart @@ -1,6 +1,8 @@ import 'dart:async'; + import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -262,6 +264,11 @@ class _BodyDevicePageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device/component/MessageSetting.dart b/lib/pages/device/component/MessageSetting.dart index fae8363..431ad6e 100644 --- a/lib/pages/device/component/MessageSetting.dart +++ b/lib/pages/device/component/MessageSetting.dart @@ -17,6 +17,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/message/common_message_setting_controller.dart'; import 'package:vbvs_app/controller/message/message_setting_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; +import 'package:flutter/services.dart'; //消息总配置 class MessageSettingPage extends StatefulWidget { @@ -214,6 +215,11 @@ class _MessageSettingPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device/component/SingleMessageSetting.dart b/lib/pages/device/component/SingleMessageSetting.dart index 33bdc88..a9c6c8b 100644 --- a/lib/pages/device/component/SingleMessageSetting.dart +++ b/lib/pages/device/component/SingleMessageSetting.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/ServiceConstant.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -211,6 +212,11 @@ class _MessageSettingPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device/deviceCopy.dart b/lib/pages/device/deviceCopy.dart index 393b907..c851926 100644 --- a/lib/pages/device/deviceCopy.dart +++ b/lib/pages/device/deviceCopy.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -372,6 +373,11 @@ class _BodyDevicePageState extends State resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device/device_detail.dart b/lib/pages/device/device_detail.dart index 739550c..6abde89 100644 --- a/lib/pages/device/device_detail.dart +++ b/lib/pages/device/device_detail.dart @@ -10,6 +10,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class DeviceDetailPage extends StatefulWidget { var device; @@ -46,6 +47,11 @@ class _DeviceDetailPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/device/health_experience.dart b/lib/pages/device/health_experience.dart index ebecf01..7b3202a 100644 --- a/lib/pages/device/health_experience.dart +++ b/lib/pages/device/health_experience.dart @@ -241,7 +241,12 @@ // ), // child: Scaffold( // backgroundColor: Colors.transparent, -// appBar: AppBar( +// appBar: AppBar( + // systemOverlayStyle: SystemUiOverlayStyle( + // statusBarColor: Colors.transparent, // 状态栏背景色 + // statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + // statusBarBrightness: Brightness.light, // 图标颜色（iOS） + // ), // backgroundColor: themeController.currentColor.sc17, // automaticallyImplyLeading: false, // iconTheme: IconThemeData(color: themeController.currentColor.sc3), @@ -1641,7 +1646,12 @@ class _HealthCheckPageState extends State ), child: Scaffold( backgroundColor: Colors.transparent, - appBar: AppBar( + appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/device/health_experience_history.dart b/lib/pages/device/health_experience_history.dart index f80c3a5..1896927 100644 --- a/lib/pages/device/health_experience_history.dart +++ b/lib/pages/device/health_experience_history.dart @@ -8,9 +8,10 @@ import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/message/message_review_controller.dart'; import 'package:vbvs_app/pages/device/component/HealthReportCard.dart'; +import 'package:flutter/services.dart'; class HealthExperienceHistory extends StatefulWidget { - var data; + var data; HealthExperienceHistory({super.key, required this.data}); @override @@ -54,6 +55,11 @@ class _HealthExperienceHistoryState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device/instant_body_page.dart b/lib/pages/device/instant_body_page.dart index a6d5361..86e1bf8 100644 --- a/lib/pages/device/instant_body_page.dart +++ b/lib/pages/device/instant_body_page.dart @@ -203,6 +203,11 @@ class _InstantBodyPageState extends State child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/device/message_review_page.dart b/lib/pages/device/message_review_page.dart index f4c037f..9467bb2 100644 --- a/lib/pages/device/message_review_page.dart +++ b/lib/pages/device/message_review_page.dart @@ -11,6 +11,7 @@ import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/controller/message/message_review_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/device/component/ReviewMessageWidgetWidget.dart'; +import 'package:flutter/services.dart'; class MessageReviewPage extends StatefulWidget { var data; //1.绑定时 2.绑定后 @@ -49,6 +50,11 @@ class _MessageReviewPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device_bind/MobileScannerTestPage.dart b/lib/pages/device_bind/MobileScannerTestPage.dart index 522c490..6c53f45 100644 --- a/lib/pages/device_bind/MobileScannerTestPage.dart +++ b/lib/pages/device_bind/MobileScannerTestPage.dart @@ -9,6 +9,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class MobileScannerTestPage extends StatefulWidget { const MobileScannerTestPage({Key? key}) : super(key: key); @@ -105,6 +106,11 @@ class _MobileScannerTestPageState extends State return Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/device_bind/THShareDeviceDetailWidget.dart b/lib/pages/device_bind/THShareDeviceDetailWidget.dart index 940932a..97b468a 100644 --- a/lib/pages/device_bind/THShareDeviceDetailWidget.dart +++ b/lib/pages/device_bind/THShareDeviceDetailWidget.dart @@ -1,4 +1,3 @@ -import 'package:ef/base/widget/flutterflow/FlutterFlowTheme.dart'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:vbvs_app/common/color/ServiceConstant.dart'; @@ -12,6 +11,7 @@ import 'package:vbvs_app/controller/device/body_device_controller.dart'; import 'package:vbvs_app/controller/device/device_share_list_controller.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; +import 'package:flutter/services.dart'; class THShareDeviceDetailWidget extends GetView { final scaffoldKey = GlobalKey(); @@ -160,7 +160,7 @@ class THShareDeviceDetailWidget extends GetView { return GestureDetector( child: Container( - decoration: BoxDecoration( + decoration: BoxDecoration( image: DecorationImage( image: AssetImage(getBackgroundImageNoImage()), // 本地图片 fit: BoxFit.fill, @@ -170,6 +170,11 @@ class THShareDeviceDetailWidget extends GetView { key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, diff --git a/lib/pages/device_bind/after/after_device_calibration_person.dart b/lib/pages/device_bind/after/after_device_calibration_person.dart index 91fba8c..957afff 100644 --- a/lib/pages/device_bind/after/after_device_calibration_person.dart +++ b/lib/pages/device_bind/after/after_device_calibration_person.dart @@ -17,6 +17,7 @@ import 'package:vbvs_app/controller/device/device_calibration_controller.dart'; import 'package:vbvs_app/controller/person/person_controller.dart'; import 'package:vbvs_app/pages/device_bind/componnet/CalibrationProgressWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class AfterCalibrationPersonPage extends StatefulWidget { AfterCalibrationPersonPage({super.key}); @@ -73,6 +74,11 @@ class _AfterCalibrationPersonPageState child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/device_bind/after/after_update_person_page.dart b/lib/pages/device_bind/after/after_update_person_page.dart index 30c6d85..c26af97 100644 --- a/lib/pages/device_bind/after/after_update_person_page.dart +++ b/lib/pages/device_bind/after/after_update_person_page.dart @@ -86,6 +86,11 @@ class _AfterUpdatePersonPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device_bind/after/after_wifi_page_person.dart b/lib/pages/device_bind/after/after_wifi_page_person.dart index 76bb374..310a6d3 100644 --- a/lib/pages/device_bind/after/after_wifi_page_person.dart +++ b/lib/pages/device_bind/after/after_wifi_page_person.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/pages/device_bind/blueteeth_device_page.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; class AfterWifiPagePerson extends StatefulWidget { var type; @@ -84,6 +85,11 @@ class _AfterWifiPagePersonState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/device_bind/bind_device_success.dart b/lib/pages/device_bind/bind_device_success.dart index cb21373..b41f473 100644 --- a/lib/pages/device_bind/bind_device_success.dart +++ b/lib/pages/device_bind/bind_device_success.dart @@ -14,6 +14,8 @@ import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/person/person_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; + class BindDeviceSuccess extends StatefulWidget { const BindDeviceSuccess({super.key}); @@ -48,6 +50,11 @@ class _EPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/device_bind/blueteeth_device_page.dart b/lib/pages/device_bind/blueteeth_device_page.dart index a5b2f90..a5a74ab 100644 --- a/lib/pages/device_bind/blueteeth_device_page.dart +++ b/lib/pages/device_bind/blueteeth_device_page.dart @@ -22,6 +22,7 @@ import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class BlueteethDevicePage extends StatefulWidget { int tid = -1; @@ -368,6 +369,11 @@ class _BlueteethDevicePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, diff --git a/lib/pages/device_bind/componnet/MessageSetting.dart b/lib/pages/device_bind/componnet/MessageSetting.dart index 3c456b9..a3fdd27 100644 --- a/lib/pages/device_bind/componnet/MessageSetting.dart +++ b/lib/pages/device_bind/componnet/MessageSetting.dart @@ -190,7 +190,12 @@ // ), // child: Scaffold( // backgroundColor: Colors.transparent, -// appBar: AppBar( +// appBar: AppBar( + // systemOverlayStyle: SystemUiOverlayStyle( + // statusBarColor: Colors.transparent, // 状态栏背景色 + // statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + // statusBarBrightness: Brightness.light, // 图标颜色（iOS） + // ), // backgroundColor: themeController.currentColor.sc17, // automaticallyImplyLeading: false, // iconTheme: IconThemeData( diff --git a/lib/pages/device_bind/device_calibration.dart b/lib/pages/device_bind/device_calibration.dart index 427d738..c6ddc78 100644 --- a/lib/pages/device_bind/device_calibration.dart +++ b/lib/pages/device_bind/device_calibration.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/device_calibration_controller.dart'; import 'package:vbvs_app/pages/device_bind/componnet/CalibrationProgressWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class CalibrationPage extends StatefulWidget { int? type; //1.绑定时 2.绑定后 @@ -72,6 +73,11 @@ class _CalibrationPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: @@ -420,7 +426,7 @@ class _CalibrationPageState extends State { ), // 床头文字 - Align( + Align( alignment: Alignment.topCenter, // 顶部居中 child: Padding( diff --git a/lib/pages/device_bind/device_calibration_copy.dart b/lib/pages/device_bind/device_calibration_copy.dart index c5b4dcb..6e164d1 100644 --- a/lib/pages/device_bind/device_calibration_copy.dart +++ b/lib/pages/device_bind/device_calibration_copy.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/device_calibration_controller.dart'; import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class CalibrationPage extends StatefulWidget { int? type; //1.绑定时 2.绑定后 @@ -61,6 +62,11 @@ class _CalibrationPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/device_bind/device_calibration_person.dart b/lib/pages/device_bind/device_calibration_person.dart index 43000bb..117822b 100644 --- a/lib/pages/device_bind/device_calibration_person.dart +++ b/lib/pages/device_bind/device_calibration_person.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/device_calibration_controller.dart'; import 'package:vbvs_app/pages/device_bind/componnet/CalibrationProgressWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class CalibrationPersonPage extends StatefulWidget { int? type; //1.绑定时 2.绑定后 @@ -71,6 +72,11 @@ class _CalibrationPersonPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/device_bind/device_share_list_page.dart b/lib/pages/device_bind/device_share_list_page.dart index ed603ed..ac27d94 100644 --- a/lib/pages/device_bind/device_share_list_page.dart +++ b/lib/pages/device_bind/device_share_list_page.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/device/device_share_list_controller.dart'; import 'package:vbvs_app/pages/device_bind/componnet/DeviceShareInfoWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class DeviceShareListPage extends StatefulWidget { String device = ""; @@ -57,6 +58,11 @@ class _DeviceShareListPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, diff --git a/lib/pages/device_bind/device_share_page.dart b/lib/pages/device_bind/device_share_page.dart index 9621327..eff33a1 100644 --- a/lib/pages/device_bind/device_share_page.dart +++ b/lib/pages/device_bind/device_share_page.dart @@ -51,6 +51,11 @@ class _DeviceSharePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/device_bind/device_type.dart b/lib/pages/device_bind/device_type.dart index 9484b40..34da02d 100644 --- a/lib/pages/device_bind/device_type.dart +++ b/lib/pages/device_bind/device_type.dart @@ -14,6 +14,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class DeviceTypePage extends StatefulWidget { int type = 0; //0绑定设备 1.查询我的设备 @@ -306,6 +307,11 @@ class _EPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/device_bind/device_type_list.dart b/lib/pages/device_bind/device_type_list.dart index 159b74a..e0348f8 100644 --- a/lib/pages/device_bind/device_type_list.dart +++ b/lib/pages/device_bind/device_type_list.dart @@ -1,5 +1,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; @@ -56,7 +58,12 @@ class _DeviceTypeListPageState extends State { ), child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 - appBar: AppBar( + appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index ff5a6fd..4f09cf2 100644 --- a/lib/pages/device_bind/wifi_page.dart +++ b/lib/pages/device_bind/wifi_page.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/pages/device_bind/blueteeth_device_page.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; class WifiPage extends StatefulWidget { var type; //为空，首次绑定 不为空，从设备列表进入 @@ -155,6 +156,11 @@ class _WifiPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), @@ -797,7 +803,7 @@ class _WifiPageState extends State { Get.toNamed("/calibrationPage", arguments: 1); }); - } else if (aa == 'unknown') { + } else if (aa == 'unknown') { blueteethBindController .netType.value = 3; blueteethBindController.updateAll(); @@ -1180,7 +1186,6 @@ class _WifiPageState extends State { } } - Future dealWifi(String mac, {bool needTip = true, bool needSuccess = false}) async { if (dealing) { diff --git a/lib/pages/device_bind/wifi_page_person.dart b/lib/pages/device_bind/wifi_page_person.dart index 69d072f..6aaf38b 100644 --- a/lib/pages/device_bind/wifi_page_person.dart +++ b/lib/pages/device_bind/wifi_page_person.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/pages/device_bind/blueteeth_device_page.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; +import 'package:flutter/services.dart'; class WifiPagePerson extends StatefulWidget { var type; @@ -100,6 +101,11 @@ class _WifiPagePersonState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/login/LogoutPage.dart b/lib/pages/login/LogoutPage.dart index e590d5d..7b36fb3 100644 --- a/lib/pages/login/LogoutPage.dart +++ b/lib/pages/login/LogoutPage.dart @@ -31,6 +31,11 @@ class LogoutPage extends GetView { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), diff --git a/lib/pages/login/other_login.dart b/lib/pages/login/other_login.dart index fda9dc1..9fb2d16 100644 --- a/lib/pages/login/other_login.dart +++ b/lib/pages/login/other_login.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/main.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/person/select_time.dart'; import 'dart:ui' as ui; +import 'package:flutter/services.dart'; class OtherLoginPage extends StatefulWidget { const OtherLoginPage({super.key}); @@ -144,6 +145,11 @@ class _OtherLoginPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), // backgroundColor: themeController.currentColor.sc17, backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/login/th_bind_tel_page.dart b/lib/pages/login/th_bind_tel_page.dart index 5b9c69d..0ab2759 100644 --- a/lib/pages/login/th_bind_tel_page.dart +++ b/lib/pages/login/th_bind_tel_page.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/bind_tel_controller.dart'; import 'package:vbvs_app/pages/person/select_time.dart'; +import 'package:flutter/services.dart'; class THBindTelWidget extends GetView { BoxConstraints? bodysize; @@ -45,6 +46,11 @@ class THBindTelWidget extends GetView { key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -183,7 +189,7 @@ class THBindTelWidget extends GetView { 0.rpx, 0, 0, 0), child: Row( mainAxisSize: MainAxisSize.max, - children: [ + children: [ InkWell( onTap: () async { await showCountryCodePickerDialog( diff --git a/lib/pages/main_bottom/e_page copy.dart b/lib/pages/main_bottom/e_page copy.dart index 9a1dba0..8cdc98e 100644 --- a/lib/pages/main_bottom/e_page copy.dart +++ b/lib/pages/main_bottom/e_page copy.dart @@ -17,6 +17,7 @@ import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/enum/LoginStatus.dart'; import 'package:vbvs_app/model/api_response.dart'; +import 'package:flutter/services.dart'; //在线使用 class EPage extends StatefulWidget { @@ -70,6 +71,11 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/main_bottom/e_page.dart b/lib/pages/main_bottom/e_page.dart index 5bfcef3..6a51110 100644 --- a/lib/pages/main_bottom/e_page.dart +++ b/lib/pages/main_bottom/e_page.dart @@ -233,7 +233,7 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { return LayoutBuilder( builder: (context, bodySize) => GestureDetector( child: Container( - decoration: BoxDecoration( + decoration: BoxDecoration( image: DecorationImage( image: AssetImage(getBackgroundImageNoImage()), fit: BoxFit.fill, @@ -242,6 +242,11 @@ class _EPageState extends State with AutomaticKeepAliveClientMixin { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/main_bottom/follow_page.dart b/lib/pages/main_bottom/follow_page.dart index 6c02dc7..87675a7 100644 --- a/lib/pages/main_bottom/follow_page.dart +++ b/lib/pages/main_bottom/follow_page.dart @@ -4,6 +4,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/WebViewWidget.dart'; +import 'package:flutter/services.dart'; class FollowPage extends StatefulWidget { late MyWebView webView; @@ -47,6 +48,11 @@ class _FollowPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/main_bottom/help_page.dart b/lib/pages/main_bottom/help_page.dart index e3b8ff0..92e6bbe 100644 --- a/lib/pages/main_bottom/help_page.dart +++ b/lib/pages/main_bottom/help_page.dart @@ -4,6 +4,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/WebViewWidget.dart'; +import 'package:flutter/services.dart'; class HelpPage extends StatefulWidget { String url; @@ -47,6 +48,11 @@ class _HelpPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/main_bottom/message_page.dart b/lib/pages/main_bottom/message_page.dart index 491841a..74338d8 100644 --- a/lib/pages/main_bottom/message_page.dart +++ b/lib/pages/main_bottom/message_page.dart @@ -101,7 +101,7 @@ class _MessagePageState extends State { builder: (context, boxConstraints) => GestureDetector( // onTap: () => FocusScope.of(context).unfocus(),, child: Container( - decoration: BoxDecoration( + decoration: BoxDecoration( image: DecorationImage( image: AssetImage(getBackgroundImageNoImage()), fit: BoxFit.fill, @@ -109,6 +109,11 @@ class _MessagePageState extends State { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), // backgroundColor: themeController.currentColor.sc17, backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/main_bottom/message_page_return.dart b/lib/pages/main_bottom/message_page_return.dart index f4ec8da..e033adf 100644 --- a/lib/pages/main_bottom/message_page_return.dart +++ b/lib/pages/main_bottom/message_page_return.dart @@ -91,7 +91,7 @@ class _MessageReturnPageState extends State { builder: (context, boxConstraints) => GestureDetector( // onTap: () => FocusScope.of(context).unfocus(),, child: Container( - decoration: BoxDecoration( + decoration: BoxDecoration( image: DecorationImage( image: AssetImage(getBackgroundImageNoImage()), fit: BoxFit.fill, @@ -99,6 +99,11 @@ class _MessageReturnPageState extends State { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/mh_page/BackMovement.dart b/lib/pages/mh_page/BackMovement.dart index 6b50264..23b7589 100644 --- a/lib/pages/mh_page/BackMovement.dart +++ b/lib/pages/mh_page/BackMovement.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'dart:math' as math; import 'package:vbvs_app/common/util/MyUtils.dart'; +import 'package:flutter/services.dart'; class BackMovementPage extends StatefulWidget { const BackMovementPage({super.key}); @@ -28,6 +29,11 @@ class _BackMovementPageState extends State { child: Container( child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: const Color(0xFF011C33), // 统一背景色 automaticallyImplyLeading: false, @@ -209,7 +215,7 @@ class _BackMovementPageState extends State { borderRadius: BorderRadius.circular(6), ), ), - child: Text('恢复到默认设置'.tr), + child: Text('恢复到默认设置'.tr), ), ), ], diff --git a/lib/pages/mh_page/CommonMessageSettingPage.dart b/lib/pages/mh_page/CommonMessageSettingPage.dart index c5c3f39..63c2031 100644 --- a/lib/pages/mh_page/CommonMessageSettingPage.dart +++ b/lib/pages/mh_page/CommonMessageSettingPage.dart @@ -2,17 +2,15 @@ import 'dart:async'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; -import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:flutter/services.dart'; import 'package:vbvs_app/common/color/ServiceConstant.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/common/util/requestWithLog.dart'; import 'package:vbvs_app/component/base/GradientSwitch.dart'; -import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/message/common_message_setting_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; -import 'package:vbvs_app/pages/mh_page/user/controller/mht_login_controller.dart'; class MHTCommonMessageSettingPage extends StatefulWidget { MHTCommonMessageSettingPage({super.key}); @@ -130,6 +128,11 @@ class _CommonMessageSettingPageState child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/mh_page/HomeDeviceType.dart b/lib/pages/mh_page/HomeDeviceType.dart index 003c5c2..1068ac2 100644 --- a/lib/pages/mh_page/HomeDeviceType.dart +++ b/lib/pages/mh_page/HomeDeviceType.dart @@ -4,6 +4,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; +import 'package:flutter/services.dart'; class HomeDeviceType extends StatefulWidget { HomeDeviceType({super.key}); @@ -35,6 +36,11 @@ class _HomeDeviceTypeState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/LanguagePage.dart b/lib/pages/mh_page/LanguagePage.dart index edeb6d9..4b361a9 100644 --- a/lib/pages/mh_page/LanguagePage.dart +++ b/lib/pages/mh_page/LanguagePage.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/language/AppLanguage.dart'; import 'package:vbvs_app/pages/device_bind/componnet/FancyCircleCheckbox.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; +import 'package:flutter/services.dart'; class LanguagePage extends StatefulWidget { const LanguagePage({super.key}); @@ -44,6 +45,11 @@ class _LanguagePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/mh_page/ShareDeviceDetailWidget.dart b/lib/pages/mh_page/ShareDeviceDetailWidget.dart index a136abf..1207453 100644 --- a/lib/pages/mh_page/ShareDeviceDetailWidget.dart +++ b/lib/pages/mh_page/ShareDeviceDetailWidget.dart @@ -50,6 +50,11 @@ class ShareDeviceDetailWidget extends GetView { key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), @@ -397,7 +402,6 @@ class ShareDeviceDetailWidget extends GetView { ], ), )) - ]), ), Padding( @@ -429,7 +433,6 @@ class ShareDeviceDetailWidget extends GetView { data['info'][5]['uid'], data['mac'.tr], context); - }, colors: const [ Color(0xFFFCFCFC), diff --git a/lib/pages/mh_page/Vital_signs_sensor.dart b/lib/pages/mh_page/Vital_signs_sensor.dart index d0bb8a1..f3a0e74 100644 --- a/lib/pages/mh_page/Vital_signs_sensor.dart +++ b/lib/pages/mh_page/Vital_signs_sensor.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/mht_blueteeth_device_page.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; +import 'package:flutter/services.dart'; class VitalSignsSensorPage extends StatefulWidget { Map data; @@ -82,6 +83,11 @@ class _VitalSignsSensorState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/about_us.dart b/lib/pages/mh_page/about_us.dart index 73ab88d..e9505e1 100644 --- a/lib/pages/mh_page/about_us.dart +++ b/lib/pages/mh_page/about_us.dart @@ -4,6 +4,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/WebViewWidget.dart'; +import 'package:flutter/services.dart'; class MhAboutUsPage extends StatefulWidget { late MyWebView webView; @@ -55,6 +56,11 @@ class _MhAboutUsPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/address_list_page.dart b/lib/pages/mh_page/address_list_page.dart index a998c1c..a800f8c 100644 --- a/lib/pages/mh_page/address_list_page.dart +++ b/lib/pages/mh_page/address_list_page.dart @@ -1,14 +1,13 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/controller/mh_controller/address_list_controller.dart'; -import 'package:vbvs_app/pages/mh_page/EmptyMessageWidget.dart'; import 'package:vbvs_app/pages/mh_page/address_module_widget.dart'; class AddressListPage extends GetView { @@ -35,6 +34,11 @@ class AddressListPage extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/applyRepair/apply_repair_success.dart b/lib/pages/mh_page/applyRepair/apply_repair_success.dart index a4e9518..ab5e662 100644 --- a/lib/pages/mh_page/applyRepair/apply_repair_success.dart +++ b/lib/pages/mh_page/applyRepair/apply_repair_success.dart @@ -10,6 +10,7 @@ import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class ApplyRepairSuccess extends StatefulWidget { const ApplyRepairSuccess({super.key}); @@ -44,6 +45,11 @@ class _ApplyRepairSuccessState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/mh_page/apply_repair_page.dart b/lib/pages/mh_page/apply_repair_page.dart index 9c8cd61..ecd8358 100644 --- a/lib/pages/mh_page/apply_repair_page.dart +++ b/lib/pages/mh_page/apply_repair_page.dart @@ -1,5 +1,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/ServiceConstant.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -14,9 +15,7 @@ import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/apply_repair_controller.dart'; import 'package:vbvs_app/controller/mh_controller/repair_list_controller.dart'; -import 'package:vbvs_app/controller/repair/repair_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; -import 'package:vbvs_app/pages/mh_page/applyRepair/apply_repair_success.dart'; class ApplyRepairPage extends GetView { final scaffoldKey = GlobalKey(); @@ -58,6 +57,11 @@ class ApplyRepairPage extends GetView { resizeToAvoidBottomInset: true, // 自动调整页面避免被键盘遮挡 backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/bluetooth.dart b/lib/pages/mh_page/bluetooth.dart index 7019727..b5b4a5b 100644 --- a/lib/pages/mh_page/bluetooth.dart +++ b/lib/pages/mh_page/bluetooth.dart @@ -1,6 +1,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; @@ -8,12 +8,10 @@ import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart'; -import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/device.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; -import 'dart:ui' as ui; class BluetoothPage extends StatefulWidget { final Map data; @@ -51,6 +49,11 @@ class _BluetoothPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, @@ -396,7 +399,7 @@ class _BluetoothPageState extends State { ); } else if (obsData['bind_type'] == 2) { // 删除弹窗 - showDeleteDeviceConfirmDialog( + showDeleteDeviceConfirmDialog( context: context, title: "是否进行删除?".tr, onConfirm: () async { @@ -449,9 +452,9 @@ class _BluetoothPageState extends State { if (path == "/sleepHabitPage") { Get.back(); WebviewTestController webviewTestController = Get.find(); - webviewTestController.web.jsbridge?.dart.toSleepHabit(); + webviewTestController.web.jsbridge?.dart.toSleepHabit(); return; - } + } final result = await Get.toNamed(path!, arguments: arguments); if (result != null && onResult != null) { onResult(result); // ✅ 有回调就处理返回值 diff --git a/lib/pages/mh_page/book_info_page.dart b/lib/pages/mh_page/book_info_page.dart index 686aa94..3cb40bd 100644 --- a/lib/pages/mh_page/book_info_page.dart +++ b/lib/pages/mh_page/book_info_page.dart @@ -1,11 +1,11 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/component/base/THFlutterFlowDropDown.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/book_info_controller.dart'; @@ -42,6 +42,11 @@ class BookInfoPage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/book_success_page.dart b/lib/pages/mh_page/book_success_page.dart index 79869eb..ecb346c 100644 --- a/lib/pages/mh_page/book_success_page.dart +++ b/lib/pages/mh_page/book_success_page.dart @@ -1,7 +1,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; @@ -36,6 +36,11 @@ class BookSuccessPage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/delete_account.dart b/lib/pages/mh_page/delete_account.dart index 2bf1ad4..926a584 100644 --- a/lib/pages/mh_page/delete_account.dart +++ b/lib/pages/mh_page/delete_account.dart @@ -35,6 +35,11 @@ class DeletedAccountPage extends GetView { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/device/device_maintain.dart b/lib/pages/mh_page/device/device_maintain.dart index cd141fb..03e6442 100644 --- a/lib/pages/mh_page/device/device_maintain.dart +++ b/lib/pages/mh_page/device/device_maintain.dart @@ -1,16 +1,14 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; -import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/NewTopSlideNotification.dart'; -import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/mh_language_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; -import 'package:vbvs_app/model/api_response.dart'; class DeviceMaintain extends StatefulWidget { @override @@ -40,6 +38,11 @@ class _DeviceMaintainState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), titleSpacing: 0, diff --git a/lib/pages/mh_page/device/mht_bind_device_success.dart b/lib/pages/mh_page/device/mht_bind_device_success.dart index 1ec94fb..63d4be2 100644 --- a/lib/pages/mh_page/device/mht_bind_device_success.dart +++ b/lib/pages/mh_page/device/mht_bind_device_success.dart @@ -1,5 +1,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -10,13 +11,9 @@ import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; -import 'package:vbvs_app/controller/device/body_device_controller.dart'; -import 'package:vbvs_app/controller/home/home_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; -import 'package:vbvs_app/controller/person/person_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; -import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; @@ -53,6 +50,11 @@ class _MHTBindDeviceSuccessState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/mh_page/device/mht_bind_device_type.dart b/lib/pages/mh_page/device/mht_bind_device_type.dart index 5dc2f69..d0f9e44 100644 --- a/lib/pages/mh_page/device/mht_bind_device_type.dart +++ b/lib/pages/mh_page/device/mht_bind_device_type.dart @@ -1,5 +1,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; @@ -61,6 +62,11 @@ class _MHTBindDeviceTypePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/device/mht_blueteeth_device_page.dart b/lib/pages/mh_page/device/mht_blueteeth_device_page.dart index a836a08..bc5d265 100644 --- a/lib/pages/mh_page/device/mht_blueteeth_device_page.dart +++ b/lib/pages/mh_page/device/mht_blueteeth_device_page.dart @@ -23,6 +23,7 @@ import 'package:vbvs_app/pages/mh_page/device/component/DeviceComponentWidget.da import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; import 'package:vbvs_app/pages/mh_page/searchWidget.dart'; +import 'package:flutter/services.dart'; class MHTBlueteethDevicePage extends StatefulWidget { var deviceType; @@ -404,6 +405,11 @@ class _MHTBlueteethDevicePageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/device/mht_device_calibration copy.dart b/lib/pages/mh_page/device/mht_device_calibration copy.dart index a9c094d..03b0908 100644 --- a/lib/pages/mh_page/device/mht_device_calibration copy.dart +++ b/lib/pages/mh_page/device/mht_device_calibration copy.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/pages/device_bind/componnet/CalibrationProgressWidget.d import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/component/mht_device_calibration_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; +import 'package:flutter/services.dart'; class MHTCalibrationPageCopy extends StatefulWidget { MHTCalibrationPageCopy({super.key}); @@ -75,6 +76,11 @@ class _MHTCalibrationPageCopyState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/mh_page/device/mht_device_calibration.dart b/lib/pages/mh_page/device/mht_device_calibration.dart index bca23ec..dd2bd04 100644 --- a/lib/pages/mh_page/device/mht_device_calibration.dart +++ b/lib/pages/mh_page/device/mht_device_calibration.dart @@ -18,6 +18,7 @@ import 'package:vbvs_app/pages/mh_page/component/mht_bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/component/mht_device_calibration_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; +import 'package:flutter/services.dart'; class MHTCalibrationPage extends StatefulWidget { BlueToothDataModel deviceInfo; @@ -86,6 +87,11 @@ class _MHTCalibrationPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/mh_page/device/mht_device_calibration_after.dart b/lib/pages/mh_page/device/mht_device_calibration_after.dart index 29a30fe..dd31508 100644 --- a/lib/pages/mh_page/device/mht_device_calibration_after.dart +++ b/lib/pages/mh_page/device/mht_device_calibration_after.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/pages/device_bind/componnet/CalibrationProgressWidget.d import 'package:vbvs_app/pages/mh_page/component/mht_bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/component/mht_device_calibration_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; +import 'package:flutter/services.dart'; class MHTCalibrationAfterPage extends StatefulWidget { var deviceInfo; @@ -90,6 +91,11 @@ class _MHTCalibrationAfterPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/mh_page/device/mht_people_info.dart b/lib/pages/mh_page/device/mht_people_info.dart index ea31734..2ec7a7e 100644 --- a/lib/pages/mh_page/device/mht_people_info.dart +++ b/lib/pages/mh_page/device/mht_people_info.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controlle import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/person/select_city.dart'; import 'package:vbvs_app/pages/person/select_disease.dart'; // 导入疾病选择 +import 'package:flutter/services.dart'; //保存人员信息 class MHTPeopleInfoPage extends StatefulWidget { @@ -299,6 +300,11 @@ class _MHTPeopleInfoPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), elevation: 0, surfaceTintColor: Colors.transparent, backgroundColor: Colors.transparent, diff --git a/lib/pages/mh_page/device/mht_wifi_page.dart b/lib/pages/mh_page/device/mht_wifi_page.dart index 0cdaeb0..f0b60c8 100644 --- a/lib/pages/mh_page/device/mht_wifi_page.dart +++ b/lib/pages/mh_page/device/mht_wifi_page.dart @@ -27,6 +27,7 @@ import 'package:vbvs_app/pages/mh_page/component/mht_bind_dialog.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; class MHTWifiPage extends StatefulWidget { BlueToothDataModel deviceInfo; @@ -152,6 +153,11 @@ class _MHTWifiPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/mh_page/device/mht_wifi_page_after.dart b/lib/pages/mh_page/device/mht_wifi_page_after.dart index cde49ac..cf5fb07 100644 --- a/lib/pages/mh_page/device/mht_wifi_page_after.dart +++ b/lib/pages/mh_page/device/mht_wifi_page_after.dart @@ -24,6 +24,7 @@ import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/pages/device_bind/blueteeth_device_page.dart'; import 'package:vbvs_app/pages/mh_page/component/mht_bind_dialog.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; class MHTWifiAfterPage extends StatefulWidget { var deviceInfo; @@ -133,6 +134,11 @@ class _MHTWifiAfterPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/mh_page/device/upgrade/device_upgrade.dart b/lib/pages/mh_page/device/upgrade/device_upgrade.dart index 8efe7b9..8449ac2 100644 --- a/lib/pages/mh_page/device/upgrade/device_upgrade.dart +++ b/lib/pages/mh_page/device/upgrade/device_upgrade.dart @@ -28,6 +28,7 @@ import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; import 'package:vbvs_app/pages/mh_page/device/upgrade/BatchUpgradeManager.dart'; import 'package:vbvs_app/pages/mh_page/device/upgrade/device_upgrade_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/upgrade/tool/device_upgrade_tool.dart'; +import 'package:flutter/services.dart'; class DeviceUpgrade extends StatefulWidget { DeviceUpgrade({super.key}); @@ -412,6 +413,11 @@ class _DeviceUpgradeState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/device/upgrade/device_upgrade_list.dart b/lib/pages/mh_page/device/upgrade/device_upgrade_list.dart index 6f7969d..02cb6ea 100644 --- a/lib/pages/mh_page/device/upgrade/device_upgrade_list.dart +++ b/lib/pages/mh_page/device/upgrade/device_upgrade_list.dart @@ -23,6 +23,7 @@ import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controlle import 'package:vbvs_app/pages/mh_page/device/mht_blueteeth_device_page.dart'; import 'package:vbvs_app/pages/mh_page/device/model/BlueToothDataModel.dart'; import 'package:vbvs_app/pages/mh_page/device/upgrade/device_upgrade_controller.dart'; +import 'package:flutter/services.dart'; class DeviceUpgradeList extends StatefulWidget { DeviceUpgradeList({super.key}); @@ -407,6 +408,11 @@ class _DeviceUpgradeState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, @@ -447,10 +453,10 @@ class _DeviceUpgradeState extends State { child: Column( children: [ Obx(() { - if (mhtDeviceUpgradeController.model - .upgradingDevices!.isNotEmpty) { - final sortedList = mhtDeviceUpgradeController.model - .upgradingDevices! + if (mhtDeviceUpgradeController + .model.upgradingDevices!.isNotEmpty) { + final sortedList = mhtDeviceUpgradeController + .model.upgradingDevices! .toList() ..sort((a, b) => b.rssi!.compareTo(a.rssi!)); // if (sortedList.length > 0) { diff --git a/lib/pages/mh_page/device_list.dart b/lib/pages/mh_page/device_list.dart index e3fd746..43e4242 100644 --- a/lib/pages/mh_page/device_list.dart +++ b/lib/pages/mh_page/device_list.dart @@ -6,6 +6,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/pages/mh_page/device/device.dart'; import 'package:vbvs_app/pages/mh_page/searchWidget.dart'; +import 'package:flutter/services.dart'; import '../../controller/mh_controller/device_list_controller.dart'; @@ -44,6 +45,11 @@ class _DeviceListPageState extends State { child: Scaffold( resizeToAvoidBottomInset: false, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/device_people_info.dart b/lib/pages/mh_page/device_people_info.dart index d4bdf7d..d69014d 100644 --- a/lib/pages/mh_page/device_people_info.dart +++ b/lib/pages/mh_page/device_people_info.dart @@ -5,6 +5,7 @@ import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/controller/mh_controller/people_info_controller.dart'; +import 'package:flutter/services.dart'; class DevicePeopleInfo extends GetView { Map data; @@ -78,11 +79,21 @@ class DevicePeopleInfo extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), titleSpacing: 0, title: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/device_share_page.dart b/lib/pages/mh_page/device_share_page.dart index 68f4124..751743f 100644 --- a/lib/pages/mh_page/device_share_page.dart +++ b/lib/pages/mh_page/device_share_page.dart @@ -45,6 +45,11 @@ class ShareDeviceWidget extends GetView { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/edit_address_page.dart b/lib/pages/mh_page/edit_address_page.dart index 42a3bd6..c2a2e8d 100644 --- a/lib/pages/mh_page/edit_address_page.dart +++ b/lib/pages/mh_page/edit_address_page.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/controller/mh_controller/address_controller.dart'; import 'package:vbvs_app/controller/mh_controller/address_list_controller.dart'; import 'package:vbvs_app/pages/mh_page/homepage/component/citypicker.dart'; +import 'package:flutter/services.dart'; class EditAddressPage extends GetView implements CityPickerListener { @@ -59,6 +60,11 @@ class EditAddressPage extends GetView // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -942,8 +948,9 @@ class EditAddressPage extends GetView 'Readex Pro', letterSpacing: 0, - color: themeController - .currentColor.sc4, + color: themeController + .currentColor + .sc4, ), enabledBorder: UnderlineInputBorder( diff --git a/lib/pages/mh_page/edit_bed.dart b/lib/pages/mh_page/edit_bed.dart index 16f79f4..cc2c2a9 100644 --- a/lib/pages/mh_page/edit_bed.dart +++ b/lib/pages/mh_page/edit_bed.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart'; import 'package:vbvs_app/pages/mh_page/bluetooth.dart'; import 'package:vbvs_app/pages/mh_page/device/controller/mht_bluetooth_controller.dart'; import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; +import 'package:flutter/services.dart'; class EditBedPage extends StatefulWidget { final Map data; @@ -68,6 +69,11 @@ class _EditBedPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, @@ -225,8 +231,8 @@ class _EditBedPageState extends State { fontFamily: 'Readex Pro', letterSpacing: 0, fontSize: 36.rpx, - color: themeController - .currentColor.sc4, + color: themeController + .currentColor.sc4, ), enabledBorder: UnderlineInputBorder( borderSide: BorderSide.none, diff --git a/lib/pages/mh_page/experience_store_page.dart b/lib/pages/mh_page/experience_store_page.dart index 1b29d78..2cb0927 100644 --- a/lib/pages/mh_page/experience_store_page.dart +++ b/lib/pages/mh_page/experience_store_page.dart @@ -2,19 +2,16 @@ import 'dart:async'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; -import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/experience_store_list_page.dart'; import 'package:vbvs_app/controller/weather/weather_controller.dart'; -import 'package:vbvs_app/pages/mh_page/Empty.dart'; import 'package:vbvs_app/pages/mh_page/experience_store_widget.dart'; import 'package:vbvs_app/pages/mh_page/searchWidget.dart'; @@ -74,6 +71,11 @@ class _ExperienceStorePageState extends State { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -150,11 +152,11 @@ class _ExperienceStorePageState extends State { if (controller.model.experienceStoreModelList.length == 0) { return CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - ); + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ); } else { return Container(); } diff --git a/lib/pages/mh_page/help/article.dart b/lib/pages/mh_page/help/article.dart index b2ef501..2945c99 100644 --- a/lib/pages/mh_page/help/article.dart +++ b/lib/pages/mh_page/help/article.dart @@ -1,10 +1,9 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/controller/user_info_controller.dart'; class HelpArticle extends StatefulWidget { final Map article; @@ -29,6 +28,11 @@ class _HelpArticleState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -100,11 +104,11 @@ class _HelpArticleState extends State { color: const Color(0xFF042C46), alignment: Alignment.center, child: CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - ), + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), ), ], ), diff --git a/lib/pages/mh_page/homepage/mht_sleep_report_page_return.dart b/lib/pages/mh_page/homepage/mht_sleep_report_page_return.dart index f397ebd..fc8097c 100644 --- a/lib/pages/mh_page/homepage/mht_sleep_report_page_return.dart +++ b/lib/pages/mh_page/homepage/mht_sleep_report_page_return.dart @@ -6,6 +6,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart'; import 'package:vbvs_app/pages/sleep_report/new_sleep_report_page.dart'; +import 'package:flutter/services.dart'; class MhtSleepReportReturnPage extends StatefulWidget { final dynamic data; @@ -48,6 +49,11 @@ class _MhtSleepReportReturnPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/mh_page/homepage/new_Home_page.dart b/lib/pages/mh_page/homepage/new_Home_page.dart index e67019d..404954c 100644 --- a/lib/pages/mh_page/homepage/new_Home_page.dart +++ b/lib/pages/mh_page/homepage/new_Home_page.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:easyweb/utils/appmanger.dart'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; @@ -223,6 +224,11 @@ class _NewHomePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), iconTheme: IconThemeData(color: themeController.currentColor.sc3), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/issue_list_page.dart b/lib/pages/mh_page/issue_list_page.dart index ede06dc..7a97dba 100644 --- a/lib/pages/mh_page/issue_list_page.dart +++ b/lib/pages/mh_page/issue_list_page.dart @@ -6,6 +6,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/pages/mh_page/issue_preview_widget.dart'; import '../../controller/mh_controller/issue_controller.dart'; +import 'package:flutter/services.dart'; class IssueListPage extends GetView { final scaffoldKey = GlobalKey(); @@ -33,6 +34,11 @@ class IssueListPage extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -73,12 +79,14 @@ class IssueListPage extends GetView { ), child: Obx(() { if (controller.model.isLoading) { - return Center(child:CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - ),); // ✅ 加载中 + return Center( + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), + ); // ✅ 加载中 } if (controller.model.issueList.isEmpty) { diff --git a/lib/pages/mh_page/message/messageDetail.dart b/lib/pages/mh_page/message/messageDetail.dart index f99479e..7c9fec5 100644 --- a/lib/pages/mh_page/message/messageDetail.dart +++ b/lib/pages/mh_page/message/messageDetail.dart @@ -1,8 +1,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; -import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; @@ -42,6 +41,12 @@ class _MessageDetailPageState extends State { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/mh_page/message_page.dart b/lib/pages/mh_page/message_page.dart index 3412724..f3e1448 100644 --- a/lib/pages/mh_page/message_page.dart +++ b/lib/pages/mh_page/message_page.dart @@ -94,6 +94,11 @@ class _MessagePageState extends State { ), child: Scaffold( appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), @@ -386,7 +391,6 @@ class _MessagePageState extends State { ); } - Widget _buildMessageListView(List dataList, String type) { return NotificationListener( onNotification: (scrollInfo) { diff --git a/lib/pages/mh_page/my_experience_page.dart b/lib/pages/mh_page/my_experience_page.dart index 87240ad..633f85e 100644 --- a/lib/pages/mh_page/my_experience_page.dart +++ b/lib/pages/mh_page/my_experience_page.dart @@ -1,8 +1,6 @@ -import 'dart:async'; - import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; +import 'package:flutter/services.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; @@ -62,6 +60,11 @@ class _MyExperiencePageState extends State { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/new_mine_page.dart b/lib/pages/mh_page/new_mine_page.dart index 6c4610f..9cbbfee 100644 --- a/lib/pages/mh_page/new_mine_page.dart +++ b/lib/pages/mh_page/new_mine_page.dart @@ -52,6 +52,11 @@ class _MinePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), elevation: 0, surfaceTintColor: Colors.transparent, backgroundColor: Colors.transparent, diff --git a/lib/pages/mh_page/new_settingPage.dart b/lib/pages/mh_page/new_settingPage.dart index f25b5f0..3abc823 100644 --- a/lib/pages/mh_page/new_settingPage.dart +++ b/lib/pages/mh_page/new_settingPage.dart @@ -12,6 +12,7 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/mh_language_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; +import 'package:flutter/services.dart'; class SettingPage extends StatefulWidget { @override @@ -42,6 +43,11 @@ class _SettingPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), titleSpacing: 0, @@ -253,7 +259,8 @@ class _SettingPageState extends State { ), ].divide(SizedBox(width: 22.rpx)), ), - Text('${AppConstants.zhmht_app_version}', + Text( + '${AppConstants.zhmht_app_version}', style: TextStyle( color: Colors.white, fontSize: 26.rpx, diff --git a/lib/pages/mh_page/people_info.dart b/lib/pages/mh_page/people_info.dart index d9e635f..eda43a2 100644 --- a/lib/pages/mh_page/people_info.dart +++ b/lib/pages/mh_page/people_info.dart @@ -17,6 +17,7 @@ import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.d import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; import 'package:vbvs_app/pages/person/select_city.dart'; import 'package:vbvs_app/pages/person/select_disease.dart'; +import 'package:flutter/services.dart'; //更新人员信息 class PeopleInfoPage extends GetView { @@ -70,6 +71,11 @@ class PeopleInfoPage extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), elevation: 0, surfaceTintColor: Colors.transparent, backgroundColor: Colors.transparent, diff --git a/lib/pages/mh_page/privacy_policy.dart b/lib/pages/mh_page/privacy_policy.dart index a4f276e..74aa333 100644 --- a/lib/pages/mh_page/privacy_policy.dart +++ b/lib/pages/mh_page/privacy_policy.dart @@ -5,6 +5,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/controller/setting/pdf/PrivacyPdfController.dart'; +import 'package:flutter/services.dart'; class PrivacyPolicyPage extends StatefulWidget { PrivacyPolicyPage({super.key}); @@ -49,6 +50,11 @@ class _PrivacyPolicyPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( @@ -94,12 +100,14 @@ class _PrivacyPolicyPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child:CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - ),); + return Center( + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), + ); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/mh_page/repair_history_page.dart b/lib/pages/mh_page/repair_history_page.dart index 927813c..4a8e416 100644 --- a/lib/pages/mh_page/repair_history_page.dart +++ b/lib/pages/mh_page/repair_history_page.dart @@ -1,13 +1,10 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:timeline_tile/timeline_tile.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; -import 'package:vbvs_app/common/color/appFontsize.dart'; -import 'package:vbvs_app/common/color/repair_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/controller/mh_controller/repair_process.dart'; import 'package:vbvs_app/pages/mh_page/repair_process_widget.dart'; import '../../component/img/img_preview_widget.dart'; @@ -40,6 +37,11 @@ class RepairHistoryListPage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/repair_list.dart b/lib/pages/mh_page/repair_list.dart index 0451d64..05ac0d0 100644 --- a/lib/pages/mh_page/repair_list.dart +++ b/lib/pages/mh_page/repair_list.dart @@ -1,13 +1,12 @@ import 'package:ef/ef.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; -import 'package:vbvs_app/controller/mh_controller/apply_repair_controller.dart'; import 'package:vbvs_app/controller/mh_controller/repair_list_controller.dart'; -import 'package:vbvs_app/pages/mh_page/EmptyMessageWidget.dart'; import 'package:vbvs_app/pages/mh_page/repair_history_widget.dart'; class DeviceRepairPage extends GetView { @@ -54,6 +53,11 @@ class DeviceRepairPage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/room_picker.dart b/lib/pages/mh_page/room_picker.dart index 15279ca..a3fba12 100644 --- a/lib/pages/mh_page/room_picker.dart +++ b/lib/pages/mh_page/room_picker.dart @@ -9,6 +9,8 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart'; import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart'; +import 'package:flutter/services.dart'; + class RoomPickerPage extends StatefulWidget { final Map data; RoomPickerPage({Key? key, required this.data}); @@ -81,6 +83,11 @@ class _RoomPickerPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 深蓝背景 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/score_page.dart b/lib/pages/mh_page/score_page.dart index eb199f4..92b8d81 100644 --- a/lib/pages/mh_page/score_page.dart +++ b/lib/pages/mh_page/score_page.dart @@ -6,6 +6,7 @@ import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/controller/mh_controller/score_controller.dart' as mh; +import 'package:flutter/services.dart'; class ScorePage extends GetView { BoxConstraints? bodysize; @@ -31,6 +32,11 @@ class ScorePage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, @@ -268,7 +274,8 @@ class ScorePage extends GetView { scoreColor = stringToColor("#F8AE00"); } else { - scoreText = '未评分'.tr; // 如果没有评分显示默认文字 + scoreText = + '未评分'.tr; // 如果没有评分显示默认文字 scoreColor = Colors.grey; // 默认颜色 } return Text( @@ -289,7 +296,8 @@ class ScorePage extends GetView { EdgeInsetsDirectional.fromSTEB( 0, 17, 0, 0), child: Text( - '再多的溢美之词，都比不上您真心的评价。我们愿付出200%的努力，只为您100%的满意～感谢您的支持与厚爱！'.tr, + '再多的溢美之词，都比不上您真心的评价。我们愿付出200%的努力，只为您100%的满意～感谢您的支持与厚爱！' + .tr, style: TextStyle( fontFamily: 'Readex Pro', fontSize: 26.rpx, diff --git a/lib/pages/mh_page/sleep_habit.dart b/lib/pages/mh_page/sleep_habit.dart index d7b701e..a157366 100644 --- a/lib/pages/mh_page/sleep_habit.dart +++ b/lib/pages/mh_page/sleep_habit.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:flutter/services.dart'; class SleepHabitPage extends StatefulWidget { @override @@ -28,6 +29,11 @@ class _SleepHabitPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, iconTheme: const IconThemeData(color: Colors.white), automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/smys.dart b/lib/pages/mh_page/smys.dart index 71d8fa6..a8ff5f8 100644 --- a/lib/pages/mh_page/smys.dart +++ b/lib/pages/mh_page/smys.dart @@ -5,6 +5,7 @@ import 'package:flutter_switch/flutter_switch.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/pages/common/selectDialog.dart'; +import 'package:flutter/services.dart'; import '../../controller/mh_controller/sleeping_habit_controller.dart'; @@ -49,6 +50,11 @@ class Smys extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/user/page/bind_tel_page.dart b/lib/pages/mh_page/user/page/bind_tel_page.dart index 9075959..f1d5205 100644 --- a/lib/pages/mh_page/user/page/bind_tel_page.dart +++ b/lib/pages/mh_page/user/page/bind_tel_page.dart @@ -14,6 +14,7 @@ import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/bind_tel_controller.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/mht_login_controller.dart'; +import 'package:flutter/services.dart'; class BindTelWidget extends GetView { BoxConstraints? bodysize; @@ -42,6 +43,11 @@ class BindTelWidget extends GetView { key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/user/page/edit_userinfo_page.dart b/lib/pages/mh_page/user/page/edit_userinfo_page.dart index 9a2fcde..e64373d 100644 --- a/lib/pages/mh_page/user/page/edit_userinfo_page.dart +++ b/lib/pages/mh_page/user/page/edit_userinfo_page.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:EasyDartModule/EasyDartModule.dart' as edm; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; @@ -18,6 +16,7 @@ import 'package:vbvs_app/controller/person/person_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; +import 'package:flutter/services.dart'; class EditUserPage extends StatefulWidget { EditUserPage({super.key}); @@ -60,6 +59,11 @@ class _UpdateUserPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( @@ -442,8 +446,10 @@ class _UpdateUserPageState extends State { userInfoController.model.user!.tmpHead = null; userInfoController.model.user!.tmpNickName = null; await userInfoController.getUserInfo(); - userInfoController.model.user!.tmpNickName = userInfoController.model.user!.nick_name; - userInfoController.model.user!.tmpHead = userInfoController.model.user!.avatar; + userInfoController.model.user!.tmpNickName = + userInfoController.model.user!.nick_name; + userInfoController.model.user!.tmpHead = + userInfoController.model.user!.avatar; userInfoController.updateAll(); Get.back(); } diff --git a/lib/pages/mh_page/user/page/find_password_page.dart b/lib/pages/mh_page/user/page/find_password_page.dart index 097a4ab..4b40473 100644 --- a/lib/pages/mh_page/user/page/find_password_page.dart +++ b/lib/pages/mh_page/user/page/find_password_page.dart @@ -8,6 +8,7 @@ import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/mh_controller/find_password_controller.dart'; import 'package:vbvs_app/controller/time/countdown_controller.dart'; +import 'package:flutter/services.dart'; class FindPasswordPage extends GetView { final scaffoldKey = GlobalKey(); @@ -49,6 +50,11 @@ class FindPasswordPage extends GetView { // key: scaffoldKey, backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/user/page/mht_login_page.dart b/lib/pages/mh_page/user/page/mht_login_page.dart index 66b27ab..057591d 100644 --- a/lib/pages/mh_page/user/page/mht_login_page.dart +++ b/lib/pages/mh_page/user/page/mht_login_page.dart @@ -18,6 +18,7 @@ import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/mht_login_controller.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/mht_register_controller.dart'; +import 'package:flutter/services.dart'; class MHTLoginPage extends GetView { final scaffoldKey = GlobalKey(); @@ -138,6 +139,11 @@ class MHTLoginPage extends GetView { backgroundColor: Colors.transparent, resizeToAvoidBottomInset: false, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), @@ -2150,7 +2156,6 @@ class MHTLoginPage extends GetView { ], ), ), - ), ), Obx(() { diff --git a/lib/pages/mh_page/user/page/register_page.dart b/lib/pages/mh_page/user/page/register_page.dart index 9659731..94baa6d 100644 --- a/lib/pages/mh_page/user/page/register_page.dart +++ b/lib/pages/mh_page/user/page/register_page.dart @@ -1,5 +1,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/CommonVariables.dart'; @@ -8,7 +9,6 @@ import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/time/countdown_controller.dart'; -import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/mh_page/user/controller/mht_register_controller.dart'; class RegisterPage extends GetView { @@ -38,6 +38,11 @@ class RegisterPage extends GetView { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: Colors.white), diff --git a/lib/pages/mh_page/user/page/rxhx_mht.dart b/lib/pages/mh_page/user/page/rxhx_mht.dart index a5754cc..a895490 100644 --- a/lib/pages/mh_page/user/page/rxhx_mht.dart +++ b/lib/pages/mh_page/user/page/rxhx_mht.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:math'; -import 'dart:typed_data'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutter_switch/flutter_switch.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; @@ -192,6 +192,11 @@ class _RxhxMhtState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: const IconThemeData(color: Colors.white), @@ -395,7 +400,9 @@ class _RxhxMhtState extends State { mainAxisSize: MainAxisSize.max, children: [ Text( - controller.model.rxhxIsAnMo ? '开'.tr : '关'.tr, + controller.model.rxhxIsAnMo + ? '开'.tr + : '关'.tr, style: TextStyle( fontFamily: 'Readex Pro', color: Colors.white, diff --git a/lib/pages/mh_page/user/page/update_password_page.dart b/lib/pages/mh_page/user/page/update_password_page.dart index 28f644e..d41490b 100644 --- a/lib/pages/mh_page/user/page/update_password_page.dart +++ b/lib/pages/mh_page/user/page/update_password_page.dart @@ -1,8 +1,8 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:get_storage/get_storage.dart'; -import 'package:vbvs_app/common/color/appColors.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appFontsize.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; @@ -44,6 +44,11 @@ class UpdatePasswordPage extends GetView { child: Scaffold( // key: scaffoldKey, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/mh_page/user_agreement_page.dart b/lib/pages/mh_page/user_agreement_page.dart index eb3058a..6c85a0c 100644 --- a/lib/pages/mh_page/user_agreement_page.dart +++ b/lib/pages/mh_page/user_agreement_page.dart @@ -5,6 +5,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/controller/setting/pdf/UserPdfController.dart'; +import 'package:flutter/services.dart'; class UserAgreementPage extends StatefulWidget { UserAgreementPage({super.key}); @@ -52,6 +53,11 @@ class _UserAgreementPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData( @@ -98,12 +104,14 @@ class _UserAgreementPageState extends State { Expanded( child: Obx(() { if (pdfController.localPdfPath.value == null) { - return Center(child:CircularProgressIndicator( - strokeWidth: 2, - valueColor: AlwaysStoppedAnimation( - themeController.currentColor.sc1, - ), - ),); + return Center( + child: CircularProgressIndicator( + strokeWidth: 2, + valueColor: AlwaysStoppedAnimation( + themeController.currentColor.sc1, + ), + ), + ); } else { return PDFView( filePath: pdfController.localPdfPath.value!, diff --git a/lib/pages/person/person_page.dart b/lib/pages/person/person_page.dart index ce8e951..4708790 100644 --- a/lib/pages/person/person_page.dart +++ b/lib/pages/person/person_page.dart @@ -89,6 +89,11 @@ class _EPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/person/select_time.dart b/lib/pages/person/select_time.dart index 73440d9..1d35abf 100644 --- a/lib/pages/person/select_time.dart +++ b/lib/pages/person/select_time.dart @@ -1138,6 +1138,7 @@ Future showIntervalPickerDialog( context, values, tempIndex, + /// → 替换显示文本（核心） customDisplay: (val) => formatValue(val), ), @@ -1156,7 +1157,6 @@ Future showIntervalPickerDialog( ); } - Future showCountryCodePickerDialog( BuildContext context, { required String initialCode, // 初始区号，如 "+86" @@ -1168,8 +1168,7 @@ Future showCountryCodePickerDialog( final List> list = controller.country_code; - int selectedIndex = - list.indexWhere((e) => e["id"] == initialCode); + int selectedIndex = list.indexWhere((e) => e["id"] == initialCode); if (selectedIndex < 0) selectedIndex = 0; final RxInt tempIndex = RxInt(selectedIndex); @@ -1199,8 +1198,7 @@ Future showCountryCodePickerDialog( children: [ /// 顶部栏 Container( - padding: - EdgeInsets.symmetric(horizontal: 30.rpx), + padding: EdgeInsets.symmetric(horizontal: 30.rpx), color: themeController.currentColor.sc5, height: 80.rpx, child: Row( @@ -1210,15 +1208,14 @@ Future showCountryCodePickerDialog( backgroundColor: Colors.transparent, highlightColor: Colors.transparent, onTap: Get.back, - padding: EdgeInsets.all(0), + padding: EdgeInsets.all(0), child: SizedBox( width: 110.rpx, height: 60.rpx, child: Center( child: Text( "取消".tr, - style: const TextStyle( - color: Colors.white), + style: const TextStyle(color: Colors.white), ), ), ), @@ -1227,18 +1224,16 @@ Future showCountryCodePickerDialog( title.tr, style: TextStyle( fontFamily: 'Readex Pro', - color: - themeController.currentColor.sc3, + color: themeController.currentColor.sc3, fontSize: 30.rpx, ), ), ClickableContainer( - padding: EdgeInsets.all(0), + padding: EdgeInsets.all(0), backgroundColor: Colors.transparent, highlightColor: Colors.transparent, onTap: () { - onConfirm( - list[tempIndex.value]["id"]!); + onConfirm(list[tempIndex.value]["id"]!); Get.back(); }, child: SizedBox( @@ -1248,8 +1243,7 @@ Future showCountryCodePickerDialog( child: Text( "确定".tr, style: TextStyle( - color: themeController - .currentColor.sc2, + color: themeController.currentColor.sc2, ), ), ), @@ -1269,14 +1263,11 @@ Future showCountryCodePickerDialog( child: Center( child: Container( height: 90.rpx, - margin: EdgeInsets.symmetric( - horizontal: 95.rpx), + margin: + EdgeInsets.symmetric(horizontal: 95.rpx), decoration: BoxDecoration( - color: themeController - .currentColor.sc2, - borderRadius: - BorderRadius.circular( - 16.rpx), + color: themeController.currentColor.sc2, + borderRadius: BorderRadius.circular(16.rpx), ), ), ), @@ -1287,8 +1278,8 @@ Future showCountryCodePickerDialog( child: getOnePickers( context, list - .map((e) => - "${e['name']}".tr+"(${e['id']})") + .map( + (e) => "${e['name']}".tr + "(${e['id']})") .toList(), tempIndex, ), @@ -1307,7 +1298,6 @@ Future showCountryCodePickerDialog( ); } - Future showTimeZonePickerDialog( BuildContext context, { required String initialTimeZone, // 初始时区字符串，如 "UTC+8" @@ -1317,7 +1307,7 @@ Future showTimeZonePickerDialog( // 使用 AppConstants.integerTimeZones 作为数据源 List timeZones = AppConstants.integerTimeZones; int selectedIndex = timeZones.indexOf(initialTimeZone); - + // 如果没有找到，使用默认的UTC+8（北京时间） if (selectedIndex == -1) { selectedIndex = timeZones.indexOf("UTC+8"); @@ -1325,10 +1315,10 @@ Future showTimeZonePickerDialog( selectedIndex = 0; // 如果连UTC+8都没有，使用第一个 } } - + final RxInt tempIndex = RxInt(selectedIndex); ThemeController themeController = Get.find(); - + await showDialog( context: context, barrierDismissible: true, @@ -1452,4 +1442,3 @@ Future showTimeZonePickerDialog( }, ); } - diff --git a/lib/pages/person/update_person_page.dart b/lib/pages/person/update_person_page.dart index 045164b..4e57578 100644 --- a/lib/pages/person/update_person_page.dart +++ b/lib/pages/person/update_person_page.dart @@ -77,6 +77,11 @@ class _UpdatePageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/policy/privacy_policy.dart b/lib/pages/policy/privacy_policy.dart index 543b41e..8998bc6 100644 --- a/lib/pages/policy/privacy_policy.dart +++ b/lib/pages/policy/privacy_policy.dart @@ -12,6 +12,7 @@ import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/enum/APPPackageType.dart'; +import 'package:flutter/services.dart'; class PrivacyPolicyNewPage extends StatefulWidget { var sleepUri; @@ -94,6 +95,12 @@ class _PrivacyPolicyNewPageState extends State { appBar: (widget.showAppbar != null && widget.showAppbar == false) ? null : AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: diff --git a/lib/pages/policy/user_policy.dart b/lib/pages/policy/user_policy.dart index d89ae79..e91f5cc 100644 --- a/lib/pages/policy/user_policy.dart +++ b/lib/pages/policy/user_policy.dart @@ -8,6 +8,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class UserPrivacyNewPage extends StatefulWidget { var sleepUri; @@ -54,6 +55,11 @@ class _UserPrivacyNewPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 背景透明 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/repair/apply_repair_page.dart b/lib/pages/repair/apply_repair_page.dart index 7445769..44c0b3c 100644 --- a/lib/pages/repair/apply_repair_page.dart +++ b/lib/pages/repair/apply_repair_page.dart @@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/repair/repair_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/repair/component/RepairModelWidget.dart'; +import 'package:flutter/services.dart'; class ApplyRepairPage extends StatefulWidget { const ApplyRepairPage({super.key}); @@ -103,6 +104,11 @@ class _ApplyRepairPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/repair/apply_repair_success.dart b/lib/pages/repair/apply_repair_success.dart index ed2501b..91f4338 100644 --- a/lib/pages/repair/apply_repair_success.dart +++ b/lib/pages/repair/apply_repair_success.dart @@ -10,6 +10,7 @@ import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class ApplyRepairSuccess extends StatefulWidget { const ApplyRepairSuccess({super.key}); @@ -44,6 +45,11 @@ class _ApplyRepairSuccessState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/repair/repair_detail_page.dart b/lib/pages/repair/repair_detail_page.dart index da6797e..80464ff 100644 --- a/lib/pages/repair/repair_detail_page.dart +++ b/lib/pages/repair/repair_detail_page.dart @@ -10,6 +10,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/repair/repair_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/pages/repair/component/RepairModelReadOnlyWidget.dart'; +import 'package:flutter/services.dart'; class RepairDetailPage extends StatefulWidget { final dynamic data; @@ -76,6 +77,11 @@ class _RepairDetailPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/repair/repair_list_page.dart b/lib/pages/repair/repair_list_page.dart index 91f997e..8cbabb3 100644 --- a/lib/pages/repair/repair_list_page.dart +++ b/lib/pages/repair/repair_list_page.dart @@ -10,6 +10,7 @@ import 'package:vbvs_app/component/NullDataComponentWidget.dart'; import 'package:vbvs_app/controller/repair/repair_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/repair/component/RepairHistoryInfoWidget.dart'; +import 'package:flutter/services.dart'; class RepairListPage extends StatefulWidget { const RepairListPage({super.key}); @@ -47,6 +48,11 @@ class _RepairListPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/setting/Theme_setting.dart b/lib/pages/setting/Theme_setting.dart index ba155be..6d0ac03 100644 --- a/lib/pages/setting/Theme_setting.dart +++ b/lib/pages/setting/Theme_setting.dart @@ -8,6 +8,7 @@ import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/model/CustomThemeColor.dart'; import 'package:vbvs_app/pages/device_bind/componnet/FancyCircleCheckbox.dart'; +import 'package:flutter/services.dart'; class ThemeSetting extends StatefulWidget { const ThemeSetting({super.key}); @@ -45,6 +46,11 @@ class _ThemeSettingState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/setting/common_mesaage_setting.dart b/lib/pages/setting/common_mesaage_setting.dart index 18347a2..59e9393 100644 --- a/lib/pages/setting/common_mesaage_setting.dart +++ b/lib/pages/setting/common_mesaage_setting.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/component/tool/NewTopSlideNotification.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/controller/message/common_message_setting_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; +import 'package:flutter/services.dart'; class CommonMessageSettingPage extends StatefulWidget { CommonMessageSettingPage({super.key}); @@ -128,6 +129,11 @@ class _CommonMessageSettingPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/setting/language_setting.dart b/lib/pages/setting/language_setting.dart index 3a616c3..9552a8a 100644 --- a/lib/pages/setting/language_setting.dart +++ b/lib/pages/setting/language_setting.dart @@ -13,6 +13,7 @@ import 'package:vbvs_app/controller/setting/language/language_controller.dart'; import 'package:vbvs_app/controller/weather/weather_controller.dart'; import 'package:vbvs_app/language/AppLanguage.dart'; import 'package:vbvs_app/pages/device_bind/componnet/FancyCircleCheckbox.dart'; +import 'package:flutter/services.dart'; class LanguageSetting extends StatefulWidget { const LanguageSetting({super.key}); @@ -44,6 +45,11 @@ class _LanguageSettingState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index a6cd7f6..ad3c5d7 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -25,6 +25,7 @@ import 'package:vbvs_app/pages/sleep_report/component/DailyDataWidget.dart'; import 'package:vbvs_app/pages/sleep_report/component/MonthDataWidget.dart'; import 'package:vbvs_app/pages/sleep_report/component/WeekDataWidget.dart'; +import 'package:flutter/services.dart'; class NewSleepReportPage extends StatefulWidget { var data; @@ -160,6 +161,12 @@ class _NewSleepReportPageState extends State { widget.data['arrow'] == false) ? null : AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: widget.data['backgroundColor'] != null ? widget.data['backgroundColor'].withOpacity(0.8) : themeController.currentColor.sc5, diff --git a/lib/pages/sleep_report/quick_health_report_page.dart b/lib/pages/sleep_report/quick_health_report_page.dart index 87a3497..ad40e41 100644 --- a/lib/pages/sleep_report/quick_health_report_page.dart +++ b/lib/pages/sleep_report/quick_health_report_page.dart @@ -11,6 +11,7 @@ import 'package:vbvs_app/controller/sleep/sleep_report_controller.dart'; import 'package:vbvs_app/pages/sleep_report/QcReportWidget.dart'; import 'package:vbvs_app/pages/sleep_report/chart/StatusBarWithIndicator.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; class QuickHealthReportPage extends StatefulWidget { var data; @@ -101,55 +102,61 @@ class _QuickHealthReportPageState extends State { ), child: Scaffold( backgroundColor: Colors.transparent, // 背景透明 - appBar: - (deviceTypeController.currentCq.value['arrow'] != null && - deviceTypeController.currentCq.value['arrow'] == - false) - ? null - : AppBar( - backgroundColor: deviceTypeController - .currentCq.value['backgroundColor'] != - null - ? deviceTypeController - .currentCq.value['backgroundColor'] - .withOpacity(0.8) - : themeController.currentColor.sc5, - automaticallyImplyLeading: false, - iconTheme: IconThemeData( - color: themeController.currentColor.sc3), - titleSpacing: 0, - title: Container( - width: double.infinity, - height: 180.rpx, - child: Stack( - alignment: Alignment.center, - children: [ - /// 居中标题 - Text( - '快检报告'.tr, - style: TextStyle( - fontFamily: 'Readex Pro', - color: themeController.currentColor.sc3, - letterSpacing: 0, - fontSize: 30.rpx, - ), - ), - - /// 左边返回按钮 - if (deviceTypeController - .currentCq.value['arrow'] == - null || - deviceTypeController - .currentCq.value['arrow'] == - true) - Positioned( - left: 0, - child: returnIconButtomNew(), - ), - ], + appBar: (deviceTypeController.currentCq.value['arrow'] != + null && + deviceTypeController.currentCq.value['arrow'] == + false) + ? null + : AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), + backgroundColor: deviceTypeController + .currentCq.value['backgroundColor'] != + null + ? deviceTypeController + .currentCq.value['backgroundColor'] + .withOpacity(0.8) + : themeController.currentColor.sc5, + automaticallyImplyLeading: false, + iconTheme: IconThemeData( + color: themeController.currentColor.sc3), + titleSpacing: 0, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + /// 居中标题 + Text( + '快检报告'.tr, + style: TextStyle( + fontFamily: 'Readex Pro', + color: themeController.currentColor.sc3, + letterSpacing: 0, + fontSize: 30.rpx, + ), ), - ), + + /// 左边返回按钮 + if (deviceTypeController + .currentCq.value['arrow'] == + null || + deviceTypeController + .currentCq.value['arrow'] == + true) + Positioned( + left: 0, + child: returnIconButtomNew(), + ), + ], ), + ), + ), body: SafeArea( top: true, child: Center( @@ -188,55 +195,61 @@ class _QuickHealthReportPageState extends State { ), child: Scaffold( backgroundColor: Colors.transparent, // 背景透明 - appBar: - (deviceTypeController.currentCq.value['arrow'] != null && - deviceTypeController.currentCq.value['arrow'] == - false) - ? null - : AppBar( - backgroundColor: deviceTypeController - .currentCq.value['backgroundColor'] != - null - ? deviceTypeController - .currentCq.value['backgroundColor'] - .withOpacity(0.8) - : themeController.currentColor.sc5, - automaticallyImplyLeading: false, - iconTheme: IconThemeData( - color: themeController.currentColor.sc3), - titleSpacing: 0, - title: Container( - width: double.infinity, - height: 180.rpx, - child: Stack( - alignment: Alignment.center, - children: [ - /// 居中标题 - Text( - '快检报告'.tr, - style: TextStyle( - fontFamily: 'Readex Pro', - color: themeController.currentColor.sc3, - letterSpacing: 0, - fontSize: 30.rpx, - ), - ), - - /// 左边返回按钮 - if (deviceTypeController - .currentCq.value['arrow'] == - null || - deviceTypeController - .currentCq.value['arrow'] == - true) - Positioned( - left: 0, - child: returnIconButtomNew(), - ), - ], + appBar: (deviceTypeController.currentCq.value['arrow'] != + null && + deviceTypeController.currentCq.value['arrow'] == + false) + ? null + : AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), + backgroundColor: deviceTypeController + .currentCq.value['backgroundColor'] != + null + ? deviceTypeController + .currentCq.value['backgroundColor'] + .withOpacity(0.8) + : themeController.currentColor.sc5, + automaticallyImplyLeading: false, + iconTheme: IconThemeData( + color: themeController.currentColor.sc3), + titleSpacing: 0, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + /// 居中标题 + Text( + '快检报告'.tr, + style: TextStyle( + fontFamily: 'Readex Pro', + color: themeController.currentColor.sc3, + letterSpacing: 0, + fontSize: 30.rpx, + ), ), - ), + + /// 左边返回按钮 + if (deviceTypeController + .currentCq.value['arrow'] == + null || + deviceTypeController + .currentCq.value['arrow'] == + true) + Positioned( + left: 0, + child: returnIconButtomNew(), + ), + ], ), + ), + ), body: SafeArea( top: true, child: SingleChildScrollView( @@ -548,6 +561,12 @@ class _QuickHealthReportPageState extends State { deviceTypeController.currentCq.value['arrow'] == false) ? null : AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: + Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: deviceTypeController .currentCq.value['backgroundColor'] != null diff --git a/lib/pages/sleep_report/sleep_report_page.dart b/lib/pages/sleep_report/sleep_report_page.dart index 1fb68c1..1ca121a 100644 --- a/lib/pages/sleep_report/sleep_report_page.dart +++ b/lib/pages/sleep_report/sleep_report_page.dart @@ -9,6 +9,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:flutter/services.dart'; class SleepReportPage extends StatefulWidget { var sleepUri; @@ -54,6 +55,11 @@ class _SleepReportPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 背景透明 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3), diff --git a/lib/pages/user/about_us_page.dart b/lib/pages/user/about_us_page.dart index 377c764..92d5e79 100644 --- a/lib/pages/user/about_us_page.dart +++ b/lib/pages/user/about_us_page.dart @@ -4,6 +4,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/WebViewWidget.dart'; +import 'package:flutter/services.dart'; class AboutUsPage extends StatefulWidget { String url; @@ -46,6 +47,11 @@ class _AboutUsPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, // backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/user/privacy_scheme_page.dart b/lib/pages/user/privacy_scheme_page.dart index 9657510..bfefa4b 100644 --- a/lib/pages/user/privacy_scheme_page.dart +++ b/lib/pages/user/privacy_scheme_page.dart @@ -5,6 +5,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/controller/setting/pdf/PrivacyPdfController.dart'; +import 'package:flutter/services.dart'; class PrivacySchemePage extends StatefulWidget { PrivacySchemePage({super.key}); @@ -48,6 +49,11 @@ class _PrivacySchemePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/user/setting_page.dart b/lib/pages/user/setting_page.dart index 298db3e..638ac1b 100644 --- a/lib/pages/user/setting_page.dart +++ b/lib/pages/user/setting_page.dart @@ -18,6 +18,7 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:vbvs_app/model/api_response.dart'; +import 'package:flutter/services.dart'; class SettingPage extends StatefulWidget { const SettingPage({super.key}); @@ -54,6 +55,11 @@ class _SettingPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), // backgroundColor: themeController.currentColor.sc17, backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, @@ -613,7 +619,6 @@ class _SettingPageState extends State { ), ), ), - ), Padding( padding: EdgeInsetsDirectional.fromSTEB( diff --git a/lib/pages/user/update_user_email.dart b/lib/pages/user/update_user_email.dart index 68fe374..54309bf 100644 --- a/lib/pages/user/update_user_email.dart +++ b/lib/pages/user/update_user_email.dart @@ -19,6 +19,7 @@ import 'package:vbvs_app/controller/time/countdown_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/model/user_data.dart'; +import 'package:flutter/services.dart'; class UpdateUserEmailPage extends StatefulWidget { const UpdateUserEmailPage({super.key}); @@ -63,6 +64,11 @@ class _UpdateUserEmailPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/user/update_user_page.dart b/lib/pages/user/update_user_page.dart index 6495e5b..91b34c2 100644 --- a/lib/pages/user/update_user_page.dart +++ b/lib/pages/user/update_user_page.dart @@ -1,8 +1,7 @@ -import 'dart:io'; - import 'package:EasyDartModule/EasyDartModule.dart' as edm; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/svg.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:fluwx/fluwx.dart'; @@ -113,6 +112,11 @@ class _UpdateUserPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/user/update_user_tel.dart b/lib/pages/user/update_user_tel.dart index dd96470..37a00d1 100644 --- a/lib/pages/user/update_user_tel.dart +++ b/lib/pages/user/update_user_tel.dart @@ -1,16 +1,13 @@ -import 'dart:io'; - import 'package:EasyDartModule/EasyDartModule.dart' as edm; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; +import 'package:flutter/services.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/DailyLogUtils.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; -import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/NewTopSlideNotification.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; @@ -68,6 +65,11 @@ class _UpdateUserTelPageState extends State { child: Scaffold( backgroundColor: Colors.transparent, appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc5, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/user/user_scheme_page.dart b/lib/pages/user/user_scheme_page.dart index 802e64c..6ed4fee 100644 --- a/lib/pages/user/user_scheme_page.dart +++ b/lib/pages/user/user_scheme_page.dart @@ -5,6 +5,7 @@ import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/controller/setting/pdf/UserPdfController.dart'; +import 'package:flutter/services.dart'; class UserSchemePage extends StatefulWidget { UserSchemePage({super.key}); @@ -52,6 +53,11 @@ class _UserSchemePageState extends State { child: Scaffold( backgroundColor: Colors.transparent, // 加上这一行 appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: themeController.currentColor.sc17, automaticallyImplyLeading: false, iconTheme: IconThemeData( diff --git a/lib/pages/xiaoe/xiaoe_page.dart b/lib/pages/xiaoe/xiaoe_page.dart index 56eb702..52ffe71 100644 --- a/lib/pages/xiaoe/xiaoe_page.dart +++ b/lib/pages/xiaoe/xiaoe_page.dart @@ -15,6 +15,7 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/enum/APPPackageType.dart'; import 'package:EasyDartModule/EasyDartModule.dart' as edm; +import 'package:flutter/services.dart'; // class XiaoEPage extends StatefulWidget { // var sleepUri; @@ -63,7 +64,12 @@ import 'package:EasyDartModule/EasyDartModule.dart' as edm; // ), // child: Scaffold( // backgroundColor: Colors.transparent, // 背景透明 -// appBar: AppBar( +// appBar: AppBar( + // systemOverlayStyle: SystemUiOverlayStyle( + // statusBarColor: Colors.transparent, // 状态栏背景色 + // statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + // statusBarBrightness: Brightness.light, // 图标颜色（iOS） + // ), // // backgroundColor: themeController.currentColor.sc17, // backgroundColor: Colors.transparent, // automaticallyImplyLeading: false, @@ -262,7 +268,12 @@ class _XiaoEPageState extends State ), child: Scaffold( backgroundColor: Colors.transparent, - appBar: AppBar( + appBar: AppBar( + systemOverlayStyle: SystemUiOverlayStyle( + statusBarColor: Colors.transparent, // 状态栏背景色 + statusBarIconBrightness: Brightness.light, // 图标颜色（Android） + statusBarBrightness: Brightness.light, // 图标颜色（iOS） + ), backgroundColor: Colors.transparent, automaticallyImplyLeading: false, iconTheme: IconThemeData(color: themeController.currentColor.sc3),