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-08-19 18:00:51 +08:00
parent b2cd46bc7a
commit 2cca7c7716
11 changed files with 211 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
assets/langs/en_US.json
View File

@@ -249,7 +249,7 @@
"待开发功能": "New feature coming soon", "待开发功能": "New feature coming soon",
"未知数据": "Unknown", "未知数据": "Unknown",
"在离床": "In/Out of bed", "在离床": "In/Out of bed",
"体动": "Body movement", "体动": "Motion",
"心率": "Heart rate", "心率": "Heart rate",
"打鼾": "Snoring", "打鼾": "Snoring",
"呼吸": "Respiration", "呼吸": "Respiration",
@@ -340,7 +340,7 @@
"申请记录": "Application records", "申请记录": "Application records",
"设备类型": "Device type", "设备类型": "Device type",
"发生时间": "Occurrence time", "发生时间": "Occurrence time",
"最小信号强度": "Minimum signal strength", "最小信号强度": "Signal strength",
"匹配出的外围设备": "Matched peripheral devices", "匹配出的外围设备": "Matched peripheral devices",
"连接中...": "Connecting", "连接中...": "Connecting",
"刷新": "Refresh", "刷新": "Refresh",
@@ -529,5 +529,12 @@
"公司信息": "Copyright © 2022-2025 Jiaxing Taihe Information Technology Co., Ltd. All rights reserved.", "公司信息": "Copyright © 2022-2025 Jiaxing Taihe Information Technology Co., Ltd. All rights reserved.",
"当前属于": "Current", "当前属于": "Current",
"绑定手机号码": "Bind mobile phone number", "绑定手机号码": "Bind mobile phone number",
"为了您的账号安全，验证手机号码后，可直接使用此手机号登录。": "For security, once your phone number is verified, you can log in with it directly." "为了您的账号安全，验证手机号码后，可直接使用此手机号登录。": "For security, once your phone number is verified, you can log in with it directly.",
"全选": "Select All",
"删除提示": "Are you sure you want to delete?",
"完成": "OK",
"连接": "Connect",
"下一步": "Next",
"获取wifi列表成功": "WiFi List Retrieved",
"获取wifi列表失败": "Failed to Get WiFi List"
} }

7
assets/langs/zh_CN.json
View File

@@ -536,5 +536,10 @@
"icp备案号": "ICP备案号:浙ICP备14015115号-8A", "icp备案号": "ICP备案号:浙ICP备14015115号-8A",
"公司信息": "Copyright © 2022-2025 嘉兴太和信息技术有限责任公司 版权所有", "公司信息": "Copyright © 2022-2025 嘉兴太和信息技术有限责任公司 版权所有",
"绑定手机号码": "绑定手机号码", "绑定手机号码": "绑定手机号码",
"为了您的账号安全，验证手机号码后，可直接使用此手机号登录。":"为了您的账号安全，验证手机号码后，可直接使用此手机号登录。" "为了您的账号安全，验证手机号码后，可直接使用此手机号登录。": "为了您的账号安全，验证手机号码后，可直接使用此手机号登录。",
"全选": "全选",
"删除提示": "是否确认删除？",
"连接": "连接",
"获取wifi列表成功": "获取wifi列表成功",
"获取wifi列表失败": "获取wifi列表失败"
} }

9
assets/langs/zh_TW.json
View File

@@ -526,5 +526,12 @@
"公司信息": "Copyright © 2022-2025 嘉興太和信息技術有限責任公司 版權所有", "公司信息": "Copyright © 2022-2025 嘉興太和信息技術有限責任公司 版權所有",
"当前属于": "當前", "当前属于": "當前",
"绑定手机号码": "綁定手機號碼", "绑定手机号码": "綁定手機號碼",
"为了您的账号安全，验证手机号码后，可直接使用此手机号登录。": "為了您的帳號安全，驗證手機號碼後，可直接使用此手機號登入。" "为了您的账号安全，验证手机号码后，可直接使用此手机号登录。": "為了您的帳號安全，驗證手機號碼後，可直接使用此手機號登入。",
"全选": "全選",
"刪除提示": "是否確認刪除？",
"完成": "完成",
"连接": "連接",
"下一步": "下一步",
"获取wifi列表成功": "獲取wifi列表成功",
"获取wifi列表失败": "獲取wifi列表失敗"
} }

4
lib/common/color/ServiceConstant.dart
View File

@@ -1,8 +1,8 @@
class ServiceConstant { class ServiceConstant {
// static const String baseHost = "zhmht.swes.com.cn:27021"; //服务地址 眠花糖测试地址 // static const String baseHost = "zhmht.swes.com.cn:27021"; //服务地址 眠花糖测试地址
// static const String baseHost = "zhmht.swes.com.cn:27020"; //服务地址 眠花糖正式地址 // static const String baseHost = "zhmht.swes.com.cn:27020"; //服务地址 眠花糖正式地址
// static const String baseHost = "vsbs-test.he-info.cn"; //服务地址 本地测试地址 static const String baseHost = "vsbs-test.he-info.cn"; //服务地址 本地测试地址
static const String baseHost = "vsbst-api.he-info.cn";//服务地址 // static const String baseHost = "vsbst-api.he-info.cn";//服务地址
// static const String service_address = "http://$baseHost"; // static const String service_address = "http://$baseHost";
static const String service_address = "https://$baseHost"; static const String service_address = "https://$baseHost";

2
lib/pages/device/component/DeviceStatusInfoWidget.dart
View File

@@ -33,7 +33,7 @@ class DeviceStatusInfoWidget extends StatelessWidget {
print('点击了 $title 模块'); print('点击了 $title 模块');
}, },
child: Container( child: Container(
width: MediaQuery.sizeOf(context).width * 0.32, width: MediaQuery.sizeOf(context).width * 0.36,
constraints: BoxConstraints( constraints: BoxConstraints(
minWidth: 201.rpx, minWidth: 201.rpx,
minHeight: 182.rpx, minHeight: 182.rpx,

10
lib/pages/device/instant_body_page.dart
View File

@@ -48,7 +48,7 @@ class _InstantBodyPageState extends State<InstantBodyPage>
// String snores = "否".tr; // String snores = "否".tr;
// int heartrate = 0; // int heartrate = 0;
String breathState = "-"; String breathState = "-";
String inBed ="-"; String inBed = "-";
String onlineState = "离线".tr; String onlineState = "离线".tr;
Timer? _onlineTimer; // 添加 Timer 引用 Timer? _onlineTimer; // 添加 Timer 引用
int bodyMotion = -1; int bodyMotion = -1;
@@ -109,9 +109,9 @@ class _InstantBodyPageState extends State<InstantBodyPage>
inBed = "-"; inBed = "-";
bodyMotion = -1; bodyMotion = -1;
heartrate = -1; heartrate = -1;
snores ="-"; snores = "-";
breathrate = -1; breathrate = -1;
breathState ="-"; breathState = "-";
}); });
} }
}); });
@@ -252,7 +252,7 @@ class _InstantBodyPageState extends State<InstantBodyPage>
children: [ children: [
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0.rpx, 30.rpx, 120.rpx), 30.rpx, 0.rpx, 30.rpx, 100.rpx),
child: ClickableContainer( child: ClickableContainer(
backgroundColor: themeController.currentColor.sc5, backgroundColor: themeController.currentColor.sc5,
highlightColor: themeController highlightColor: themeController
@@ -426,7 +426,7 @@ class _InstantBodyPageState extends State<InstantBodyPage>
children: [ children: [
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
66.rpx, 0, 66.rpx, 0), 30.rpx, 0, 30.rpx, 0),
child: Container( child: Container(
// decoration: BoxDecoration( // decoration: BoxDecoration(
// image: DecorationImage( // image: DecorationImage(

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

@@ -373,6 +373,16 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
), ),
ClickableContainer( ClickableContainer(
onTap: () async { onTap: () async {
if (deviceShareListController.selectedShareInfo ==
null ||
deviceShareListController
.selectedShareInfo.isEmpty) {
TopSlideNotification.show(context,
text: "删除错误提示".tr,
textColor:
themeController.currentColor.sc9);
return;
}
showConfirmDialog(context, Container(), "删除提示".tr, showConfirmDialog(context, Container(), "删除提示".tr,
onConfirm: () async { onConfirm: () async {
if (deviceShareListController if (deviceShareListController

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

@@ -267,6 +267,7 @@ class _EPageState extends State<DeviceTypePage> {
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc3,
), ),
), ),
), ),

28
lib/pages/main_bottom/e_page.dart
View File

@@ -3,8 +3,10 @@ import 'dart:convert';
import 'package:ef/ef.dart'; import 'package:ef/ef.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:vbvs_app/common/color/appConstants.dart';
import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart';
import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/FitTool.dart';
import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
import 'package:vbvs_app/controller/device/body_device_controller.dart'; import 'package:vbvs_app/controller/device/body_device_controller.dart';
@@ -12,6 +14,7 @@ import 'package:vbvs_app/controller/device/device_type_controller.dart';
import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/enum/APPPackageType.dart';
import 'package:vbvs_app/enum/LoginStatus.dart'; import 'package:vbvs_app/enum/LoginStatus.dart';
import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/model/api_response.dart';
@@ -23,7 +26,7 @@ class EPage extends StatefulWidget {
State<EPage> createState() => _EPageState(); State<EPage> createState() => _EPageState();
} }
class _EPageState extends State<EPage> { class _EPageState extends State<EPage> with AutomaticKeepAliveClientMixin {
GlobalController globalController = Get.find(); GlobalController globalController = Get.find();
UserInfoController userInfoController = Get.find(); UserInfoController userInfoController = Get.find();
BlueteethBindController blueteethBindController = Get.find(); BlueteethBindController blueteethBindController = Get.find();
@@ -34,6 +37,9 @@ class _EPageState extends State<EPage> {
RxList deviceList = [].obs; RxList deviceList = [].obs;
RxString finalUri = RxString(''); RxString finalUri = RxString('');
@override
bool get wantKeepAlive => true; // 保持页面状态
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -48,6 +54,7 @@ class _EPageState extends State<EPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); // ⚠️必须调用，保证 keepAlive 生效
bool isLoggedIn = userInfoController.model.login == LoginStatus.LOGIN.code; bool isLoggedIn = userInfoController.model.login == LoginStatus.LOGIN.code;
return LayoutBuilder( return LayoutBuilder(
@@ -73,7 +80,7 @@ class _EPageState extends State<EPage> {
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Text( Text(
'小e'.tr, '菜单.小e'.tr,
style: TextStyle( style: TextStyle(
fontFamily: 'Readex Pro', fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
@@ -226,7 +233,24 @@ class _EPageState extends State<EPage> {
finalUri.value = widget.sleepUri; finalUri.value = widget.sleepUri;
} }
} }
String? language = "";
if (AppConstants().ent_type == APPPackageType.MHT.code) {
if (mhLanguageController.selectLanguage != null) {
language = mhLanguageController.selectLanguage.value!.language_code;
}
} else {
if (languageController.selectLanguage != null) {
language = languageController.selectLanguage.value!.language_code;
}
}
if (language != null && language.isNotEmpty) {
if (finalUri.value.contains("?")) {
finalUri.value += "&lang=$language";
} else {
finalUri.value += "?lang=$language";
}
}
ef.log("msg"); ef.log("msg");
} }
} }

21
lib/pages/main_bottom/main_page_bottom_change.dart
View File

@@ -68,11 +68,11 @@ class MainPageBottomChange extends GetView<MainPageController> {
); );
} }
List arr = [ List<Widget> arr = [
HomePage(), HomePage(),
// SleepReportPage(), // SleepReportPage(),
// EPage(), // EPage(),
EPage(sleepUri:"https://xiaoe.he-info.cn/"), EPage(sleepUri: "https://xiaoe.he-info.cn/"),
MessagePage(), MessagePage(),
MinePage(), MinePage(),
]; ];
@@ -81,7 +81,7 @@ class MainPageBottomChange extends GetView<MainPageController> {
final getStorage = GetStorage(); final getStorage = GetStorage();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Future.delayed(const Duration(milliseconds: 0), () { Future.delayed(const Duration(milliseconds: 0), () {
String? isShowYingShiDialog = getStorage.read("isShowYingShiDialog"); String? isShowYingShiDialog = getStorage.read("isShowYingShiDialog");
if (isShowYingShiDialog == null || isShowYingShiDialog != "true") { if (isShowYingShiDialog == null || isShowYingShiDialog != "true") {
String btnName = "同意".tr; String btnName = "同意".tr;
@@ -134,7 +134,13 @@ class MainPageBottomChange extends GetView<MainPageController> {
() { () {
if (globalController.model.hideBottomNavigationBar == true) { if (globalController.model.hideBottomNavigationBar == true) {
return Scaffold( return Scaffold(
body: arr[controller.model.currentIndex], // body: arr[controller.model.currentIndex],
body: IndexedStack(
// ✅ 改成 IndexedStack
index: controller.model.currentIndex,
children:
arr.map((page) => SizedBox.expand(child: page)).toList(),
),
floatingActionButtonAnimator: floatingActionButtonAnimator:
FloatingActionButtonAnimator.noAnimation, FloatingActionButtonAnimator.noAnimation,
floatingActionButton: Container(), floatingActionButton: Container(),
@@ -150,6 +156,13 @@ class MainPageBottomChange extends GetView<MainPageController> {
child: Scaffold( child: Scaffold(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
body: arr[controller.model.currentIndex], body: arr[controller.model.currentIndex],
// body: IndexedStack(
// // ✅ 改成 IndexedStack
// index: controller.model.currentIndex,
// children: arr
// .map((page) => SizedBox.expand(child: page))
// .toList(),
// ),
floatingActionButtonAnimator: floatingActionButtonAnimator:
FloatingActionButtonAnimator.noAnimation, FloatingActionButtonAnimator.noAnimation,
floatingActionButtonLocation: floatingActionButtonLocation:

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

@@ -1751,64 +1751,132 @@ class MHTLoginPage extends GetView<MHTLoginController> {
), ),
); );
}), }),
Divider( // Divider(
color: stringToColor("#495A67"), // 线的颜色 // color: stringToColor("#495A67"), // 线的颜色
thickness: 1.rpx, // 线的粗细 // thickness: 1.rpx, // 线的粗细
height: 20, // 垂直方向的占位高度 // height: 20, // 垂直方向的占位高度
indent: 16, // 左边缩进 // indent: 16, // 左边缩进
endIndent: 16, // 右边缩进 // endIndent: 16, // 右边缩进
), // ),
Text( // Text(
"其他登录方式".tr, // "其他登录方式".tr,
style: TextStyle( // style: TextStyle(
color: Colors.white, // color: Colors.white,
fontSize: AppConstants() // fontSize: AppConstants()
.normal_text_fontSize), // .normal_text_fontSize),
), // ),
SizedBox( // SizedBox(
height: 30.rpx, // height: 30.rpx,
), // ),
ClickableContainer( // ClickableContainer(
backgroundColor: Colors.white, // 背景色 // backgroundColor: Colors.white, // 背景色
highlightColor: Colors.grey, // 点击水波纹颜色 // highlightColor: Colors.grey, // 点击水波纹颜色
borderRadius: 999.rpx, // borderRadius: 999.rpx,
padding: EdgeInsets.zero, // padding: EdgeInsets.zero,
onTap: () async { // onTap: () async {
// loginController.model.isIos == true && // // loginController.model.isIos == true &&
MHTRegisterController registerController = // MHTRegisterController registerController =
Get.find(); // Get.find();
if (registerController // if (registerController
.model.register_agree == // .model.register_agree ==
null || // null ||
registerController // registerController
.model.register_agree != // .model.register_agree !=
true) { // true) {
TopSlideNotification.show( // TopSlideNotification.show(
context, // context,
text: "需要同意协议".tr, // text: "需要同意协议".tr,
textColor: // textColor:
themeController.currentColor.sc9, // themeController.currentColor.sc9,
); // );
return; // return;
} // }
MHTLoginController loginController = // MHTLoginController loginController =
Get.find(); // Get.find();
await loginController.wxLoginSendAuth(); // await loginController.wxLoginSendAuth();
// TopSlideNotification.show(context, // // TopSlideNotification.show(context,
// text: "测试阶段,暂不支持".tr); // // text: "测试阶段,暂不支持".tr);
}, // },
child: Container( // child: Container(
width: 90.rpx, // width: 90.rpx,
height: 90.rpx, // height: 90.rpx,
decoration: BoxDecoration( // decoration: BoxDecoration(
image: DecorationImage( // image: DecorationImage(
image: AssetImage( // image: AssetImage(
'assets/images/wechat.png'), // 本地图片 // 'assets/images/wechat.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container // fit: BoxFit.fill, // 填满整个 Container
// ),
// ),
// ),
// ),
Obx(() {
// 条件：iOS 且微信未安装
if (controller.model.isIos == true &&
controller.model.isWeChatNotInstalled ==
true) {
return SizedBox.shrink(); // 不显示任何内容
}
MHTRegisterController
mhtRegisterController = Get.find();
// 显示其他登录方式
return Column(
children: [
Divider(
color:
stringToColor("#495A67"), // 线的颜色
thickness: 1.rpx, // 线的粗细
height: 20, // 垂直方向的占位高度
indent: 16, // 左边缩进
endIndent: 16, // 右边缩进
), ),
), Text(
), "其他登录方式".tr,
), style: TextStyle(
color: Colors.white,
fontSize: AppConstants()
.normal_text_fontSize,
),
),
SizedBox(height: 30.rpx),
ClickableContainer(
backgroundColor: Colors.white, // 背景色
highlightColor:
Colors.grey, // 点击水波纹颜色
borderRadius: 999.rpx,
padding: EdgeInsets.zero,
onTap: () async {
if (mhtRegisterController
.model.register_agree !=
true) {
TopSlideNotification.show(
context,
text: "需要同意协议".tr,
textColor: themeController
.currentColor.sc9,
);
return;
}
final loginController =
Get.find<MHTLoginController>();
await loginController
.wxLoginSendAuth();
},
child: Container(
width: 90.rpx,
height: 90.rpx,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(
'assets/images/wechat.png'),
fit: BoxFit.fill,
),
),
),
),
],
);
})
], ],
), ),
), ),