enchantedwyf/tuiche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新样式

Browse Source
This commit is contained in:
wyf
2025-11-18 10:21:33 +08:00
parent a0172b394b
commit 0ebe7116f6
37 changed files with 325 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/pages/device/component/DeviceDataComponentWidget.dart
View File

@@ -12,6 +12,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/component/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/NewTopSlideNotification.dart';
import 'package:vbvs_app/component/tool/ToggleColorContainer.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
@@ -468,6 +469,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
widget.device['_id'],
);
if (response.code == HttpStatusCodes.ok) {
NewTopSlideNotification.show(
text: response.msg!,
);
await bodyDeviceController.getDeviceList();
bodyDeviceController.updateAll();
} else {
@@ -569,9 +573,13 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
ToggleColorContainer(
key: _arrowKey,
padding: EdgeInsetsDirectional.fromSTEB(
// 16.rpx,
// 16.rpx,
// 14.rpx,
// 16.rpx,
25.rpx,
16.rpx,
16.rpx,
14.rpx,
25.rpx,
16.rpx,
),
initialColor: Colors.transparent,
@@ -1007,8 +1015,12 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
? "在线".tr
: "离线".tr, // 状态部分
style: TextStyle(
color: themeController.currentColor
.sc2, // 同样颜色，也可改成其他颜色
color: widget.device['status']
['status'] ==
1
? themeController.currentColor.sc2
: themeController.currentColor
.sc9, // 同样颜色，也可改成其他颜色
fontSize: AppConstants()
.title_text_fontSize,
),

6
lib/pages/device_bind/after/after_wifi_page_person.dart
View File

@@ -571,7 +571,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
TopSlideNotification
.show(
context,
text: "wifi页.配网成功".tr,
text: "配网成功".tr,
textColor:
themeController
.currentColor
@@ -587,7 +587,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
TopSlideNotification
.show(
context,
text: "wifi页.配网失败".tr,
text: "配网失败".tr,
textColor:
themeController
.currentColor
@@ -603,7 +603,7 @@ class _AfterWifiPagePersonState extends State<AfterWifiPagePerson> {
// Navigator.pop(context);
TopSlideNotification.show(
context,
text: "wifi页.配网失败".tr,
text: "配网失败".tr,
textColor:
themeController
.currentColor

1
lib/pages/device_bind/blueteeth_device_page.dart
View File

@@ -544,6 +544,7 @@ class _BlueteethDevicePageState extends State<BlueteethDevicePage> {
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc4,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(

28
lib/pages/device_bind/device_calibration_person.dart
View File

@@ -853,19 +853,23 @@ class _CalibrationPersonPageState extends State<CalibrationPersonPage> {
),
onWillPop: () async {
bool exit = false;
if (deviceCalibrationController.flag.value != 2) {
showConfirmDialog(context, Container(), "校准未完成提示".tr,
onConfirm: () async {
if (start) {
if (deviceCalibrationController.flag.value != 2) {
showConfirmDialog(context, Container(), "校准未完成提示".tr,
onConfirm: () async {
exit = true;
// await Get.toNamed("/personPage");
// print("object");
deviceCalibrationController.process.value = 0;
deviceCalibrationController.bed_calibration.value = 0;
deviceCalibrationController.position_calibration.value = 0;
blueteethBindController.cid!.value = "";
}, onCancel: () {
exit = false;
});
} else {
exit = true;
// await Get.toNamed("/personPage");
// print("object");
deviceCalibrationController.process.value = 0;
deviceCalibrationController.bed_calibration.value = 0;
deviceCalibrationController.position_calibration.value = 0;
blueteethBindController.cid!.value = "";
}, onCancel: () {
exit = false;
});
}
} else {
exit = true;
}

4
lib/pages/device_bind/device_share_list_page.dart
View File

@@ -156,6 +156,8 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
@@ -444,7 +446,7 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
"删除".tr,
style: TextStyle(
fontSize: AppConstants().normal_text_fontSize,
color: themeController.currentColor.sc3,
color: themeController.currentColor.sc9,
),
),
),

1
lib/pages/device_bind/device_share_page.dart
View File

@@ -207,6 +207,7 @@ class _DeviceSharePageState extends State<DeviceSharePage> {
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc4,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(

2
lib/pages/main_bottom/message_page.dart
View File

@@ -37,7 +37,7 @@ class _MessagePageState extends State<MessagePage> {
// 监听切换语言
subscription = EventBus().on<SwitchLanguageEvent>().listen((event) {
ef.log("切换语言事件通知");
ef.log("切换语言事件通知:${event.language}");
_fetchMessageData();
});
_fetchMessageData();

26
lib/pages/main_bottom/mine_page.dart
View File

@@ -143,7 +143,7 @@ class _MinePageState extends State<MinePage> {
decoration: BoxDecoration(
shape: BoxShape.circle,
),
child: login == 1
/* child: login == 1
? (userInfoController.model.user!
.avatar ==
null ||
@@ -158,6 +158,24 @@ class _MinePageState extends State<MinePage> {
.model.user!.avatar!,
fit: BoxFit.cover,
))
: Image.asset(
"assets/img/avatar.png",
fit: BoxFit.cover,
), */
child: login == 1
? (userInfoController.model.user!
.avatar ==
null ||
userInfoController.model
.user!.avatar!.isEmpty
? Image.asset(
"assets/img/avatar.png",
fit: BoxFit.cover,
)
: Image.asset(
"assets/img/avatar.png",
fit: BoxFit.cover,
))
: Image.asset(
"assets/img/avatar.png",
fit: BoxFit.cover,
@@ -674,10 +692,12 @@ class _MinePageState extends State<MinePage> {
mainAxisSize: MainAxisSize.max,
children: [
Text(
'V1.0.2511.17',
'V1.0.2511.18',
style: TextStyle(
fontFamily: 'Inter',
color: Color(0xFFD9E3EB),
// color: Color(0xFFD9E3EB),
color: themeController
.currentColor.sc4,
fontSize: 26.rpx,
letterSpacing: 0.0,
),

5
lib/pages/mh_page/apply_repair_page.dart
View File

@@ -1319,8 +1319,7 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
fontSize: AppFontsize
.normal_text_size,
letterSpacing: 0,
color: const Color(
0XFF929699)),
color: themeController.currentColor.sc4),
enabledBorder:
UnderlineInputBorder(
borderSide: const BorderSide(
@@ -1526,6 +1525,7 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
'Readex Pro',
letterSpacing:
0,
color: themeController.currentColor.sc4,
),
enabledBorder:
UnderlineInputBorder(
@@ -1688,6 +1688,7 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
'Readex Pro',
letterSpacing:
0,
color: themeController.currentColor.sc4,
),
enabledBorder:
UnderlineInputBorder(

24
lib/pages/mh_page/book_info_page.dart
View File

@@ -329,11 +329,13 @@ class BookInfoPage extends GetView<BookInfoController> {
),
hintText: '输入姓名'.tr,
hintStyle: TextStyle(
fontFamily: 'Readex Pro',
fontSize: AppFontsize
.normal_text_size,
letterSpacing: 0,
color: Color(0xFF929699)),
fontFamily: 'Readex Pro',
fontSize: AppFontsize
.normal_text_size,
letterSpacing: 0,
color: themeController
.currentColor.sc4,
),
enabledBorder:
UnderlineInputBorder(
borderSide:
@@ -464,11 +466,13 @@ class BookInfoPage extends GetView<BookInfoController> {
),
hintText: '输入手机号'.tr,
hintStyle: TextStyle(
fontFamily: 'Readex Pro',
fontSize: AppFontsize
.normal_text_size,
letterSpacing: 0,
color: Color(0xFF929699)),
fontFamily: 'Readex Pro',
fontSize: AppFontsize
.normal_text_size,
letterSpacing: 0,
color: themeController
.currentColor.sc4,
),
enabledBorder:
UnderlineInputBorder(
borderSide:

56
lib/pages/mh_page/device/component/UpgradeDevice.dart
View File

@@ -22,8 +22,6 @@ import 'package:vbvs_app/model/BleDeviceData.dart';
import 'package:vbvs_app/pages/mh_page/device/component/tool/BedControlService.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/device/upgrade/device_upgrade.dart';
import 'package:vbvs_app/pages/mh_page/device/upgrade/tool/device_upgrade_tool.dart';
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
class UpgradeDevice extends StatefulWidget {
@@ -95,8 +93,9 @@ class _UpgradeDeviceState extends State<UpgradeDevice> {
highlightColor: Colors.transparent,
padding: EdgeInsets.all(0),
onTap: () {
//取消升级
MultiDeviceFirmwareUpdater().cancelUpgrade(widget.bleDevice.mac);
//取消升级
MultiDeviceFirmwareUpdater()
.cancelUpgrade(widget.bleDevice.mac);
},
child: Row(
children: [
@@ -162,28 +161,43 @@ class _UpgradeDeviceState extends State<UpgradeDevice> {
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
width: MediaQuery.sizeOf(context).width * 0.14,
constraints: BoxConstraints(minWidth: 106.rpx),
child: Text(
"MAC".tr,
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: MediaQuery.sizeOf(context).width * 0.14,
constraints: BoxConstraints(minWidth: 106.rpx),
child: Text(
"MAC".tr,
style: TextStyle(
color: stringToColor("#929699"),
fontSize: 26.rpx,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
Text(
"${device['mac']}",
style: TextStyle(
fontSize: 26.rpx,
color: stringToColor("#333333")),
),
].divide(SizedBox(width: 33.rpx)),
),
Obx(() {
var aa = mhtBlueToothController.allSelect.value;
return Text(
"${APPDeviceUpgradeExtension.nameFromInt(widget.bleDevice.upgradeStatus)}",
style: TextStyle(
color: stringToColor("#929699"),
fontSize: 26.rpx,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
Text(
"${device['mac']}",
style: TextStyle(
fontSize: 26.rpx,
color: stringToColor("#333333")),
),
].divide(SizedBox(width: 33.rpx)),
);
}),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.start,

3
lib/pages/mh_page/device_share_page.dart
View File

@@ -161,7 +161,8 @@ class ShareDeviceWidget extends GetView<MHDeviceShareController> {
hintText: '请输入对方手机号/邮箱号'.tr,
hintStyle: TextStyle(
fontFamily: 'Readex Pro',
color: const Color(0xFF929699),
color: themeController
.currentColor.sc4,
fontSize: 36.rpx,
),
enabledBorder:

2
lib/pages/mh_page/edit_address_page.dart
View File

@@ -942,6 +942,8 @@ class EditAddressPage extends GetView<AddressController>
'Readex Pro',
letterSpacing:
0,
color: themeController
.currentColor.sc4,
),
enabledBorder:
UnderlineInputBorder(

3
lib/pages/mh_page/edit_bed.dart
View File

@@ -225,7 +225,8 @@ class _EditBedPageState extends State<EditBedPage> {
fontFamily: 'Readex Pro',
letterSpacing: 0,
fontSize: 36.rpx,
color: const Color(0xFF929699),
color: themeController
.currentColor.sc4,
),
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide.none,

3
lib/pages/mh_page/searchWidget.dart
View File

@@ -76,7 +76,8 @@ class SearchWidget extends GetView {
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: Color(0XFFC8CBD2)),
color: themeController
.currentColor.sc4,),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0x00000000),

4
lib/pages/mh_page/user/page/update_password_page.dart
View File

@@ -184,6 +184,10 @@ class UpdatePasswordPage extends GetView<UpdatePasswordController> {
fontFamily:
'Readex Pro',
letterSpacing: 0,
color:
themeController
.currentColor
.sc4,
),
enabledBorder:
UnderlineInputBorder(

132
lib/pages/setting/language_setting.dart
View File

@@ -118,24 +118,49 @@ class _LanguageSettingState extends State<LanguageSetting> {
horizontal: 16.rpx),
onTap: () async {
// 点击事件逻辑
for (var lang
in languageController
.languageList) {
lang.selected = (lang ==
language); // 根据选择更新状态
}
languageController
.selectLanguage
.value = language;
EventBus().emit(
SwitchLanguageEvent(
language.language_code));
await AppLanguage()
.loadLanguage(language
.language_code); // 加载语言
languageController
.updateAll(); // 更新操作
// 更新操作
ef.log("切换语言事件通知");
try {
for (var lang
in languageController
.languageList) {
lang.selected = (lang ==
language); // 根据选择更新状态
}
languageController
.selectLanguage
.value = language;
if (language.language_code ==
"zh_CN") {
languageController
.appLocale.value =
const Locale(
'zh', 'CN');
Get.updateLocale(
const Locale(
'zh', 'CN'));
languageController
.updateAll();
} else {
languageController
.appLocale.value =
const Locale(
'en', 'US');
Get.updateLocale(
const Locale(
'en', 'US'));
languageController
.updateAll();
}
EventBus().emit(
SwitchLanguageEvent(
language
.language_code));
await AppLanguage()
.loadLanguage(language
.language_code); // 加载语言
languageController
.updateAll();
await ef.kvdb.write(
"th/language",
language.language_code);
@@ -150,7 +175,7 @@ class _LanguageSettingState extends State<LanguageSetting> {
await bodyDeviceController
.getSleepReport();
} catch (e) {
print(e);
ef.log("切换语言异常: $e");
}
},
child: Row(
@@ -184,6 +209,7 @@ class _LanguageSettingState extends State<LanguageSetting> {
value: language.selected ??
false, // 根据 selected 状态显示选中或未选中
onChanged: (value) async {
ef.log("切换语言事件通知1");
// 保持原有的状态更改逻辑
for (var lang
in languageController
@@ -199,6 +225,67 @@ class _LanguageSettingState extends State<LanguageSetting> {
.language_code); // 加载语言
languageController
.updateAll(); // 更新操作
try {
for (var lang
in languageController
.languageList) {
lang.selected = (lang ==
language); // 根据选择更新状态
}
languageController
.selectLanguage
.value = language;
if (language
.language_code ==
"zh_CN") {
languageController
.appLocale
.value =
const Locale(
'zh', 'CN');
Get.updateLocale(
const Locale(
'zh', 'CN'));
languageController
.updateAll();
} else {
languageController
.appLocale
.value =
const Locale(
'en', 'US');
Get.updateLocale(
const Locale(
'en', 'US'));
languageController
.updateAll();
}
EventBus().emit(
SwitchLanguageEvent(
language
.language_code));
await AppLanguage()
.loadLanguage(language
.language_code); // 加载语言
languageController
.updateAll();
await ef.kvdb.write(
"th/language",
language
.language_code);
WeatherModelController
weatherModelController =
Get.find();
weatherModelController
.getCurrentWeather();
BodyDeviceController
bodyDeviceController =
Get.find();
await bodyDeviceController
.getSleepReport();
} catch (e) {
ef.log("切换语言异常: $e");
}
},
),
].divide(SizedBox(
@@ -213,15 +300,6 @@ class _LanguageSettingState extends State<LanguageSetting> {
);
}),
),
// ClickableContainer(
// backgroundColor: Colors.transparent, // 容器背景色
// highlightColor: themeController
// .currentColor.sc21, // 点击时的背景色
// padding: EdgeInsetsDirectional.fromSTEB(
// 40.rpx, 0.rpx, 40.rpx, 0.rpx),
// onTap: () {},
// child: Container(),
// ),
]
.divide(SizedBox(height: 0.rpx))
.addToStart(SizedBox(height: 30.rpx))

4
lib/pages/sleep_report/chart/DataShowWidget.dart
View File

@@ -50,7 +50,7 @@ class _DataShowWidgetState extends State<DataShowWidget> {
children: [
// 放入传入的 widget1
Container(
width: MediaQuery.sizeOf(context).width * 0.35, // 固定宽度
width: MediaQuery.sizeOf(context).width * 0.44, // 固定宽度
decoration: BoxDecoration(),
child: Align(
alignment: Alignment.centerLeft,
@@ -77,7 +77,7 @@ class _DataShowWidgetState extends State<DataShowWidget> {
),
// 放入传入的 widget3
Container(
width: MediaQuery.sizeOf(context).width * 0.29, // 固定宽度
width: MediaQuery.sizeOf(context).width * 0.2, // 固定宽度
decoration: BoxDecoration(),
child: Align(
alignment: widget.alignment == MainAxisAlignment.start

2
lib/pages/sleep_report/component/HeartPointWidget.dart
View File

@@ -369,7 +369,7 @@ class _HeartPointWidgetState extends State<HeartPointWidget> {
child: Column(
children: [
Image.asset(
"assets/img/heartPic3.png",
"assets/img/heartPic4.png",
width: 120.rpx,
height: 120.rpx,
),

2
lib/pages/user/update_user_page.dart
View File

@@ -163,7 +163,7 @@ class _UpdateUserPageState extends State<UpdateUserPage> {
),
ClickableContainer(
backgroundColor: Colors.transparent,
highlightColor: themeController.currentColor.sc2,
highlightColor: themeController.currentColor.sc16,
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 44.rpx, 0.rpx, 44.rpx),
borderRadius: 0,