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-07-08 18:30:02 +08:00
parent a5fd8d7d04
commit 37a1615234
7 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/miniapp/mhtControl_1.0.0.zip
View File

Binary file not shown.

2
lib/pages/mh_page/component/mht_bind_dialog.dart
View File

@@ -251,7 +251,7 @@ Future<void> showHaveBindDialog(BuildContext context) async {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
'知道了'.tr, '返回'.tr,
style: TextStyle( style: TextStyle(
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
fontFamily: 'Inter', fontFamily: 'Inter',

6
lib/pages/mh_page/device/mht_wifi_page.dart
View File

@@ -107,12 +107,14 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
// 导航到下一页 // 导航到下一页
if (blueteethBindController.wifiStatus.value != 1) { if (blueteethBindController.wifiStatus.value != 1) {
showConfirmDialog(context, Container(), "未配置网络提示".tr, onConfirm: () { showConfirmDialog(context, Container(), "未配置网络提示".tr, onConfirm: () async {
_cleanupResources(); _cleanupResources();
await _disconnectDevice();
Get.toNamed("/calibrationPage"); Get.toNamed("/calibrationPage");
}, onCancel: () {}); }, onCancel: () {});
} else { } else {
_cleanupResources(); _cleanupResources();
await _disconnectDevice();
Get.toNamed("/calibrationPage"); Get.toNamed("/calibrationPage");
} }
} }
@@ -1101,7 +1103,7 @@ class _MHTWifiPageState extends State<MHTWifiPage> {
); );
} }
void _disconnectDevice() async { Future<void> _disconnectDevice() async {
try { try {
THapp bledevice = THapp(device: widget.deviceInfo.scanResult.device); THapp bledevice = THapp(device: widget.deviceInfo.scanResult.device);
await bledevice.disconnect(); await bledevice.disconnect();

43
lib/pages/mh_page/homepage/mht_sleep_report_page.dart
View File

@@ -77,10 +77,45 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
Obx(() { Obx(() {
if (userInfoController.model.login! == null || if (userInfoController.model.login! == null ||
userInfoController.model.login! == 0) { userInfoController.model.login! == 0) {
return Text( return Center(
"登录查看睡眠报告".tr, child: InkWell(
style: onTap: () => Get.toNamed("/loginPage"),
TextStyle(color: Colors.white, fontSize: 30.rpx), child: RichText(
text: TextSpan(
children: [
WidgetSpan(
child: Stack(
children: [
Text(
"登录",
style: TextStyle(
color: stringToColor("#84F5FF"),
fontSize: 30.rpx,
),
),
Positioned(
bottom: 0, // 控制下划线与文字的间距
left: 0,
right: 0,
child: Container(
height: 1, // 下划线粗细
color: stringToColor("#84F5FF"),
),
),
],
),
),
TextSpan(
text: "查看睡眠报告",
style: TextStyle(
color: Colors.white,
fontSize: 30.rpx,
),
),
],
),
),
),
); );
} }
return Container(); return Container();

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

@@ -16,6 +16,7 @@ import 'package:vbvs_app/controller/mh_controller/people_info_controller.dart';
import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/common/selectDialog.dart';
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.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 PeopleInfoPage extends GetView<PeopleInfoController> { class PeopleInfoPage extends GetView<PeopleInfoController> {
Map data; Map data;
@@ -134,6 +135,10 @@ class PeopleInfoPage extends GetView<PeopleInfoController> {
MHTHomeController mhtHomeController = MHTHomeController mhtHomeController =
Get.find(); Get.find();
mhtHomeController.getPersonList(); mhtHomeController.getPersonList();
WebviewTestController
webviewTestController = Get.find();
webviewTestController
.queryPersonInfoByMac();
} catch (e) { } catch (e) {
print("保存失败：$e"); print("保存失败：$e");
TopSlideNotification.show(context, TopSlideNotification.show(context,

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

@@ -1447,6 +1447,8 @@ class MHTLoginPage extends GetView<MHTLoginController> {
// "/#/pages/agreement/agreement?type=2&hideHead=true", // "/#/pages/agreement/agreement?type=2&hideHead=true",
// btnName: // btnName:
// "同意并继续"); // "同意并继续");
Get.toNamed(
"/userAgreementPage");
}, },
child: Text( child: Text(
'《用户协议》'.tr, '《用户协议》'.tr,
@@ -1491,6 +1493,8 @@ class MHTLoginPage extends GetView<MHTLoginController> {
// "/#/pages/agreement/agreement?type=1&hideHead=true", // "/#/pages/agreement/agreement?type=1&hideHead=true",
// btnName: // btnName:
// "同意并继续"); // "同意并继续");
Get.toNamed(
"/privacyPolicyPage");
}, },
child: Text( child: Text(
'《隐私协议》'.tr, '《隐私协议》'.tr,

4
lib/routers/mh_routers.dart
View File

@@ -129,7 +129,9 @@ var mhonGenerateRoute = (RouteSettings settings) {
settings.name != "/otherLoginPage" && settings.name != "/otherLoginPage" &&
settings.name != "/mianPageBottomChange" && settings.name != "/mianPageBottomChange" &&
settings.name != "/registerPage" && settings.name != "/registerPage" &&
settings.name != "/findPasswordPage") { settings.name != "/findPasswordPage" &&
settings.name != "/userAgreementPage" &&
settings.name != "/privacyPolicyPage") {
// TopSlideNotification.show( // TopSlideNotification.show(
// navigatorKey.currentContext!, // navigatorKey.currentContext!,
// text: "必须登录提示".tr, // text: "必须登录提示".tr,