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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
czz
2025-07-25 10:27:07 +08:00
parent 052dc2f42a 19568913bb
commit 244018e103
11 changed files with 256 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/file.json
View File

@@ -1,3 +1,3 @@
[ [
"assets/miniapp/mhtControl_1.0.31.zip" "assets/miniapp/mhtControl_1.0.35.zip"
] ]

BIN
assets/miniapp/mhtControl_1.0.31.zip → assets/miniapp/mhtControl_1.0.35.zip
View File

Binary file not shown.

2
lib/controller/user_info_controller.dart
View File

@@ -212,7 +212,7 @@ class UserInfoController extends GetControllerEx<UserInfoModel> {
box.write('user', userInfoController.model.user!.toJson()); // 存储用户信息 box.write('user', userInfoController.model.user!.toJson()); // 存储用户信息
userInfoController.updateAll(); userInfoController.updateAll();
} }
return apiResponse; return res;
} else { } else {
return ApiResponse(code: -1, msg: "服务器.失败".tr); return ApiResponse(code: -1, msg: "服务器.失败".tr);
} }

26
lib/main.dart
View File

@@ -64,6 +64,7 @@ import 'package:vbvs_app/controller/time/countdown_controller.dart';
import 'package:vbvs_app/controller/weather/weather_controller.dart'; import 'package:vbvs_app/controller/weather/weather_controller.dart';
import 'package:vbvs_app/language/AppLanguage.dart'; import 'package:vbvs_app/language/AppLanguage.dart';
import 'package:vbvs_app/model/CustomThemeColor.dart'; import 'package:vbvs_app/model/CustomThemeColor.dart';
import 'package:vbvs_app/model/api_response.dart';
import 'package:vbvs_app/model/user_data.dart'; import 'package:vbvs_app/model/user_data.dart';
import 'package:vbvs_app/pages/mh_page/MattressControl.dart'; import 'package:vbvs_app/pages/mh_page/MattressControl.dart';
import 'package:vbvs_app/pages/mh_page/device/component/mht_device_calibration_controller.dart'; import 'package:vbvs_app/pages/mh_page/device/component/mht_device_calibration_controller.dart';
@@ -257,6 +258,21 @@ Future<void> initLogin() async {
final box = GetStorage(); final box = GetStorage();
UserInfoController userInfoController = Get.find(); UserInfoController userInfoController = Get.find();
String? token = box.read('token'); String? token = box.read('token');
if (token != null) {
// 根据token去请求
// await userInfoController.autoLogin(token);
EasyDartModule.dio.token = token;
ApiResponse apiResponse = await userInfoController.getUserInfo();
if (apiResponse.code != 1) {
userInfoController.model.login = 0;
EasyDartModule.dio.token = null;
} else {
userInfoController.model.login = 1;
}
} else {
// 如果没有 token，则将用户标记为未登录
userInfoController.model.login = 0;
}
try { try {
Map<String, dynamic>? userMap = box.read('user'); Map<String, dynamic>? userMap = box.read('user');
if (userMap != null) { if (userMap != null) {
@@ -266,16 +282,6 @@ Future<void> initLogin() async {
} catch (e) { } catch (e) {
print(e); print(e);
} }
if (token != null) {
userInfoController.model.login = 1;
// 根据token去请求
// await userInfoController.autoLogin(token);
EasyDartModule.dio.token = token;
} else {
// 如果没有 token，则将用户标记为未登录
userInfoController.model.login = 0;
}
} }
//处理绑定未完成的数据 //处理绑定未完成的数据

4
lib/pages/mh_page/device/mht_people_info.dart
View File

@@ -599,7 +599,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
MainAxisAlignment.spaceBetween, MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
'联系人', '联系方式'.tr,
style: TextStyle( style: TextStyle(
fontFamily: 'Readex Pro', fontFamily: 'Readex Pro',
color: Color(0xFF9EA4B7), color: Color(0xFF9EA4B7),
@@ -622,7 +622,7 @@ class _MHTPeopleInfoPageState extends State<MHTPeopleInfoPage> {
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Colors.transparent, fillColor: Colors.transparent,
filled: true, filled: true,
hintText: "请输入联系人", hintText: "请输入联系方式",
hintStyle: TextStyle( hintStyle: TextStyle(
color: Colors.white), color: Colors.white),
border: InputBorder.none, border: InputBorder.none,

6
lib/pages/mh_page/homepage/controller/mht_home_controller.dart
View File

@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:EasyDartModule/EasyDartModule.dart'; import 'package:EasyDartModule/EasyDartModule.dart';
import 'package:ef/ef.dart'; import 'package:ef/ef.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:vbvs_app/common/color/ServiceConstant.dart'; import 'package:vbvs_app/common/color/ServiceConstant.dart';
@@ -9,6 +10,7 @@ import 'package:vbvs_app/common/color/app_uri_status.dart';
import 'package:vbvs_app/common/util/DailyLogUtils.dart'; import 'package:vbvs_app/common/util/DailyLogUtils.dart';
import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/common/util/requestWithLog.dart'; import 'package:vbvs_app/common/util/requestWithLog.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/model/api_response.dart';
part 'mht_home_controller.g.dart'; // 由json_serializable自动生成的部分 part 'mht_home_controller.g.dart'; // 由json_serializable自动生成的部分
@@ -480,7 +482,7 @@ class MHTHomeController extends GetControllerEx<MHTHomeModel> {
); );
} }
Future<void> getHomeSleeps(String? mac) async { Future<void> getHomeSleeps(String? mac, BuildContext context) async {
String serviceAddress = ServiceConstant.service_address; String serviceAddress = ServiceConstant.service_address;
String serviceName = ServiceConstant.server_service; String serviceName = ServiceConstant.server_service;
String serviceApi = ServiceConstant.sleep_report; String serviceApi = ServiceConstant.sleep_report;
@@ -544,6 +546,8 @@ class MHTHomeController extends GetControllerEx<MHTHomeModel> {
}, },
onFailure: (res) { onFailure: (res) {
EasyDartModule.logger.warning("请求睡眠信息列表失败: ${res.msg}"); EasyDartModule.logger.warning("请求睡眠信息列表失败: ${res.msg}");
TopSlideNotification.show(context,
text: "请求失败".tr, textColor: themeController.currentColor.sc9);
}, },
); );
} }

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

@@ -308,55 +308,108 @@ class _NewHomePageState extends State<NewHomePage> {
Obx(() { Obx(() {
if (userInfoController.model.login! == null || if (userInfoController.model.login! == null ||
userInfoController.model.login! == 0) { userInfoController.model.login! == 0) {
// return Padding(
// padding: EdgeInsetsDirectional.fromSTEB(
// 30.rpx, 0, 30.rpx, 80.rpx),
// child: ClickableContainer(
// backgroundColor: Colors.transparent,
// highlightColor: Colors.transparent,
// padding: EdgeInsets.all(0),
// onTap: () {
// if (userInfoController.model.login == null ||
// userInfoController.model.login == 0) {
// TopSlideNotification.show(context,
// text: "请先登录".tr,
// textColor: themeController.currentColor.sc9);
// Get.toNamed("/loginPage");
// } else {
// Get.toNamed("/mHTDeviceTypePage");
// }
// },
// child: Container(
// width: MediaQuery.sizeOf(context).width,
// height: 302.rpx,
// padding:
// EdgeInsets.only(top: 90.rpx, bottom: 80.rpx),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(borderRadius),
// border: Border.all(
// color: stringToColor("#85F5FF"), // 边框颜色
// width: 1.rpx, // 边框宽度
// ),
// ),
// child: Column(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.center,
// children: [
// SvgPicture.asset(
// 'assets/images/icon/add.svg',
// width: 42.rpx,
// height: 42.rpx,
// ),
// SizedBox(
// height: 32.rpx,
// ),
// Text(
// '添加一台新设备'.tr,
// style: TextStyle(
// color: stringToColor("#85F5FF"),
// fontSize:
// AppConstants().normal_text_fontSize,
// letterSpacing: 0,
// ),
// ),
// ],
// ),
// ),
// ),
// );
return Padding( return Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0, 30.rpx, 80.rpx), 30.rpx, 0.rpx, 30.rpx, 100.rpx),
child: ClickableContainer( child: ClickableContainer(
backgroundColor: Colors.transparent,
highlightColor: Colors.transparent,
padding: EdgeInsets.all(0),
onTap: () { onTap: () {
if (userInfoController.model.login == null || // 点击逻辑
userInfoController.model.login == 0) { Get.toNamed("/mHTDeviceTypePage");
TopSlideNotification.show(context,
text: "请先登录".tr,
textColor: themeController.currentColor.sc9);
Get.toNamed("/loginPage");
} else {
Get.toNamed("/mHTDeviceTypePage");
}
}, },
backgroundColor: Colors.transparent,
highlightColor: themeController.currentColor
.sc21, // 这里可以自定义高亮色，透明就用 Colors.transparent
borderRadius: borderRadius,
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0, 0.rpx, 0),
child: Container( child: Container(
width: MediaQuery.sizeOf(context).width, height: 92.rpx,
height: 302.rpx, alignment: Alignment.center,
padding:
EdgeInsets.only(top: 90.rpx, bottom: 80.rpx),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(borderRadius),
border: Border.all( border: Border.all(
color: stringToColor("#85F5FF"), // 边框颜色 color: stringToColor("#85F5FF"), // 边框颜色
width: 1.rpx, // 边框宽度 width: 1.rpx, // 边框宽度
), ),
borderRadius: BorderRadius.circular(borderRadius),
), ),
child: Column( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
// Icon(
// Icons.add,
// size: 60.rpx,
// color: stringToColor("#85F5FF"),
// ),
SvgPicture.asset( SvgPicture.asset(
'assets/images/icon/add.svg', 'assets/images/icon/add.svg',
width: 42.rpx, width: 42.rpx,
height: 42.rpx, height: 42.rpx,
), ),
SizedBox( SizedBox(width: 20.rpx),
height: 32.rpx,
),
Text( Text(
'添加一台新设备'.tr, '添加新设备'.tr,
style: TextStyle( style: TextStyle(
fontFamily: 'Readex Pro',
color: stringToColor("#85F5FF"), color: stringToColor("#85F5FF"),
fontSize:
AppConstants().normal_text_fontSize,
letterSpacing: 0, letterSpacing: 0,
fontSize: 26.rpx,
), ),
), ),
], ],
@@ -381,8 +434,8 @@ class _NewHomePageState extends State<NewHomePage> {
personInfo.value = list[0]; personInfo.value = list[0];
homeController.selectPerson.value = list[0]; homeController.selectPerson.value = list[0];
homeController.selectDevcie.value = list[0]["mac"]; homeController.selectDevcie.value = list[0]["mac"];
deviceController deviceController.getHomeSleeps(
.getHomeSleeps(formFieldController.value); formFieldController.value, context);
homeController.updateAll(); homeController.updateAll();
}); });
} }
@@ -492,7 +545,8 @@ class _NewHomePageState extends State<NewHomePage> {
deviceController deviceController
.getHomeSleeps( .getHomeSleeps(
formFieldController formFieldController
.value); .value,
context);
homeController homeController
.updateAll(); .updateAll();
} }
@@ -741,59 +795,113 @@ class _NewHomePageState extends State<NewHomePage> {
), ),
), ),
if (homeController.bindDeviceNum.value == 0) if (homeController.bindDeviceNum.value == 0)
// Padding(
// padding: EdgeInsetsDirectional.fromSTEB(
// 30.rpx, 0, 30.rpx, 80.rpx),
// child: ClickableContainer(
// backgroundColor: Colors.transparent,
// highlightColor: Colors.transparent,
// padding: EdgeInsets.all(0),
// onTap: () {
// if (userInfoController.model.login ==
// null ||
// userInfoController.model.login == 0) {
// TopSlideNotification.show(context,
// text: "请先登录".tr,
// textColor:
// themeController.currentColor.sc9);
// Get.toNamed("/loginPage");
// } else {
// Get.toNamed("/mHTDeviceTypePage");
// }
// },
// child: Container(
// width: MediaQuery.sizeOf(context).width,
// height: 302.rpx,
// padding: EdgeInsets.only(
// top: 90.rpx, bottom: 80.rpx),
// decoration: BoxDecoration(
// borderRadius:
// BorderRadius.circular(borderRadius),
// border: Border.all(
// color: stringToColor("#85F5FF"), // 边框颜色
// width: 1.rpx, // 边框宽度
// ),
// ),
// child: Column(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment:
// MainAxisAlignment.center,
// children: [
// SvgPicture.asset(
// 'assets/images/icon/add.svg',
// width: 42.rpx,
// height: 42.rpx,
// ),
// SizedBox(
// height: 32.rpx,
// ),
// Text(
// '添加一台新设备'.tr,
// style: TextStyle(
// color: stringToColor("#85F5FF"),
// fontSize: AppConstants()
// .normal_text_fontSize,
// letterSpacing: 0,
// ),
// ),
// ],
// ),
// ),
// ),
// ),
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0, 30.rpx, 80.rpx), 30.rpx, 0.rpx, 30.rpx, 100.rpx),
child: ClickableContainer( child: ClickableContainer(
backgroundColor: Colors.transparent,
highlightColor: Colors.transparent,
padding: EdgeInsets.all(0),
onTap: () { onTap: () {
if (userInfoController.model.login == // 点击逻辑
null || Get.toNamed("/mHTDeviceTypePage");
userInfoController.model.login == 0) {
TopSlideNotification.show(context,
text: "请先登录".tr,
textColor:
themeController.currentColor.sc9);
Get.toNamed("/loginPage");
} else {
Get.toNamed("/mHTDeviceTypePage");
}
}, },
backgroundColor: Colors.transparent,
highlightColor: themeController.currentColor
.sc21, // 这里可以自定义高亮色，透明就用 Colors.transparent
borderRadius: borderRadius,
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0, 0.rpx, 0),
child: Container( child: Container(
width: MediaQuery.sizeOf(context).width, height: 92.rpx,
height: 302.rpx, alignment: Alignment.center,
padding: EdgeInsets.only(
top: 90.rpx, bottom: 80.rpx),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(borderRadius),
border: Border.all( border: Border.all(
color: stringToColor("#85F5FF"), // 边框颜色 color: stringToColor("#85F5FF"), // 边框颜色
width: 1.rpx, // 边框宽度 width: 1.rpx, // 边框宽度
), ),
borderRadius:
BorderRadius.circular(borderRadius),
), ),
child: Column( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.min,
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
// Icon(
// Icons.add,
// size: 60.rpx,
// color: stringToColor("#85F5FF"),
// ),
SvgPicture.asset( SvgPicture.asset(
'assets/images/icon/add.svg', 'assets/images/icon/add.svg',
width: 42.rpx, width: 42.rpx,
height: 42.rpx, height: 42.rpx,
), ),
SizedBox( SizedBox(width: 20.rpx),
height: 32.rpx,
),
Text( Text(
'添加一台新设备'.tr, '添加新设备'.tr,
style: TextStyle( style: TextStyle(
fontFamily: 'Readex Pro',
color: stringToColor("#85F5FF"), color: stringToColor("#85F5FF"),
fontSize: AppConstants()
.normal_text_fontSize,
letterSpacing: 0, letterSpacing: 0,
fontSize: 26.rpx,
), ),
), ),
], ],

41
lib/pages/mh_page/message/messageDetail.dart
View File

@@ -10,6 +10,8 @@ import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/mh_controller/message_controller.dart'; import 'package:vbvs_app/controller/mh_controller/message_controller.dart';
import 'package:vbvs_app/controller/mh_controller/mhdevice_share_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/model/api_response.dart';
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
class MessageDetailPage extends StatefulWidget { class MessageDetailPage extends StatefulWidget {
final data; final data;
@@ -183,6 +185,45 @@ class _MessageDetailPageState extends State<MessageDetailPage> {
messageController.getMessageList(widget.data['type']); messageController.getMessageList(widget.data['type']);
messageController.updateAll(); messageController.updateAll();
//todo 更新设备列表 //todo 更新设备列表
MHTHomeController homeController = Get.find();
//更新设备列表
homeController.getPersonList();
//请求绑定设备列表
// homeController.getSleepReport();
homeController.getDeviceNum().then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {
TopSlideNotification.show(
Get.context!,
text: apiResponse.msg!,
textColor: themeController.currentColor.sc9,
);
}
});
homeController.getDeviceList(group: 'room').then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {
try {
WebviewTestController webviewTestController = Get.find();
webviewTestController.web.jsbridge?.dart.alterDevice();
} catch (e) {
ef.log("[h5]通知列表更新报错：$e");
}
TopSlideNotification.show(
Get.context!,
text: apiResponse.msg!,
textColor: themeController.currentColor.sc9,
);
} else {
//请求睡眠报告
// deviceController.getSleepReport();
}
});
WidgetsBinding.instance.addPostFrameCallback((_) {
if (homeController.homeSleepDays.value.isNotEmpty) {
homeController.selectedDayIndex.value =
homeController.homeSleepDays.value.length - 1;
}
});
await homeController.getPersonList();
} else { } else {
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: apiResponse.msg!, textColor: Color(0XFFFF7159)); text: apiResponse.msg!, textColor: Color(0XFFFF7159));

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

@@ -318,6 +318,20 @@ class _MinePageState extends State<NewMinePage> {
'购买和使用智能床过程中，如果遇到疑问可与客服进行联系', '购买和使用智能床过程中，如果遇到疑问可与客服进行联系',
path: "", path: "",
onTap: () async { onTap: () async {
UserInfoController userInfoController =
Get.find();
int loginStatus =
userInfoController.model.login!;
if (loginStatus != 1) {
TopSlideNotification.show(
context,
text: "必须登录提示".tr,
textColor:
themeController.currentColor.sc9,
);
Get.toNamed("/loginPage");
return;
}
MHTLoginController mhtLoginController = MHTLoginController mhtLoginController =
Get.find<MHTLoginController>(); Get.find<MHTLoginController>();
await mhtLoginController await mhtLoginController

4
lib/pages/mh_page/test/WebviewTestModel.dart
View File

@@ -37,8 +37,8 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
web = WebviewHelper( web = WebviewHelper(
isheadless: false, isheadless: false,
jsbridge: buildsdk( jsbridge: buildsdk(
// father: this, father: this,
// clientId: '494641114', clientId: '494641114',
// dbgserverUrl: 'ws://192.168.1.2:9001', // dbgserverUrl: 'ws://192.168.1.2:9001',
), ),
settings: buildsettings(), settings: buildsettings(),

12
lib/pages/mh_page/user/page/mht_login_page.dart
View File

@@ -184,10 +184,11 @@ class MHTLoginPage extends GetView<MHTLoginController> {
} }
if (Platform.isAndroid) { if (Platform.isAndroid) {
var flag = await _handleBackPressed(context); // 自定义返回逻辑 // var flag = await _handleBackPressed(context); // 自定义返回逻辑
if (flag) { // if (flag) {
SystemNavigator.pop(); // SystemNavigator.pop();
} // }
Get.back();
} }
}, },
child: Align( child: Align(
@@ -961,10 +962,8 @@ class MHTLoginPage extends GetView<MHTLoginController> {
), ),
), ),
), ),
); );
}), }),
Obx(() { Obx(() {
return Visibility( return Visibility(
visible: controller.model.loginStyle == 2 visible: controller.model.loginStyle == 2
@@ -1221,7 +1220,6 @@ class MHTLoginPage extends GetView<MHTLoginController> {
), ),
), ),
), ),
); );
}), }),
Padding( Padding(