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

更新

Browse Source
This commit is contained in:
czz
2025-06-27 09:15:45 +08:00
parent 12c6a260c9
commit 943f5a778a
36 changed files with 1850 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common/color/appConstants.dart
View File

@@ -3,7 +3,7 @@ import 'dart:ui';
import 'package:vbvs_app/common/util/FitTool.dart';
import 'package:vbvs_app/common/util/MyUtils.dart';
class AppConstants {
class AppConstants {
// App-related constants
static const int code_time = 60; //验证码倒计时
static const int limit = 10; //分页数量

4
lib/controller/mh_controller/mhdevice_share_controller.g.dart
View File

@@ -12,6 +12,7 @@ MHDeviceShareModel _$MHDeviceShareModelFromJson(Map<String, dynamic> json) =>
..type = (json['type'] as num?)?.toInt()
..msg = json['msg'] as String?
..show = (json['show'] as num?)?.toInt()
..code = (json['code'] as num?)?.toInt()
..limit = (json['limit'] as num).toInt()
..offset = (json['offset'] as num).toInt()
..isLoading = json['isLoading'] as bool
@@ -21,10 +22,11 @@ MHDeviceShareModel _$MHDeviceShareModelFromJson(Map<String, dynamic> json) =>
Map<String, dynamic> _$MHDeviceShareModelToJson(MHDeviceShareModel instance) =>
<String, dynamic>{
'phone': instance.account,
'account': instance.account,
'type': instance.type,
'msg': instance.msg,
'show': instance.show,
'code': instance.code,
'limit': instance.limit,
'offset': instance.offset,
'isLoading': instance.isLoading,

2
lib/controller/mh_controller/repair_list_controller.dart
View File

@@ -39,7 +39,7 @@ class RepairListController extends GetControllerEx<RepairListModel> {
String serviceName = ServiceConstant.server_service;
String serviceApi = ServiceConstant.submit_repair;
String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
requestWithLog(
await requestWithLog(
logTitle: "查询报修数据",
method: MyHttpMethod.get,
queryUrl: queryUrl,

4
lib/controller/mh_controller/repair_list_controller.g.dart
View File

@@ -12,9 +12,7 @@ RepairListModel _$RepairListModelFromJson(Map<String, dynamic> json) =>
..offset = (json['offset'] as num).toInt()
..isLoading = json['isLoading'] as bool
..hasMore = json['hasMore'] as bool
..repairList = (json['repairList'] as List<dynamic>)
.map((e) => ApplyRepairModel.fromJson(e as Map<String, dynamic>))
.toList();
..repairList = json['repairList'] as List<dynamic>;
Map<String, dynamic> _$RepairListModelToJson(RepairListModel instance) =>
<String, dynamic>{

3
lib/main.dart
View File

@@ -194,8 +194,6 @@ void initEasyDartModule() {
//初始化
}
Future<void> initLogin() async {
// 初始化控制器
Get.put(UserInfoController());
@@ -358,6 +356,7 @@ class MyApp extends StatelessWidget {
Get.lazyPut(() => MHTDeviceCalibrationController()),
Get.lazyPut(() => SleepReportController()),
Get.lazyPut(() => CalendarController()),
Get.lazyPut(() => UserPdfController()),
Get.put(WebviewTestController()),
]));
}

16
lib/pages/common/selectDialog.dart
View File

@@ -714,13 +714,13 @@ Future showDayTimeSelectionDialog(
width: 100.rpx,
height: 60.rpx,
alignment: Alignment.center,
child: Text("取消",
child: Text("取消".tr,
style: TextStyle(
fontSize: 30.rpx, color: Colors.white)),
),
),
Text(
title,
title.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3,
@@ -742,7 +742,7 @@ Future showDayTimeSelectionDialog(
width: 100.rpx,
height: 60.rpx,
alignment: Alignment.center,
child: Text("确认",
child: Text("确认".tr,
style: TextStyle(
fontSize: 30.rpx, color: Colors.white)),
),
@@ -778,7 +778,7 @@ Future showDayTimeSelectionDialog(
context,
hours,
hoursIndex,
unit: "时",
unit: "时".tr,
),
),
Expanded(
@@ -786,7 +786,7 @@ Future showDayTimeSelectionDialog(
context,
minutes,
minutesIndex,
unit: "分",
unit: "分".tr,
),
),
],
@@ -856,12 +856,12 @@ Future showOneSelectionDialog(
alignment: Alignment.center,
width: 100.rpx,
height: 60.rpx,
child: Text("取消",
child: Text("取消".tr,
style: TextStyle(
fontSize: 30.rpx, color: Colors.white)),
),
),
Text(title,
Text(title.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
@@ -879,7 +879,7 @@ Future showOneSelectionDialog(
alignment: Alignment.center,
width: 100.rpx,
height: 60.rpx,
child: Text("确认",
child: Text("确认".tr,
style: TextStyle(
fontSize: 30.rpx, color: Colors.white)),
),

37
lib/pages/mh_page/MattressControl.dart
View File

@@ -17,35 +17,6 @@ class MattressControlPage extends StatefulWidget {
class _MattressControlPageState extends State<MattressControlPage> {
final controller = Get.put(ControlCardController());
final data = {
"_id": "333330000000000000000000",
"uid": "684b90df767e00004e0072e2",
"bind_type": 1,
"device_type": 3,
"mac": "545024122666",
"bind_mac": null,
"bind_mac_a": "B43A45C3D411",
"bind_mac_b": "B43A45C3D388",
"position": 0,
"share_uid": null,
"person": null,
"op_type": null,
"show": true,
"create_time": 1750121686274,
"room_id": "684395bf9ef8601da20f6475",
"roomName": "主卧",
"shareNum": 0,
"status": {
"signal": -1,
"status": 0,
"inBed": 0,
"upgrade": 0,
"failure": 0,
"updateTime": -1
},
"code": "545024122666",
"blueToothStatus": 1
};
int selectedIndex = 1; // 当前选中的tab索引
@override
Widget build(BuildContext context) {
@@ -138,10 +109,10 @@ class _MattressControlPageState extends State<MattressControlPage> {
body: SafeArea(
child: WebviewTestView(
// oncreate: (widget) {
// return WebviewTestController();
// },
),
// oncreate: (widget) {
// return WebviewTestController();
// },
),
),
))));
}

4
lib/pages/mh_page/ShareUserWidget.dart
View File

@@ -78,9 +78,9 @@ class ShareUserWidget extends GetView {
alignment: const AlignmentDirectional(-1, 0),
child: Text(
info['opType'] == 1
? '允许对方控制该设备'
? '允许对方控制该设备'.tr
: info['opType'] == 2
? '仅允许对方查看该设备'
? '仅允许对方查看该设备'.tr
: '',
style: TextStyle(
fontFamily: 'Readex Pro',

128
lib/pages/mh_page/about_us.dart Normal file
View File

@@ -0,0 +1,128 @@
import 'package:ef/ef.dart';
import 'package:flutter/material.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/component/tool/WebViewWidget.dart';
class MhAboutUsPage extends StatefulWidget {
late MyWebView webView;
MhAboutUsPage({super.key});
@override
State<MhAboutUsPage> createState() => _MhAboutUsPageState();
}
class _MhAboutUsPageState extends State<MhAboutUsPage> {
@override
void initState() {
super.initState();
// pdfController.loadPdf();
widget.webView = MyWebView(
url: AppConstants().ent_type == 1
? "https://mp.weixin.qq.com/s/IAr4RNBy0hGJXGKyMxe7eQ"
: "https://mp.weixin.qq.com/s/7BvvprVDqX1eOzM3Lms8dg",
onLoad: () {
print('网页载入完毕');
},
);
}
@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (context, bodySize) => GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/new_background.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
),
),
child: Scaffold(
backgroundColor: Colors.transparent, // 加上这一行
appBar: AppBar(
backgroundColor: Colors.transparent,
// backgroundColor: Colors.transparent,
automaticallyImplyLeading: false,
iconTheme: IconThemeData(color: themeController.currentColor.sc3),
titleSpacing: 0,
// leading: returnIconButtom,
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,
)),
/// 左边返回按钮
Positioned(
left: 20,
child: returnIconButtomNew,
),
],
),
),
actions: [],
centerTitle: false,
),
// body: SafeArea(
// top: true,
// child: Padding(
// padding: EdgeInsets.symmetric(horizontal: 30.rpx),
// child: Column(
// children: [
// Expanded(
// child: Obx(() {
// if (pdfController.localPdfPath.value == null) {
// return Center(child: CircularProgressIndicator());
// } else {
// return PDFView(
// filePath: pdfController.localPdfPath.value!,
// autoSpacing: false,
// enableSwipe: true,
// swipeHorizontal: false,
// pageSnap: true,
// fitEachPage: true,
// defaultPage: 0,
// onRender: (pages) => print('PDF 渲染完成，共 $pages 页'),
// onError: (error) => print('PDF 加载错误: $error'),
// );
// }
// }),
// ),
// ],
// ),
// ),
// ),
body: SafeArea(
top: true,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 0.rpx),
child: Column(children: [
Expanded(
child: Container(
child: widget.webView,
),
),
]),
),
),
),
),
),
);
}
}

99
lib/pages/mh_page/address_list_page.dart
View File

@@ -71,37 +71,76 @@ class AddressListPage extends GetView<AddressListController> {
child: Column(
mainAxisSize: MainAxisSize.max,
children: [
// Obx(() {
// if (controller.model.addressList!.isEmpty) {
// // 如果地址列表为空，显示 EmptyMessageWidget
// return Expanded(child: NullDataWidget());
// } else {
// // 如果地址列表不为空，显示地址列表
// return Expanded(
// child: Container(
// width: bodysize!.maxWidth,
// height: bodysize!.maxHeight * 1,
// decoration: BoxDecoration(),
// child: Obx(() => ListView(
// shrinkWrap: true,
// scrollDirection: Axis.vertical,
// children: (controller.model.addressList!
// .asMap()
// .entries
// .map((e) => AddressModuleWidget(
// index: e.key,
// addressListController:
// controller,
// ))
// .toList() as List<Widget>)
// .divide(const SizedBox(height: 10))
// .addToEnd(const SizedBox(
// height:
// AppConstants.list_end_height)),
// )),
// ),
// );
// }
// }),
Obx(() {
if (controller.model.addressList!.isEmpty) {
// 如果地址列表为空，显示 EmptyMessageWidget
return Expanded(child: NullDataWidget());
} else {
// 如果地址列表不为空，显示地址列表
return Expanded(
child: Container(
width: bodysize!.maxWidth,
height: bodysize!.maxHeight * 1,
decoration: BoxDecoration(),
child: Obx(() => ListView(
shrinkWrap: true,
scrollDirection: Axis.vertical,
children: (controller.model.addressList!
.asMap()
.entries
.map((e) => AddressModuleWidget(
index: e.key,
addressListController:
controller,
))
.toList() as List<Widget>)
.divide(const SizedBox(height: 10))
.addToEnd(const SizedBox(
height:
AppConstants.list_end_height)),
)),
),
);
}
final originList = controller.model.addressList ?? [];
// 拆出默认地址
final defaultItem = originList.firstWhere(
(e) => e["default"] == 1,
orElse: () => null,
);
// 其他非默认地址
final others =
originList.where((e) => e["default"] != 1).toList();
// 新的展示顺序列表（默认地址排前面）
final reorderedList = [
if (defaultItem != null) defaultItem,
...others,
];
return Expanded(
child: ListView(
shrinkWrap: true,
padding: EdgeInsets.zero,
children: reorderedList
.map((item) {
final realIndex =
originList.indexOf(item); // 保留原始 index
return AddressModuleWidget(
index: realIndex,
addressListController: controller,
);
})
.toList()
.divide(const SizedBox(height: 10))
.addToEnd(const SizedBox(
height: AppConstants.list_end_height)),
),
);
}),
Align(
alignment: AlignmentDirectional(0, 1),

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

@@ -1168,90 +1168,100 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
child:
TextFormField(
// autofocus: true,
obscureText:
false,
onChanged:
(value) {
(val) {
controller
.model
.apply_name =
value;
val;
},
obscureText:
false,
decoration:
InputDecoration(
isDense: true,
contentPadding:
EdgeInsets
.symmetric(
vertical:
25.rpx,
horizontal:
26.rpx,
),
labelStyle:
const TextStyle(
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
hintStyle:
const TextStyle(
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
enabledBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
color: const Color(
const BorderSide(
color: Color(
0x00000000),
width:
1.rpx,
width: 2,
),
borderRadius:
BorderRadius.circular(
AppConstants().normal_container_radius),
BorderRadius
.circular(8),
),
focusedBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
color: Colors
.transparent,
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
errorBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
//
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
focusedErrorBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
//
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
),
style: TextStyle(
letterSpacing:
0,
color: Colors
.black,
fontSize:
26.rpx),
style:
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
color: Colors
.black,
fontSize:
26.rpx,
),
),
),
),
@@ -1324,90 +1334,100 @@ class ApplyRepairPage extends GetView<ApplyRepairController> {
child:
TextFormField(
// autofocus: true,
obscureText:
false,
onChanged:
(value) {
(val) {
controller
.model
.tel =
value;
val;
},
obscureText:
false,
decoration:
InputDecoration(
isDense: true,
contentPadding:
EdgeInsets
.symmetric(
vertical:
25.rpx,
horizontal:
26.rpx,
),
labelStyle:
const TextStyle(
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
hintStyle:
const TextStyle(
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
enabledBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
color: const Color(
const BorderSide(
color: Color(
0x00000000),
width:
1.rpx,
width: 2,
),
borderRadius:
BorderRadius.circular(
AppConstants().normal_container_radius),
BorderRadius
.circular(8),
),
focusedBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
color: Colors
.transparent,
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
errorBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
//
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
focusedErrorBorder:
OutlineInputBorder(
UnderlineInputBorder(
borderSide:
BorderSide(
//
width:
1.rpx,
const BorderSide(
color: Color(
0x00000000),
width: 2,
),
borderRadius:
BorderRadius.circular(
8.rpx),
BorderRadius
.circular(8),
),
),
style: TextStyle(
letterSpacing:
0,
color: Colors
.black,
fontSize:
26.rpx),
style:
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
color: Colors
.black,
fontSize:
26.rpx,
),
),
),
),

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

@@ -4,16 +4,13 @@ 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/CommonVariables.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/main_bottom/global_controller.dart';
import 'package:vbvs_app/controller/mh_controller/mhdevice_share_controller.dart';
import 'package:vbvs_app/model/api_response.dart';
import 'package:vbvs_app/pages/mh_page/EmptyMessageWidget.dart';
import 'package:vbvs_app/pages/mh_page/ShareUserWidget.dart';
class ShareDeviceWidget extends GetView<MHDeviceShareController> {
@@ -216,125 +213,280 @@ class ShareDeviceWidget extends GetView<MHDeviceShareController> {
),
),
)),
Obx(
() => GestureDetector(
onTap: () {
// 当点击时，将 type 设置为 0（允许控制）
controller.model.type = 1;
controller.updateAll();
},
child: Container(
margin: EdgeInsets.only(top: 76.rpx),
width: MediaQuery.sizeOf(context).width,
constraints: const BoxConstraints(
minHeight: 46,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(0),
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'允许对方控制该设备',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0,
),
GestureDetector(
onTap: () {
// 当点击时，将 type 设置为 0（允许控制）
controller.model.type = 1;
controller.updateAll();
},
child: Container(
margin: EdgeInsets.only(top: 76.rpx),
width: MediaQuery.sizeOf(context).width,
constraints: const BoxConstraints(
minHeight: 46,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(0),
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'允许对方控制该设备'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0,
),
Theme(
data:
Theme.of(context).copyWith(
unselectedWidgetColor: Color(
0xFFC8CBD2), // 改变未选中状态边框颜色
),
Obx(() {
double h = 33.rpx;
bool check =
controller.model.type == 1;
return Container(
height: 33.rpx,
child: AspectRatio(
aspectRatio: 1,
child: Center(
child: Container(
height: h,
width: h,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
h / 2),
border: Border.all(
width: check ? 1 : 0.5,
color:
Color(0xFFC8CBD2),
),
),
child: check
? Center(
child: ClipOval(
child: Container(
width: h * 0.6,
height: h * 0.6,
color: const Color(
0xFF6BFDAC),
),
),
)
: null,
),
),
child: Radio<int>(
value: 1,
groupValue:
controller.model.type,
onChanged: (value) {
controller.model.type =
value!;
controller.updateAll();
},
activeColor:
const Color(0xFF6BFDAC),
materialTapTargetSize:
MaterialTapTargetSize
.shrinkWrap, // 减少内边距
visualDensity: VisualDensity(
horizontal: -4,
vertical: -4), // 缩小视觉密度
))
],
),
),
);
}),
],
),
),
),
Obx(
() => GestureDetector(
onTap: () {
// 当点击时，将 type 设置为 1（仅允许查看）
controller.model.type = 2;
controller.updateAll();
},
child: Container(
width: MediaQuery.sizeOf(context).width,
constraints: const BoxConstraints(
minHeight: 46,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(0),
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'仅允许对方查看该设备',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0,
),
// Obx(
// () => GestureDetector(
// onTap: () {
// controller.model.type = 2;
// controller.updateAll();
// },
// child: Container(
// width: MediaQuery.sizeOf(context).width,
// constraints: const BoxConstraints(
// minHeight: 46,
// ),
// decoration: BoxDecoration(
// borderRadius:
// BorderRadius.circular(0),
// ),
// child: Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
// children: [
// Text(
// '仅允许对方查看该设备'.tr,
// style: TextStyle(
// fontFamily: 'Readex Pro',
// color: Colors.white,
// fontSize: 26.rpx,
// letterSpacing: 0.0,
// ),
// ),
// // Theme(
// // data:
// // Theme.of(context).copyWith(
// // unselectedWidgetColor: Color(
// // 0xFFC8CBD2), // 改变未选中状态边框颜色
// // ),
// // child: Radio<int>(
// // value: 2,
// // groupValue:
// // controller.model.type,
// // onChanged: (value) {
// // controller.model.type =
// // value!;
// // controller.updateAll();
// // },
// // activeColor:
// // const Color(0xFF6BFDAC),
// // materialTapTargetSize:
// // MaterialTapTargetSize
// // .shrinkWrap, // 减少内边距
// // visualDensity: VisualDensity(
// // horizontal: -4,
// // vertical: -4), // 缩小视觉密度
// // ))
// ClipOval(
// child: Container(
// height:
// MediaQuery.sizeOf(context)
// .height *
// 0.0449,
// child: AspectRatio(
// aspectRatio: 1,
// child: Center(
// child: LayoutBuilder(
// builder: (context,
// constraints) {
// double h =
// MediaQuery.sizeOf(
// context)
// .height *
// 0.0326;
// bool check = controller
// .model.type ==
// 2;
// if (check) {
// return Container(
// height: h,
// width: h,
// decoration:
// BoxDecoration(
// borderRadius:
// BorderRadius
// .circular(
// h / 2),
// border: Border.all(
// width: 1,
// color: Color(
// 0xFF6BFDAC)),
// ),
// child: Center(
// child: ClipOval(
// child: Container(
// width:
// h * 0.6,
// height:
// h * 0.6,
// color: Color(
// 0xFF6BFDAC)),
// ),
// ),
// );
// } else {
// return Container(
// height: h,
// width: h,
// decoration:
// BoxDecoration(
// borderRadius:
// BorderRadius
// .circular(
// h / 2),
// border: Border.all(
// width: 0.5,
// color: Colors
// .white),
// ),
// );
// }
// },
// ),
// ),
// ),
// ),
// ),
// ],
// ),
// ),
// ),
// ),
GestureDetector(
onTap: () {
controller.model.type = 2;
controller.updateAll();
},
child: Container(
width: MediaQuery.sizeOf(context).width,
constraints:
const BoxConstraints(minHeight: 46),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(0),
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'仅允许对方查看该设备'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0,
),
Theme(
data:
Theme.of(context).copyWith(
unselectedWidgetColor: Color(
0xFFC8CBD2), // 改变未选中状态边框颜色
),
// ✅ 只包住响应式控件部分
Obx(() {
double h = 33.rpx;
bool check =
controller.model.type == 2;
return Container(
height: 33.rpx,
child: AspectRatio(
aspectRatio: 1,
child: Center(
child: Container(
height: h,
width: h,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(
h / 2),
border: Border.all(
width: check ? 1 : 0.5,
color:
Color(0xFFC8CBD2),
),
),
child: check
? Center(
child: ClipOval(
child: Container(
width: h * 0.6,
height: h * 0.6,
color: const Color(
0xFF6BFDAC),
),
),
)
: null,
),
),
child: Radio<int>(
value: 2,
groupValue:
controller.model.type,
onChanged: (value) {
controller.model.type =
value!;
controller.updateAll();
},
activeColor:
const Color(0xFF6BFDAC),
materialTapTargetSize:
MaterialTapTargetSize
.shrinkWrap, // 减少内边距
visualDensity: VisualDensity(
horizontal: -4,
vertical: -4), // 缩小视觉密度
))
],
),
),
);
}),
],
),
),
),
Align(
alignment: const AlignmentDirectional(0, 0),
child: Padding(
@@ -361,7 +513,7 @@ class ShareDeviceWidget extends GetView<MHDeviceShareController> {
.currentColor.sc9);
}
},
text: '发送邀请',
text: '发送邀请'.tr,
options: FFButtonOptions(
height: 60.rpx,
padding:
@@ -404,7 +556,7 @@ class ShareDeviceWidget extends GetView<MHDeviceShareController> {
padding: const EdgeInsetsDirectional
.fromSTEB(14, 0, 0, 16),
child: Text(
'已分享用户',
'已分享用户'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,

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

@@ -2,6 +2,7 @@ import 'package:ef/ef.dart';
import 'package:flutter/material.dart';
import 'package:flutter_city_picker/listener/picker_listener.dart';
import 'package:flutter_city_picker/model/address.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:vbvs_app/common/color/appConstants.dart';
@@ -739,6 +740,158 @@ class EditAddressPage extends GetView<AddressController>
],
),
),
// Expanded(
// child: InkWell(
// onTap: () {
// CityPicker.show(
// context:
// context,
// cityPickerListener:
// this,
// // 在大屏/Web 上最大宽度为 600px
// // 移除内边距
// );
// },
// child: Container(
// width: 100,
// height: 100,
// decoration:
// BoxDecoration(
// color: const Color(
// 0xFFF3F5F6),
// borderRadius:
// BorderRadius
// .circular(
// 8),
// ),
// alignment:
// Alignment
// .center,
// child: Obx(() {
// return TextFormField(
// enabled:
// false,
// controller: controller.onReDraw(
// TextEditingController(
// text:
// controller.model.all_address),
// (val) {
// val.text =
// controller.model.all_address ??
// "";
// }),
// // autofocus: true,
// obscureText:
// false,
// maxLines: 1,
// textAlignVertical:
// TextAlignVertical
// .center, // 垂直居中
// decoration: InputDecoration(
// contentPadding: EdgeInsets.symmetric(
// vertical:
// 25.rpx,
// horizontal:
// 26.rpx,
// ),
// labelStyle: TextStyle(
// fontFamily:
// 'Readex Pro',
// letterSpacing:
// 0,
// ),
// hintStyle: TextStyle(
// fontFamily:
// 'Readex Pro',
// letterSpacing:
// 0,
// ),
// enabledBorder: UnderlineInputBorder(
// borderSide:
// const BorderSide(
// color:
// Color(0x00000000),
// width:
// 2,
// ),
// borderRadius:
// BorderRadius.circular(8),
// ),
// disabledBorder: UnderlineInputBorder(
// borderSide:
// const BorderSide(
// color:
// Color(0x00000000),
// width:
// 0,
// ),
// borderRadius:
// BorderRadius.circular(8),
// ),
// focusedBorder: UnderlineInputBorder(
// borderSide:
// const BorderSide(
// color:
// Color(0x00000000),
// width:
// 2,
// ),
// borderRadius:
// BorderRadius.circular(8),
// ),
// errorBorder: UnderlineInputBorder(
// borderSide:
// const BorderSide(
// color:
// Color(0x00000000),
// width:
// 2,
// ),
// borderRadius:
// BorderRadius.circular(8),
// ),
// focusedErrorBorder: UnderlineInputBorder(
// borderSide:
// const BorderSide(
// color:
// Color(0x00000000),
// width:
// 2,
// ),
// borderRadius:
// BorderRadius.circular(8),
// ),
// suffixIcon: Transform.rotate(
// angle:
// 1.5708, // 90 度相当于 pi / 2 弧度
// child:
// Icon(
// Icons.arrow_forward_ios,
// color:
// Colors.black,
// size:
// 26.rpx,
// ),
// )),
// style:
// TextStyle(
// fontFamily:
// 'Readex Pro',
// letterSpacing:
// 0,
// color: Color(
// 0xFF333333),
// fontSize:
// 26.rpx,
// overflow:
// TextOverflow
// .ellipsis,
// ),
// );
// })),
// ),
// ),
Expanded(
child: InkWell(
onTap: () {
@@ -747,148 +900,71 @@ class EditAddressPage extends GetView<AddressController>
context,
cityPickerListener:
this,
// 在大屏/Web 上最大宽度为 600px
// 移除内边距
);
},
child: Container(
width: 100,
height: 100,
decoration:
BoxDecoration(
color: const Color(
0xFFF3F5F6),
borderRadius:
BorderRadius
.circular(
8),
),
alignment:
Alignment
.center,
child: Obx(() {
return TextFormField(
enabled:
false,
controller: controller.onReDraw(
TextEditingController(
text:
controller.model.all_address),
(val) {
val.text =
controller.model.all_address ??
"";
}),
// autofocus: true,
obscureText:
false,
textAlignVertical:
TextAlignVertical
.center, // 垂直居中
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical:
25.rpx,
horizontal:
width: 100,
height: 100,
decoration:
BoxDecoration(
color: const Color(
0xFFF3F5F6),
borderRadius:
BorderRadius
.circular(
8),
),
alignment:
Alignment
.center,
child: Obx(() {
return Row(
children: [
Expanded(
child:
Padding(
padding: EdgeInsets.only(
left: 27
.rpx,
right:
10.rpx),
child:
Text(
controller.model.all_address ??
'',
maxLines:
1,
overflow:
TextOverflow.ellipsis,
style:
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
color:
Color(0xFF333333),
fontSize:
26.rpx,
),
labelStyle: TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
hintStyle: TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
),
enabledBorder: UnderlineInputBorder(
borderSide:
const BorderSide(
color:
Color(0x00000000),
width:
2,
),
borderRadius:
BorderRadius.circular(8),
),
disabledBorder: UnderlineInputBorder(
borderSide:
const BorderSide(
color:
Color(0x00000000),
width:
0,
),
borderRadius:
BorderRadius.circular(8),
),
focusedBorder: UnderlineInputBorder(
borderSide:
const BorderSide(
color:
Color(0x00000000),
width:
2,
),
borderRadius:
BorderRadius.circular(8),
),
errorBorder: UnderlineInputBorder(
borderSide:
const BorderSide(
color:
Color(0x00000000),
width:
2,
),
borderRadius:
BorderRadius.circular(8),
),
focusedErrorBorder: UnderlineInputBorder(
borderSide:
const BorderSide(
color:
Color(0x00000000),
width:
2,
),
borderRadius:
BorderRadius.circular(8),
),
suffixIcon: Transform.rotate(
angle:
1.5708, // 90 度相当于 pi / 2 弧度
child:
Icon(
Icons.arrow_forward_ios,
color:
Colors.black,
size:
26.rpx,
),
)),
style:
TextStyle(
fontFamily:
'Readex Pro',
letterSpacing:
0,
color: Color(
0xFF333333),
fontSize:
26.rpx,
overflow:
TextOverflow
.ellipsis,
),
);
})),
),
)),
Padding(
padding:
EdgeInsets.only(right: 27.rpx),
child: Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture.asset(
'assets/img/icon/expand_more.svg',
color: Colors.black,
)))
],
);
}),
),
),
),
)
].divide(const SizedBox(
width: 15)),
),

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

@@ -6,6 +6,7 @@ import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/common/util/requestWithLog.dart';
import 'package:vbvs_app/component/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/mh_controller/device_list_controller.dart';
class EditBedPage extends StatefulWidget {
final Map data;
@@ -19,6 +20,7 @@ BoxConstraints? bodysize;
class _EditBedPageState extends State<EditBedPage> {
late Map<String, dynamic> editedData;
late TextEditingController _nameController; //名称文本输入框
DeviceListController deviceListController = Get.find();
@override
void initState() {
super.initState();
@@ -205,6 +207,7 @@ class _EditBedPageState extends State<EditBedPage> {
onSuccess: (res) {
TopSlideNotification.show(context,
text: "修改名称成功".tr);
deviceListController.getDeviceList();
},
);
},
@@ -222,7 +225,7 @@ class _EditBedPageState extends State<EditBedPage> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6),
),
child: Text("完成",
child: Text("完成".tr,
style: TextStyle(
color: const Color(0xFF003058),
fontSize: 26.rpx)),

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

@@ -11,6 +11,7 @@ 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';
@@ -104,7 +105,9 @@ class _ExperienceStorePageState extends State<ExperienceStorePage> {
highlightColor: Color(0xFF055466),
padding: EdgeInsets.only(left: 0),
onTap: () {
Get.toNamed("/myExperiencePage");
TopSlideNotification.show(context,
text: "待开发功能".tr);
// Get.toNamed("/myExperiencePage");
},
child: SvgPicture.asset(
'assets/img/icon/history_store.svg',

264
lib/pages/mh_page/help/article.dart
View File

@@ -2,177 +2,116 @@ import 'package:ef/ef.dart';
import 'package:flutter/material.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 StatelessWidget {
Map article;
class HelpArticle extends StatefulWidget {
final Map article;
HelpArticle({super.key, required this.article});
// get articleController => Get.find<ArticleController>();
get userInfoController => Get.find<UserInfoController>();
@override
State<HelpArticle> createState() => _HelpArticleState();
}
var isLike = 0.obs;
// @override
// Widget build(BuildContext context) {
// String top_imgOrVideo = "";
// if (article['imgOrVideo'] == 0) {
// top_imgOrVideo =
// '''<img class="video" src="${getStorageResourceUrl(article['coverUrl'])}" />''';
// } else {
// top_imgOrVideo =
// '''<video controls class="video" src="${getStorageResourceUrl(article['videoUrl'])}" ></video>''';
// }
// String newText = article['text'];
// RegExp("<img\\s*src=\"([^\"]*)\"")
// .allMatches(newText)
// .toList()
// .map((d) => d.group(1))
// .toList()
// .forEach((d) {
// newText = newText.replaceAll("$d", getStorageResourceUrl("$d"));
// });
// String html = '''
// <html>
// <meta name="viewport" charset="UTF-8"
// content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
// <head>
// <title>Test Page</title>
// </head>
// <style>
// body {
// width: 98%;
// margin: 0 auto;
// overflow-x: hidden;
// }
// .video {
// width: 100%;
// height: 270px;
// background-color: #9EA4B7;
// border-radius: 6px;
// }
// </style>
// <body>
// <div style="padding: 15px;width: calc(100% - 36px);">
// ${top_imgOrVideo}
// <div style="height: 2px;width: 100%;background-color: #D6D6D6;margin: 15px 0 15px 0;"></div>
// <div style="line-height: 22px;font-size: 15px;">${article['title']}</div>
// <div style="display: flex;align-items: center;font-size: 13;margin-bottom: 24px;margin-top: 10px;">
// <div style="color: #182B7C;">${article['author']}</div>
// <div style="margin-left: 13px; color: #D3D3D3;">${time_08_Formatter(article['created_at'])}</div>
// </div>
// ${newText}
// </div>
// </body>
// </html>
// ''';
// print("$html");
// // articleController.readAdd(article['id']);
// String? uid = userInfoController.model.user?.uid;
// print("${userInfoController.model.user}");
// // uid = "sss";
// // if (uid != null) {
// // articleController.findIsLike(uid, article['id']).then((d) {
// // isLike.value = d;
// // });
// // }
// return LayoutBuilder(
// builder: (context, boxConstraints) => GestureDetector(
// onTap: () => FocusScope.of(context).unfocus(),
// child: Scaffold(
// appBar: AppBar(
// backgroundColor: AppColors.bg_color,
// automaticallyImplyLeading: false,
// iconTheme: IconThemeData(color: Colors.white),
// titleSpacing: 0,
// leading: returnIconButtom,
// ),
// body: SafeArea(
// top: true,
// child: Container(
// width: MediaQuery.sizeOf(context).width,
// height: MediaQuery.sizeOf(context).height,
// decoration: BoxDecoration(
// color: Colors.white,
// // color: AppColors.bg_color,
// // image: DecorationImage(
// // image: AssetImage("assets/images/background.png$test"),
// // fit: BoxFit.cover,
// // ),
// ),
// child: Column(
// children: [
// Expanded(
// child: Container(
// // child: WebViewWidget(
// // controller: WebViewController()
// // ..setJavaScriptMode(JavaScriptMode.unrestricted)
// // ..loadHtmlString(html),
// // ),
// child: InAppWebView(
// initialData:
// InAppWebViewInitialData(data: html, encoding: ""),
// ),
// ),
// ),
// ],
// ),
// ),
// ),
// ),
// ),
// );
// }
class _HelpArticleState extends State<HelpArticle> {
bool isLoading = true;
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xFF042C46),
appBar: AppBar(
backgroundColor: const Color(0xFF042C46),
title: Text("问题与帮助", style: TextStyle(color: Colors.white)),
centerTitle: true,
leading: IconButton(
icon: Icon(Icons.arrow_back, color: Colors.white),
onPressed: () => Navigator.pop(context),
return Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/new_background.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
),
),
elevation: 0,
),
body: Column(
children: [
Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
alignment: Alignment.centerLeft,
child: Text(
article['title'],
style: const TextStyle(
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold),
),
),
Expanded(
child: InAppWebView(
initialData: InAppWebViewInitialData(
data: wrapHtml(article['content']),
child: Scaffold(
backgroundColor: Colors.transparent,
appBar: AppBar(
backgroundColor: Colors.transparent,
automaticallyImplyLeading: false,
iconTheme: IconThemeData(color: Colors.white),
titleSpacing: 0,
title: SizedBox(
width: double.infinity,
height: 180.rpx,
child: Stack(
alignment: Alignment.center,
children: [
// 中间居中的标题
Text(
'问题与帮助',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: 30.rpx,
),
),
// 左侧图标
Positioned(
left: 20.rpx,
child: returnIconButtomNew,
),
],
),
),
actions: [],
centerTitle: false,
),
),
],
),
);
body: Padding(
padding: EdgeInsets.only(left: 30.rpx, right: 30.rpx),
child: Column(
children: [
Container(
padding: EdgeInsets.only(
left: 26.rpx, top: 53.rpx, bottom: 15.rpx),
alignment: Alignment.centerLeft,
child: Text(
widget.article['title'],
style: TextStyle(
color: Colors.white,
fontSize: 30.rpx,
),
),
),
Divider(
color: Color(0XFF929699),
thickness: 0.5.rpx,
),
Expanded(
child: Stack(
children: [
InAppWebView(
initialData: InAppWebViewInitialData(
data: wrapHtml(widget.article['content']),
),
initialSettings: InAppWebViewSettings(
transparentBackground: true,
),
onLoadStop: (controller, url) {
setState(() {
isLoading = false;
});
},
),
if (isLoading)
Container(
color: const Color(0xFF042C46),
alignment: Alignment.center,
child: const CircularProgressIndicator(
valueColor:
AlwaysStoppedAnimation<Color>(Colors.white),
),
),
],
),
),
],
),
)));
}
/// 包装成完整 HTML 页面，添加适配样式
String wrapHtml(String htmlContent) {
return """
<!DOCTYPE html>
@@ -182,11 +121,12 @@ class HelpArticle extends StatelessWidget {
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
body {
color: #FFFFFF;
background-color: #042C46;
color: #929699;
background-color: transparent;
font-family: sans-serif;
padding: 16px;
font-size: 16px;
padding: 0;
font-size: 18;
}
p, li {
line-height: 1.6;

1
lib/pages/mh_page/homepage/new_Home_page.dart
View File

@@ -515,6 +515,7 @@ class _NewHomePageState extends State<NewHomePage> {
isMultiSelect: false,
),
),
),
InkWell(
onTap: () {

4
lib/pages/mh_page/new_mine_page.dart
View File

@@ -141,7 +141,7 @@ class _MinePageState extends State<NewMinePage> {
userInfoController
.model.user!.avatar!.isEmpty
? Image.asset(
"assets/images/people_avatar.png",
"assets/images/default_avatar.png",
fit: BoxFit.cover,
)
: Image.network(
@@ -149,7 +149,7 @@ class _MinePageState extends State<NewMinePage> {
fit: BoxFit.cover,
))
: Image.asset(
"assets/images/people_avatar.png",
"assets/images/default_avatar.png",
fit: BoxFit.cover,
),
),

16
lib/pages/mh_page/new_settingPage.dart
View File

@@ -288,7 +288,9 @@ class _SettingPageState extends State<SettingPage> {
.currentColor.sc21, // 点击时的背景色
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0.rpx, 0.rpx, 0.rpx),
onTap: () {},
onTap: () {
Get.toNamed('/aboutUs');
},
child: Container(
child: Padding(
padding: EdgeInsetsDirectional.fromSTEB(
@@ -335,8 +337,7 @@ class _SettingPageState extends State<SettingPage> {
padding: EdgeInsetsDirectional.fromSTEB(
40.rpx, 0.rpx, 40.rpx, 0.rpx),
onTap: () {
TopSlideNotification.show(context,
text: "待开发功能".tr);
Get.toNamed("/userAgreementPage");
},
child: Container(
child: Padding(
@@ -384,8 +385,7 @@ class _SettingPageState extends State<SettingPage> {
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0.rpx, 0.rpx, 0.rpx),
onTap: () {
TopSlideNotification.show(context,
text: "待开发功能".tr);
Get.toNamed("/privacyPolicyPage");
},
child: Container(
child: Padding(
@@ -568,8 +568,10 @@ class _SettingPageState extends State<SettingPage> {
),
),
Text(
AppConstants().ent_type == 1? 'Copyright © 202-2025 嘉兴太和信息技术有限责任公司 版权所有'
.tr:"Copyright © 202-2025 杭州欢睡科技有限公司 版权所有",
AppConstants().ent_type == 1
? 'Copyright © 202-2025 嘉兴太和信息技术有限责任公司 版权所有'
.tr
: "Copyright © 202-2025 杭州欢睡科技有限公司 版权所有",
style: TextStyle(
color: themeController.currentColor.sc4,
fontFamily: 'Inter',

101
lib/pages/mh_page/people_info.dart
View File

@@ -4,10 +4,12 @@ import 'package:ef/ef.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.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/TopSlideNotification.dart';
import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
import 'package:vbvs_app/controller/mh_controller/people_info_controller.dart';
@@ -58,7 +60,7 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
children: [
// 中间居中的标题
Text(
'人员资料',
'人员资料'.tr,
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -89,7 +91,9 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
d['height'].toString().isNotEmpty &&
int.tryParse(d['height'].toString()) ==
null) {
showToast("$prefix身高请输入数字");
TopSlideNotification.show(context,
text: "请选择身高".tr,
textColor: Color(0xFFFF7159));
isValid = false;
break;
}
@@ -98,16 +102,9 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
d['weight'].toString().isNotEmpty &&
int.tryParse(d['weight'].toString()) ==
null) {
showToast("$prefix体重请输入数字");
isValid = false;
break;
}
if (d['tel'] != null &&
d['tel'].toString().isNotEmpty &&
!MyUtils.isValidPhoneNumber(
d['tel'].toString())) {
showToast("$prefix请输入正确的电话");
TopSlideNotification.show(context,
text: "请选择体重".tr,
textColor: Color(0xFFFF7159));
isValid = false;
break;
}
@@ -116,7 +113,9 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
d['contact'].toString().isNotEmpty &&
!MyUtils.isValidPhoneNumber(
d['contact'].toString())) {
showToast("$prefix请输入正确的紧急联系人电话");
TopSlideNotification.show(context,
text: "请输入正确的联系人电话".tr,
textColor: Color(0xFFFF7159));
isValid = false;
break;
}
@@ -126,13 +125,15 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
if (isValid) {
for (var data in controller.model.peopleList) {
try {
await controller.savePeoples(
data); // 注意：你这个方法名是 savePeoples，建议改成 savePerson
showToast("保存成功（${data['mac']}）",
color: color_success);
await controller.savePeoples(data);
TopSlideNotification.show(context,
text: "更新成功".tr,
textColor: Color(0XFF00C1AA));
} catch (e) {
print("保存失败：$e");
showToast("保存失败（${data['mac']}）");
TopSlideNotification.show(context,
text: "更新失败".tr,
textColor: Color(0xFFFF7159));
}
}
}
@@ -153,7 +154,7 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
// color: stringToColor("#182B7C"),
// ),
child: Text(
"保存",
"保存".tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0XFF011D33),
@@ -391,12 +392,16 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
SizedBox(
width: 16.rpx,
),
Icon(
Icons.expand_more,
color:
Colors.white,
size: 48.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child:
SvgPicture
.asset(
'assets/img/icon/expand_more.svg',
color: Colors
.white,
))
],
),
],
@@ -560,11 +565,15 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
),
SizedBox(
width: 16.rpx),
Icon(
Icons.expand_more,
color:
Colors.white,
size: 48.rpx),
Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture
.asset(
'assets/img/icon/expand_more.svg',
color: Colors
.white,
))
],
),
],
@@ -649,12 +658,16 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
),
SizedBox(
width: 16.rpx),
Icon(
Icons
.expand_more,
color: Colors
.white,
size: 48.rpx),
Container(
height: 30.rpx,
width: 30.rpx,
child:
SvgPicture
.asset(
'assets/img/icon/expand_more.svg',
color: Colors
.white,
))
],
),
],
@@ -769,12 +782,16 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
SizedBox(
width: 16.rpx,
),
Icon(
Icons.expand_more,
color:
Colors.white,
size: 48.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child:
SvgPicture
.asset(
'assets/img/icon/expand_more.svg',
color: Colors
.white,
))
],
),
],

121
lib/pages/mh_page/privacy_policy.dart Normal file
View File

@@ -0,0 +1,121 @@
import 'package:ef/ef.dart';
import 'package:flutter/material.dart';
import 'package:flutter_pdfview/flutter_pdfview.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/controller/setting/pdf/PrivacyPdfController.dart';
class PrivacyPolicyPage extends StatefulWidget {
PrivacyPolicyPage({super.key});
@override
State<PrivacyPolicyPage> createState() => _PrivacyPolicyPageState();
}
class _PrivacyPolicyPageState extends State<PrivacyPolicyPage> {
PrivacyPdfController pdfController = Get.find();
@override
void initState() {
super.initState();
String language = "zh_CN"; // 默认语言
int ent_type = AppConstants().ent_type;
if (languageController.selectLanguage?.value?.language_code != null) {
language = languageController.selectLanguage!.value!.language_code!;
} // 根据 ent_type 拼接不同的文件名
String pdfName =
ent_type == 1 ? "$language.pdf" : "${language}_$ent_type.pdf";
pdfController.loadPdf(
2,
"https://vsbst-api.he-info.cn/vsbs_sotrage/privacy-scheme/$pdfName",
);
}
@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (context, bodySize) => GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/new_background.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
),
),
child: Scaffold(
backgroundColor: Colors.transparent, // 加上这一行
appBar: AppBar(
backgroundColor: themeController.currentColor.sc17,
automaticallyImplyLeading: false,
iconTheme: IconThemeData(
color: themeController.currentColor.sc3,
),
titleSpacing: 0,
// leading: returnIconButtom,
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,
),
),
/// 左边返回按钮
Positioned(
left: 20,
child: returnIconButtomNew,
),
],
),
),
actions: [],
centerTitle: false,
),
body: SafeArea(
top: true,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 0.rpx),
child: Column(
children: [
Expanded(
child: Obx(() {
if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator());
} else {
return PDFView(
filePath: pdfController.localPdfPath.value!,
autoSpacing: false,
enableSwipe: true,
swipeHorizontal: false,
pageSnap: true,
fitEachPage: true,
defaultPage: 0,
onRender: (pages) => print('PDF 渲染完成，共 $pages 页'),
onError: (error) => print('PDF 加载错误: $error'),
);
}
}),
),
],
),
),
),
),
),
),
);
}
}

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

@@ -3,6 +3,7 @@ import 'package:flutter/gestures.dart';
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/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';
@@ -257,7 +258,7 @@ class DeviceRepairPage extends GetView<RepairListController> {
))
.toList(),
)
: EmptyMessageWidget();
: NullDataWidget();
}),
),
],

13
lib/pages/mh_page/room_picker.dart
View File

@@ -5,6 +5,7 @@ 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/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
class RoomPickerPage extends StatefulWidget {
final Map data;
@@ -186,7 +187,15 @@ class _RoomPickerPageState extends State<RoomPickerPage> {
"roomId": rooms[selectedIndex]['_id'],
},
onSuccess: (res) {
'更新人员信息成功: $res';
Get.back();
TopSlideNotification.show(context,
text: "更新成功".tr,
textColor: Color(0XFF00C1AA));
},
onFailure: (res) {
TopSlideNotification.show(context,
text: "更新失败".tr,
textColor: Color(0xFFFF7159));
},
);
} catch (e) {
@@ -207,7 +216,7 @@ class _RoomPickerPageState extends State<RoomPickerPage> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6),
),
child: Text("完成",
child: Text("完成".tr,
style: TextStyle(
color: const Color(0xFF003058),
fontSize: 30.rpx,

4
lib/pages/mh_page/score_page.dart
View File

@@ -42,7 +42,7 @@ class ScorePage extends GetView<mh.ScoreController> {
children: [
// 中间居中的标题
Text(
'评价',
'评价'.tr,
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -107,7 +107,7 @@ class ScorePage extends GetView<mh.ScoreController> {
alignment:
AlignmentDirectional(0, 0),
child: Text(
'我要评价',
'我要评价'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
fontSize: 30.rpx,

6
lib/pages/mh_page/sleep_habit.dart
View File

@@ -40,7 +40,7 @@ class _SleepHabitPageState extends State<SleepHabitPage> {
children: [
// 中间居中的标题
Text(
'设备报修',
'睡眠习惯'.tr,
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -77,7 +77,7 @@ class _SleepHabitPageState extends State<SleepHabitPage> {
width: bodysize!.maxWidth * 1,
height: bodysize!.maxHeight * 0.056,
child: Text(
'柔性唤醒',
'柔性唤醒'.tr,
style: TextStyle(
fontSize: 26.rpx, color: Colors.white),
))),
@@ -95,7 +95,7 @@ class _SleepHabitPageState extends State<SleepHabitPage> {
width: bodysize!.maxWidth * 1,
height: bodysize!.maxHeight * 0.056,
child: Text(
'睡眠隐私',
'睡眠隐私'.tr,
style: TextStyle(
fontSize: 26.rpx, color: Colors.white),
)))

200
lib/pages/mh_page/smys.dart
View File

@@ -66,7 +66,7 @@ class Smys extends GetView<SleepingHabitController> {
children: [
// 中间居中的标题
Text(
'睡眠隐私',
'睡眠隐私'.tr,
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
@@ -125,7 +125,7 @@ class Smys extends GetView<SleepingHabitController> {
MainAxisAlignment.spaceBetween,
children: [
Text(
'睡眠隐私功能',
'睡眠隐私功能'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),
@@ -156,52 +156,52 @@ class Smys extends GetView<SleepingHabitController> {
),
)),
// getLine(),
Container(
width: double.infinity,
height: MediaQuery.sizeOf(context).height * 0.055,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: const Color(0xFF929699),
width: 0.rpx),
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr: controller.model.smysStartTime,
title: "开始时间".tr, checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.smysStartTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
// updateParm();
});
},
child: Container(
width: double.infinity,
height:
MediaQuery.sizeOf(context).height * 0.055,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: const Color(0xFF929699),
width: 0.rpx),
),
),
),
constraints: BoxConstraints(
minHeight: 90.rpx, // 设置最小高度
),
child: Padding(
padding: EdgeInsets.fromLTRB(
39.rpx, 0.rpx, 30.rpx, 0.rpx),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'开始时间',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),
fontSize: 26.rpx,
letterSpacing: 0,
constraints: BoxConstraints(
minHeight: 90.rpx, // 设置最小高度
),
child: Padding(
padding: EdgeInsets.fromLTRB(
39.rpx, 0.rpx, 30.rpx, 0.rpx),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'开始时间'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),
fontSize: 26.rpx,
letterSpacing: 0,
),
),
),
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr:
controller.model.smysStartTime,
title: "开始时间", checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.smysStartTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
// updateParm();
});
},
child: Row(
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
@@ -225,57 +225,56 @@ class Smys extends GetView<SleepingHabitController> {
))
],
),
),
],
),
)),
// getLine(),
Container(
width: double.infinity,
height: MediaQuery.sizeOf(context).height * 0.055,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: const Color(0xFF929699),
width: 0.rpx),
),
),
constraints: BoxConstraints(
minHeight: 90.rpx, // 设置最小高度
),
child: Padding(
padding: EdgeInsets.fromLTRB(
39.rpx, 0.rpx, 30.rpx, 0.rpx),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'结束时间',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),
fontSize: 26.rpx,
letterSpacing: 0,
),
],
),
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr:
controller.model.smysEndTime,
title: "结束时间", checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.smysEndTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
// updateParm();
});
},
child: Row(
)),
),
// getLine(),
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr: controller.model.smysEndTime,
title: "结束时间".tr, checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.smysEndTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
// updateParm();
});
},
child: Container(
width: double.infinity,
height: MediaQuery.sizeOf(context).height * 0.055,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: const Color(0xFF929699),
width: 0.rpx),
),
),
constraints: BoxConstraints(
minHeight: 90.rpx, // 设置最小高度
),
child: Padding(
padding: EdgeInsets.fromLTRB(
39.rpx, 0.rpx, 30.rpx, 0.rpx),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'结束时间'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),
fontSize: 26.rpx,
letterSpacing: 0,
),
),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
@@ -299,12 +298,11 @@ class Smys extends GetView<SleepingHabitController> {
))
],
),
),
],
],
),
),
),
),
// getLine(),
), // getLine(),
SizedBox(
height: 30.rpx,
),
@@ -314,7 +312,7 @@ class Smys extends GetView<SleepingHabitController> {
width: double.infinity,
decoration: BoxDecoration(),
child: Text(
'*注：开启睡眠隐私功能后，在设置的时间段内，将不会采集您的睡眠数据。',
'*注：开启睡眠隐私功能后，在设置的时间段内，将不会采集您的睡眠数据。'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7),

497
lib/pages/mh_page/user/page/rxhx_mht.dart
View File

@@ -219,52 +219,6 @@ class _RxhxMhtState extends State<RxhxMht> {
],
),
),
// leading: returnIconButtomAddCallback(() {
// controller.saveDataApi();
// }),
// Container(
// width: double.infinity,
// height: 70.rpx,
// child: Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Text(
// '柔性唤醒',
// style: TextStyle(
// fontFamily: 'Readex Pro',
// color: Colors.white,
// letterSpacing: 0,
// fontSize: 30.rpx),
// ),
// InkWell(
// onTap: () {
// alarmChange();
// },
// child: Container(
// margin: EdgeInsets.only(right: 30.rpx),
// width: 140.rpx,
// height: 66.rpx,
// alignment: Alignment.center,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(5),
// color: stringToColor("#182B7C")),
// child: Text(
// "保存",
// style: FlutterFlowTheme.of(context)
// .bodyMedium
// .override(
// fontFamily: 'Readex Pro',
// color: stringToColor("#9EA4B7"),
// letterSpacing: 0,
// fontSize: 30.rpx),
// ),
// ),
// )
// ],
// ),
// ),
actions: [],
centerTitle: false,
),
@@ -343,39 +297,40 @@ class _RxhxMhtState extends State<RxhxMht> {
),
),
getLine(),
Container(
margin: EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'唤醒时间',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr: controller.model.rxhxWakeTime,
title: "唤醒时间", checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.rxhxWakeTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
print("$d");
});
},
child: Container(
margin:
EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'唤醒时间',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
),
),
InkWell(
onTap: () async {
showDayTimeSelectionDialog(context,
dayTimeArr: controller.model.rxhxWakeTime,
title: "唤醒时间", checkChange: (d) {
controller.attr.update((getmodel) {
getmodel.model.rxhxWakeTime = [
int.parse("${d[0]}"),
int.parse("${d[1]}")
];
});
print("$d");
});
},
child: Row(
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
@@ -399,133 +354,134 @@ class _RxhxMhtState extends State<RxhxMht> {
))
],
),
),
],
],
),
),
),
getLine(),
Container(
margin: EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'按摩',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
),
InkWell(
onTap: () {
showOneSelectionDialog(
context,
arr: ['开', "关"],
checkIndex:
controller.model.rxhxIsAnMo ? 0 : 1,
title: "按摩",
checkChange: (index) {
controller.attr.update((getmodel) {
getmodel.model.rxhxIsAnMo =
index == 0 ? true : false;
});
},
);
},
child: Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
controller.model.rxhxIsAnMo ? '开' : '关',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
InkWell(
onTap: () {
showOneSelectionDialog(
context,
arr: ['开', "关"],
checkIndex: controller.model.rxhxIsAnMo ? 0 : 1,
title: "按摩",
checkChange: (index) {
controller.attr.update((getmodel) {
getmodel.model.rxhxIsAnMo =
index == 0 ? true : false;
});
},
);
},
child: Container(
margin:
EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'按摩',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
SizedBox(
width: 16.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture.asset(
'assets/img/icon/expand_more.svg',
),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
controller.model.rxhxIsAnMo ? '开' : '关',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
))
],
),
),
],
),
fontSize: 26.rpx,
letterSpacing: 0,
),
),
SizedBox(
width: 16.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture.asset(
'assets/img/icon/expand_more.svg',
color: Colors.white,
))
],
),
],
)),
),
getLine(),
Container(
margin: EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'唤醒部位',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
),
InkWell(
onTap: () {
showOneSelectionDialog(
context,
arr: location,
checkIndex: controller.model.rxhxLocation,
title: "唤醒部位",
checkChange: (index) {
controller.attr.update((getmodel) {
getmodel.model.rxhxLocation = index;
});
},
);
},
child: Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
location[controller.model.rxhxLocation],
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
InkWell(
onTap: () {
showOneSelectionDialog(
context,
arr: location,
checkIndex: controller.model.rxhxLocation,
title: "唤醒部位",
checkChange: (index) {
controller.attr.update((getmodel) {
getmodel.model.rxhxLocation = index;
});
},
);
},
child: Container(
margin:
EdgeInsets.only(left: 40.rpx, right: 30.rpx),
width: double.infinity,
height: 90.rpx,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
'唤醒部位',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0,
),
SizedBox(
width: 16.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture.asset(
'assets/img/icon/expand_more.svg',
),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Text(
location[controller.model.rxhxLocation],
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
))
],
),
),
],
),
fontSize: 26.rpx,
letterSpacing: 0,
),
),
SizedBox(
width: 16.rpx,
),
Container(
height: 30.rpx,
width: 30.rpx,
child: SvgPicture.asset(
'assets/img/icon/expand_more.svg',
color: Colors.white,
))
],
),
],
)),
),
getLine(),
Container(
@@ -550,65 +506,120 @@ class _RxhxMhtState extends State<RxhxMht> {
letterSpacing: 0,
),
),
// Padding(
// padding: EdgeInsetsDirectional.fromSTEB(
// 0, 20.rpx, 0, 0),
// child: Container(
// width: double.infinity,
// height:
// MediaQuery.sizeOf(context).height * 0.046,
// decoration: const BoxDecoration(),
// child: Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
// children: [
// ...List.generate(7, (index) {
// return InkWell(
// onTap: () {
// controller.attr.update((getmodel) {
// getmodel.model
// .rxhxWeeks[index] = getmodel
// .model
// .rxhxWeeks[index] ==
// 0
// ? 1
// : 0;
// });
// },
// child: AspectRatio(
// aspectRatio: 1,
// child: ClipOval(
// child: Container(
// height: double.infinity,
// decoration: BoxDecoration(
// color: controller.model
// .rxhxWeeks[
// index] ==
// 1
// ? Color(0xFF84F5FF)
// : Color(0XFF003058)),
// child: Center(
// child: Text(
// weeks[index],
// style: TextStyle(
// color: controller.model
// .rxhxWeeks[
// index] ==
// 1
// ? Color(0XFF003058)
// : Colors.white),
// ),
// ),
// ),
// ),
// ),
// );
// }),
// ],
// ),
// ),
// ),
Padding(
padding: EdgeInsetsDirectional.fromSTEB(
0, 20.rpx, 0, 0),
child: Container(
child: SizedBox(
width: double.infinity,
height:
MediaQuery.sizeOf(context).height * 0.046,
decoration: const BoxDecoration(),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
...List.generate(7, (index) {
return InkWell(
onTap: () {
controller.attr.update((getmodel) {
getmodel.model
.rxhxWeeks[index] = getmodel
.model
.rxhxWeeks[index] ==
0
? 1
: 0;
});
},
child: AspectRatio(
aspectRatio: 1,
child: ClipOval(
child: Container(
height: double.infinity,
decoration: BoxDecoration(
color: controller.model
.rxhxWeeks[
index] ==
1
? Color(0xFF84F5FF)
: Color(0XFF003058)),
child: Center(
child: Text(
weeks[index],
style: TextStyle(
color: controller.model
.rxhxWeeks[
index] ==
1
? Color(0XFF003058)
: Colors.white),
),
),
),
children: List.generate(7, (index) {
final bool selected =
controller.model.rxhxWeeks[index] ==
1;
return InkWell(
onTap: () {
controller.attr.update((getmodel) {
getmodel.model.rxhxWeeks[index] =
getmodel.model
.rxhxWeeks[index] ==
0
? 1
: 0;
});
},
borderRadius: BorderRadius.circular(
50), // 点击水波圆角区域
child: Container(
width: MediaQuery.sizeOf(context)
.height *
0.046, // 保证是正圆
height: MediaQuery.sizeOf(context)
.height *
0.046,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: selected
? const Color(0xFF84F5FF)
: const Color(0xFF003058),
),
alignment: Alignment.center,
child: Text(
weeks[index],
style: TextStyle(
color: selected
? const Color(0xFF003058)
: Colors.white,
),
),
);
}),
],
),
);
}),
),
),
),
)
],
),
),
@@ -624,7 +635,7 @@ class _RxhxMhtState extends State<RxhxMht> {
'*注：开启该功能后，在设置的时间点，设备将启动一段固定时长的柔性唤醒功能。',
style: TextStyle(
fontFamily: 'Readex Pro',
color: Colors.white,
color: Color(0xFF929699),
fontSize: 20.rpx,
letterSpacing: 0,
),

126
lib/pages/mh_page/user_agreement_page.dart Normal file
View File

@@ -0,0 +1,126 @@
import 'package:ef/ef.dart';
import 'package:flutter/material.dart';
import 'package:flutter_pdfview/flutter_pdfview.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/controller/setting/pdf/UserPdfController.dart';
class UserAgreementPage extends StatefulWidget {
UserAgreementPage({super.key});
@override
State<UserAgreementPage> createState() => _UserAgreementPageState();
}
class _UserAgreementPageState extends State<UserAgreementPage> {
UserPdfController pdfController = Get.find();
@override
void initState() {
super.initState();
String language = "zh_CN"; // 默认语言
if (languageController.selectLanguage?.value?.language_code != null) {
language = languageController.selectLanguage!.value!.language_code!;
}
int ent_type = AppConstants().ent_type;
// 根据 ent_type 拼接不同的文件名
String pdfName =
ent_type == 1 ? "$language.pdf" : "${language}_$ent_type.pdf";
pdfController.loadPdf(
1,
"https://vsbst-api.he-info.cn/vsbs_sotrage/user-scheme/$pdfName",
);
}
@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (context, bodySize) => GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: Container(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/new_background.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
),
),
child: Scaffold(
backgroundColor: Colors.transparent, // 加上这一行
appBar: AppBar(
backgroundColor: Colors.transparent,
automaticallyImplyLeading: false,
iconTheme: IconThemeData(
color: themeController.currentColor.sc3,
),
titleSpacing: 0,
// leading: returnIconButtom,
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,
),
),
/// 左边返回按钮
Positioned(
left: 20,
child: returnIconButtomNew,
),
],
),
),
actions: [],
centerTitle: false,
),
body: SafeArea(
top: true,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 0.rpx),
child: Column(
children: [
Expanded(
child: Obx(() {
if (pdfController.localPdfPath.value == null) {
return Center(child: CircularProgressIndicator());
} else {
return PDFView(
filePath: pdfController.localPdfPath.value!,
autoSpacing: false,
enableSwipe: true,
swipeHorizontal: false,
pageSnap: true,
fitEachPage: true,
defaultPage: 0,
onRender: (pages) => print('PDF 渲染完成，共 $pages 页'),
onError: (error) => print('PDF 加载错误: $error'),
);
}
}),
),
],
),
),
),
),
),
),
);
}
}

4
lib/pages/sleep_report/mht_new_sleep_report_page.dart
View File

@@ -179,8 +179,8 @@ class _MHTNewSleepReportPageState extends State<MHTNewSleepReportPage> {
if (widget.data['arrow'] == null ||
widget.data['arrow'] == true)
Positioned(
left: 0,
child: returnIconButtom,
left: 20,
child: returnIconButtomNew,
),
],
),

4
lib/pages/sleep_report/new_sleep_report_page copy.dart
View File

@@ -122,8 +122,8 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
/// 左边返回按钮
Positioned(
left: 0,
child: returnIconButtom,
left: 20,
child: returnIconButtomNew,
),
],
),

4
lib/pages/sleep_report/new_sleep_report_page.dart
View File

@@ -188,8 +188,8 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
if (widget.data['arrow'] == null ||
widget.data['arrow'] == true)
Positioned(
left: 0,
child: returnIconButtom,
left: 20,
child: returnIconButtomNew,
),
],
),

2
lib/pages/sleep_report/sleep_report_page.dart
View File

@@ -77,7 +77,7 @@ class _SleepReportPageState extends State<SleepReportPage> {
/// 左边返回按钮
Positioned(
left: 0,
child: returnIconButtom,
child: returnIconButtomNew,
),
],
),

16
lib/pages/user/about_us_page.dart
View File

@@ -57,15 +57,13 @@ class _AboutUsPageState extends State<AboutUsPage> {
alignment: Alignment.center,
children: [
/// 居中标题
Text(
'关于我们'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: 30.rpx,
),
),
Text('关于我们'.tr,
style: TextStyle(
fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: 30.rpx,
)),
/// 左边返回按钮
Positioned(

7
lib/routers/mh_routers.dart
View File

@@ -1,5 +1,6 @@
import 'package:ef/ef.dart';
import 'package:flutter/cupertino.dart';
import 'package:path/path.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
@@ -8,6 +9,7 @@ import 'package:vbvs_app/main.dart';
import 'package:vbvs_app/pages/main_bottom/component/main_page_b_bottom_change.dart';
import 'package:vbvs_app/pages/mh_page/HomeDeviceType.dart';
import 'package:vbvs_app/pages/mh_page/LanguagePage.dart';
import 'package:vbvs_app/pages/mh_page/about_us.dart';
import 'package:vbvs_app/pages/mh_page/address_list_page.dart';
import 'package:vbvs_app/pages/mh_page/applyRepair/apply_repair_success.dart';
import 'package:vbvs_app/pages/mh_page/apply_repair_page.dart';
@@ -25,6 +27,7 @@ import 'package:vbvs_app/pages/mh_page/device_share_page.dart';
import 'package:vbvs_app/pages/mh_page/edit_bed.dart';
import 'package:vbvs_app/pages/mh_page/help/article.dart';
import 'package:vbvs_app/pages/mh_page/homepage/new_Home_page.dart';
import 'package:vbvs_app/pages/mh_page/privacy_policy.dart';
import 'package:vbvs_app/pages/mh_page/user/page/edit_userinfo_page.dart';
import 'package:vbvs_app/pages/mh_page/experience_store_page.dart';
import 'package:vbvs_app/pages/mh_page/issue_list_page.dart';
@@ -40,6 +43,7 @@ import 'package:vbvs_app/pages/mh_page/user/page/find_password_page.dart';
import 'package:vbvs_app/pages/mh_page/user/page/mht_login_page.dart';
import 'package:vbvs_app/pages/mh_page/user/page/rxhx_mht.dart';
import 'package:vbvs_app/pages/mh_page/user/page/update_password_page.dart';
import 'package:vbvs_app/pages/mh_page/user_agreement_page.dart';
import 'package:vbvs_app/pages/sleep_report/new_sleep_report_page.dart';
import '../pages/mh_page/bluetooth.dart';
import '../pages/mh_page/edit_address_page.dart';
@@ -98,6 +102,9 @@ var mhroutes = {
"/helpArticle": (contxt, {arguments}) => HelpArticle(article: arguments),
"/mHTPeopleInfoPage": (contxt) => MHTPeopleInfoPage(),
"/applyRepairSuccess": (contxt) => ApplyRepairSuccess(),
"/aboutUs": (contxt) => MhAboutUsPage(),
"/userAgreementPage": (context) => UserAgreementPage(),
"/privacyPolicyPage": (context) => PrivacyPolicyPage(),
};
var mhonGenerateRoute = (RouteSettings settings) {
final String? name = settings.name; // 获取路由名称，如 /news 或 /search