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

更新东华信息配置

Browse Source
This commit is contained in:
wyf
2026-01-14 15:09:52 +08:00
parent f929e8c0ff
commit dfd9523433
17 changed files with 507 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/donghuaF.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

4
assets/langs/en_US.json
View File

@@ -636,5 +636,7 @@
"升级内容": "Update content", "升级内容": "Update content",
"升级": "Upgrade", "升级": "Upgrade",
"前往AppStore": "Go to AppStore", "前往AppStore": "Go to AppStore",
"下载中...": "Downloading..." "下载中...": "Downloading...",
"欢迎使用东华智能睡眠": "Welcome to use Donghua Smart Sleep",
"Copyright © 2020-2030 东华智能睡眠中心 版权所有": "Copyright © 2020-2030 Donghua Smart Sleep Center All Rights Reserved"
} }

4
assets/langs/zh_CN.json
View File

@@ -636,5 +636,7 @@
"升级内容": "升级内容", "升级内容": "升级内容",
"升级": "升级", "升级": "升级",
"前往AppStore": "前往AppStore", "前往AppStore": "前往AppStore",
"下载中...": "下载中..." "下载中...": "下载中...",
"欢迎使用东华智能睡眠": "欢迎使用东华智能睡眠",
"Copyright © 2020-2030 东华智能睡眠中心 版权所有": "Copyright © 2020-2030 东华智能睡眠中心 版权所有"
} }

4
assets/langs/zh_TW.json
View File

@@ -634,5 +634,7 @@
"升级内容": "升級內容", "升级内容": "升級內容",
"升级": "升級", "升级": "升級",
"前往AppStore": "前往AppStore", "前往AppStore": "前往AppStore",
"下载中...": "下載中..." "下载中...": "下載中...",
"欢迎使用东华智能睡眠": "歡迎使用東華智能睡眠",
"Copyright © 2020-2030 东华智能睡眠中心 版权所有": " 版權所有©2020-2030 東華智能睡眠中心"
} }

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

Binary file not shown.

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

@@ -8,8 +8,8 @@ import 'package:vbvs_app/enum/APPPackageType.dart';
class AppConstants { class AppConstants {
// App-related constants // App-related constants
static const String zhmht_app_version = "SWES_1.2026.1.8";//眠花糖 static const String zhmht_app_version = "SWES_1.2026.1.8"; //眠花糖
static const String theh_app_version = "1.2601.12";//太和 static const String theh_app_version = "1.2601.12"; //太和
// 1. 纯字符串列表格式 // 1. 纯字符串列表格式
static const List<String> integerTimeZones = [ static const List<String> integerTimeZones = [
@@ -90,8 +90,9 @@ class AppConstants {
//系统参数 //系统参数
//运行打包APP模式 //运行打包APP模式
// int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖 // int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖
int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖 // int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖
// int ent_type = APPPackageType.HUANSHUI.code; //1.默认太和 2.欢睡 3.眠花糖 // int ent_type = APPPackageType.HUANSHUI.code; //1.默认太和 2.欢睡 3.眠花糖
int ent_type = APPPackageType.DONGHUA.code; //1.默认太和 2.欢睡 3.眠花糖 4.东华
int text_length = 8; int text_length = 8;
int wifi1 = -45; int wifi1 = -45;
@@ -132,6 +133,15 @@ String getPrivacy(int type) {
return ServiceConstant.policy_url + return ServiceConstant.policy_url +
"/theh" + "/theh" +
"/th_user_policy_$language.html"; "/th_user_policy_$language.html";
} else if (AppConstants().ent_type == APPPackageType.DONGHUA.code) {
if (type == 1) {
return ServiceConstant.policy_url +
"/donghua" +
"/th_privacy_policy_$language.html";
}
return ServiceConstant.policy_url +
"/donghua" +
"/th_user_policy_$language.html";
} else { } else {
if (type == 1) { if (type == 1) {
return ServiceConstant.policy_url + return ServiceConstant.policy_url +

10
lib/controller/login/login_controller.dart
View File

@@ -167,11 +167,14 @@ class LoginController extends GetControllerEx<LoginModel> {
UserInfoController userInfoController = Get.find(); UserInfoController userInfoController = Get.find();
var data = { var data = {
"userName": model.phone, "userName": model.phone,
"ccode":userInfoController.select_country_code.value, "ccode": userInfoController.select_country_code.value,
}; };
if (AppConstants().ent_type == APPPackageType.HUANSHUI.code) { if (AppConstants().ent_type == APPPackageType.HUANSHUI.code) {
data['code'] = "hzhskj"; data['code'] = "hzhskj";
} }
if (AppConstants().ent_type == APPPackageType.DONGHUA.code) {
data['code'] = "dh";
}
var response = var response =
await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data)); await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data));
if (response != null) { if (response != null) {
@@ -238,11 +241,14 @@ class LoginController extends GetControllerEx<LoginModel> {
var data = { var data = {
"userName": model.updatePhone, "userName": model.updatePhone,
"type": 5, "type": 5,
"ccode":userInfoController.select_country_code.value, "ccode": userInfoController.select_country_code.value,
}; };
if (AppConstants().ent_type == APPPackageType.HUANSHUI.code) { if (AppConstants().ent_type == APPPackageType.HUANSHUI.code) {
data['code'] = "hzhskj"; data['code'] = "hzhskj";
} }
if (AppConstants().ent_type == APPPackageType.DONGHUA.code) {
data['code'] = "dh";
}
var response = var response =
await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data)); await EasyDartModule.dio.post(queryUrl, data: jsonEncode(data));
if (response != null) { if (response != null) {

1
lib/enum/APPPackageType.dart
View File

@@ -2,6 +2,7 @@ enum APPPackageType {
TH(1, '太和'), TH(1, '太和'),
HUANSHUI(2, '欢睡'), HUANSHUI(2, '欢睡'),
MHT(3, '眠花糖'), MHT(3, '眠花糖'),
DONGHUA(4, '东华'),
; ;
final int code; final int code;

2
lib/main.dart
View File

@@ -144,6 +144,8 @@ void initServiceAddress() {
// 太和 // 太和
ServiceConstant.baseHost = "vsbst-api.he-info.com"; ServiceConstant.baseHost = "vsbst-api.he-info.com";
// ServiceConstant.baseHost = "vsbs-test.he-info.cn"; // ServiceConstant.baseHost = "vsbs-test.he-info.cn";
} else if (AppConstants().ent_type == APPPackageType.DONGHUA.code) {
ServiceConstant.baseHost = "vsbst-api.he-info.com";
} else { } else {
//默认 //默认
ServiceConstant.baseHost = "vsbst-api.he-info.com"; ServiceConstant.baseHost = "vsbst-api.he-info.com";

258
lib/pages/login/other_login.dart
View File

@@ -20,6 +20,7 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/controller/time/countdown_controller.dart'; import 'package:vbvs_app/controller/time/countdown_controller.dart';
import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/controller/weather/weather_controller.dart'; import 'package:vbvs_app/controller/weather/weather_controller.dart';
import 'package:vbvs_app/enum/APPPackageType.dart';
import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/model/api_response.dart';
import 'package:vbvs_app/pages/person/select_time.dart'; import 'package:vbvs_app/pages/person/select_time.dart';
import 'dart:ui' as ui; import 'dart:ui' as ui;
@@ -214,9 +215,7 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
child: Align( child: Align(
alignment: AlignmentDirectional(0, 0), alignment: AlignmentDirectional(0, 0),
child: Text( child: Text(
AppConstants().ent_type == 1 getWelcomeText(AppConstants().ent_type),
? '登录页.欢迎使用太和e护'.tr
: "欢迎使用欢睡科技",
style: TextStyle( style: TextStyle(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 48.rpx, fontSize: 48.rpx,
@@ -988,130 +987,132 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
), ),
), ),
), ),
Container( if (AppConstants().ent_type == APPPackageType.TH.code)
width: double.infinity, Container(
height: MediaQuery.sizeOf(context).height * 0.136, width: double.infinity,
constraints: BoxConstraints( height: MediaQuery.sizeOf(context).height * 0.136,
minHeight: 220.rpx, constraints: BoxConstraints(
), minHeight: 220.rpx,
decoration: BoxDecoration(), ),
child: Column( decoration: BoxDecoration(),
mainAxisSize: MainAxisSize.max, child: Column(
children: [ mainAxisSize: MainAxisSize.max,
Padding( children: [
padding: Padding(
EdgeInsetsDirectional.fromSTEB(0, 0, 0, 36.rpx), padding:
child: Text( EdgeInsetsDirectional.fromSTEB(0, 0, 0, 36.rpx),
"登录页.其他登录方式".tr, child: Text(
style: TextStyle( "登录页.其他登录方式".tr,
fontFamily: 'Inter', style: TextStyle(
fontSize: 26.rpx, fontFamily: 'Inter',
letterSpacing: 0.0, fontSize: 26.rpx,
color: themeController.currentColor.sc3, letterSpacing: 0.0,
color: themeController.currentColor.sc3,
),
), ),
), ),
), Row(
Row( mainAxisSize: MainAxisSize.max,
mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ Obx(() {
Obx(() { var aa =
var aa = loginController.model.isWeChatNotInstalled;
loginController.model.isWeChatNotInstalled; if (isiOS &&
if (isiOS && (loginController
(loginController.model.isWeChatNotInstalled != .model.isWeChatNotInstalled !=
null && null &&
loginController loginController
.model.isWeChatNotInstalled == .model.isWeChatNotInstalled ==
true)) return Container(); true)) return Container();
return ClickableContainer( return 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 {
if (loginController.model.register_agree == if (loginController.model.register_agree ==
null || null ||
loginController.model.register_agree != loginController.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;
} }
await loginController await loginController
.wxLoginSendAuth(context); .wxLoginSendAuth(context);
}, },
child: Container( child: Container(
width: 91.rpx, width: 91.rpx,
height: 91.rpx, height: 91.rpx,
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
),
child: Image.asset(
"assets/img/wechat.png",
width: 30.rpx,
height: 30.rpx,
),
), ),
child: Image.asset( );
"assets/img/wechat.png", }),
width: 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: () { // onTap: () {
// TopSlideNotification.show(context, // TopSlideNotification.show(context,
// text: "待开发功能".tr); // text: "待开发功能".tr);
// }, // },
// child: Container( // child: Container(
// width: 91.rpx, // width: 91.rpx,
// height: 91.rpx, // height: 91.rpx,
// clipBehavior: Clip.antiAlias, // clipBehavior: Clip.antiAlias,
// decoration: BoxDecoration( // decoration: BoxDecoration(
// shape: BoxShape.circle, // shape: BoxShape.circle,
// ), // ),
// child: Image.asset( // child: Image.asset(
// "assets/img/tel.png", // "assets/img/tel.png",
// width: 30.rpx, // width: 30.rpx,
// 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: () { // onTap: () {
// TopSlideNotification.show(context, // TopSlideNotification.show(context,
// text: "待开发功能".tr); // text: "待开发功能".tr);
// }, // },
// child: Container( // child: Container(
// width: 91.rpx, // width: 91.rpx,
// height: 91.rpx, // height: 91.rpx,
// clipBehavior: Clip.antiAlias, // clipBehavior: Clip.antiAlias,
// decoration: BoxDecoration( // decoration: BoxDecoration(
// shape: BoxShape.circle, // shape: BoxShape.circle,
// ), // ),
// child: Image.asset( // child: Image.asset(
// "assets/img/google.png", // "assets/img/google.png",
// width: 30.rpx, // width: 30.rpx,
// height: 30.rpx, // height: 30.rpx,
// ), // ),
// ), // ),
// ), // ),
].divide(SizedBox(width: 35.rpx)), ].divide(SizedBox(width: 35.rpx)),
), ),
], ],
),
), ),
),
], ],
), ),
), ),
@@ -1295,4 +1296,17 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
}), }),
); );
} }
String getWelcomeText(int entType) {
switch (entType) {
case 1:
return '登录页.欢迎使用太和e护'.tr;
case 2:
return '欢迎使用欢睡科技'.tr;
case 4:
return '欢迎使用东华智能睡眠'.tr;
default:
return '欢迎使用'.tr;
}
}
} }

19
lib/pages/main_bottom/follow_page.dart
View File

@@ -86,10 +86,10 @@ class _FollowPageState extends State<FollowPage> {
// child: widget.webView, // child: widget.webView,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage(AppConstants().ent_type == 1 image: AssetImage(
? 'assets/img/followus.png' getFollowUsImage(AppConstants().ent_type),
: "assets/img/huanshuiF.png"), // 本地图片 ),
fit: BoxFit.cover, // 填满整个 Container fit: BoxFit.cover,
), ),
), ),
), ),
@@ -102,4 +102,15 @@ class _FollowPageState extends State<FollowPage> {
), ),
); );
} }
String getFollowUsImage(int entType) {
final Map<int, String> imageMap = {
1: 'assets/img/followus.png',
2: 'assets/img/huanshuiF.png',
4: 'assets/img/donghuaF.png',
// 后面继续加
};
return imageMap[entType] ?? 'assets/img/followus.png';
}
} }

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

@@ -565,7 +565,7 @@ class MainPageBottomChange extends GetView<MainPageController> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (AppConstants().ent_type == APPPackageType.TH.code) { if (AppConstants().ent_type != APPPackageType.MHT.code) {
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") {

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

@@ -457,110 +457,112 @@ class _MinePageState extends State<MinePage> {
), ),
), ),
), ),
ClickableContainer( if (AppConstants().ent_type ==
backgroundColor: Colors.transparent, // 容器背景色 APPPackageType.TH.code)
highlightColor: themeController ClickableContainer(
.currentColor.sc21, // 点击时的背景色 backgroundColor: Colors.transparent, // 容器背景色
padding: EdgeInsetsDirectional.fromSTEB( highlightColor: themeController
0.rpx, 0.rpx, 0.rpx, 0.rpx), .currentColor.sc21, // 点击时的背景色
onTap: () async { padding: EdgeInsetsDirectional.fromSTEB(
UserInfoController userInfoController = 0.rpx, 0.rpx, 0.rpx, 0.rpx),
Get.find(); onTap: () async {
if (userInfoController.model.login != UserInfoController userInfoController =
LoginStatus.LOGIN.code) { Get.find();
TopSlideNotification.show( if (userInfoController.model.login !=
context, LoginStatus.LOGIN.code) {
text: "必须登录提示".tr, TopSlideNotification.show(
textColor: context,
themeController.currentColor.sc9, text: "必须登录提示".tr,
); textColor:
Get.toNamed("/loginPage"); themeController.currentColor.sc9,
} else { );
// TopSlideNotification.show( Get.toNamed("/loginPage");
// context,
// text: "待开发.提示".tr,
// textColor:
// themeController.currentColor.sc2,
// );
String url =
"https://mp.weixin.qq.com/s/kwfTxy8d_cDU0j10mZWMgA";
String serviceAddress =
ServiceConstant.service_address;
String serviceName =
ServiceConstant.server_service;
String serviceApi =
ServiceConstant.user_setting;
String queryUrl =
"$serviceAddress$serviceName$serviceApi";
String type = "app_op_desc";
String code = "th";
if (AppConstants().ent_type ==
APPPackageType.TH.code) {
code = "th";
} else if (AppConstants().ent_type ==
APPPackageType.HUANSHUI.code) {
code = "hs";
} else { } else {
code = 'th'; // TopSlideNotification.show(
// context,
// text: "待开发.提示".tr,
// textColor:
// themeController.currentColor.sc2,
// );
String url =
"https://mp.weixin.qq.com/s/kwfTxy8d_cDU0j10mZWMgA";
String serviceAddress =
ServiceConstant.service_address;
String serviceName =
ServiceConstant.server_service;
String serviceApi =
ServiceConstant.user_setting;
String queryUrl =
"$serviceAddress$serviceName$serviceApi";
String type = "app_op_desc";
String code = "th";
if (AppConstants().ent_type ==
APPPackageType.TH.code) {
code = "th";
} else if (AppConstants().ent_type ==
APPPackageType.HUANSHUI.code) {
code = "hs";
} else {
code = 'th';
}
queryUrl =
"$queryUrl?type=$type&code=$code";
await requestWithLog(
logTitle: "查询操作说明",
method: MyHttpMethod.get,
queryUrl: queryUrl,
onSuccess: (res) {
url = res.data['url'];
},
);
Get.toNamed("/helpPage", arguments: url);
} }
queryUrl = },
"$queryUrl?type=$type&code=$code"; child: Container(
await requestWithLog( child: Padding(
logTitle: "查询操作说明", padding: EdgeInsetsDirectional.fromSTEB(
method: MyHttpMethod.get, 40.rpx, 30.rpx, 40.rpx, 30.rpx),
queryUrl: queryUrl, child: Row(
onSuccess: (res) { mainAxisSize: MainAxisSize.max,
url = res.data['url']; mainAxisAlignment:
}, MainAxisAlignment.spaceBetween,
); children: [
Get.toNamed("/helpPage", arguments: url); Row(
} mainAxisSize: MainAxisSize.max,
}, children: [
child: Container( SvgPicture.asset(
child: Padding( 'assets/img/icon/op_ex.svg',
padding: EdgeInsetsDirectional.fromSTEB( width: 25.rpx,
40.rpx, 30.rpx, 40.rpx, 30.rpx), height: 25
child: Row( .rpx, // 如果 SVG 中没有固定颜色，可以这样设置
mainAxisSize: MainAxisSize.max, color: stringToColor("#00C1AA"),
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisSize: MainAxisSize.max,
children: [
SvgPicture.asset(
'assets/img/icon/op_ex.svg',
width: 25.rpx,
height: 25
.rpx, // 如果 SVG 中没有固定颜色，可以这样设置
color: stringToColor("#00C1AA"),
),
Text(
'我的.操作说明'.tr,
style: TextStyle(
fontFamily: 'Inter',
color: themeController
.currentColor.sc3,
fontSize: AppConstants()
.title_text_fontSize,
letterSpacing: 0.0,
), ),
), Text(
].divide(SizedBox(width: 22.rpx)), '我的.操作说明'.tr,
), style: TextStyle(
SvgPicture.asset( fontFamily: 'Inter',
'assets/img/icon/arrow_right.svg', color: themeController
width: 8.rpx, .currentColor.sc3,
height: fontSize: AppConstants()
14.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 .title_text_fontSize,
color: letterSpacing: 0.0,
themeController.currentColor.sc3, ),
), ),
], ].divide(SizedBox(width: 22.rpx)),
),
SvgPicture.asset(
'assets/img/icon/arrow_right.svg',
width: 8.rpx,
height:
14.rpx, // 如果 SVG 中没有固定颜色，可以这样设置
color: themeController
.currentColor.sc3,
),
],
),
), ),
), ),
), ),
),
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, // 容器背景色 backgroundColor: Colors.transparent, // 容器背景色
highlightColor: themeController highlightColor: themeController

8
lib/pages/mh_page/Vital_signs_sensor.dart
View File

@@ -493,9 +493,12 @@ class VitalWidget extends StatelessWidget {
MHTBlueToothController mhtBlueToothController = Get.find(); MHTBlueToothController mhtBlueToothController = Get.find();
final String id = data['mac'.tr] ?? '--'; final String id = data['mac'.tr] ?? '--';
final int? timestamp = data['status']['updateTime']; final int? timestamp = data['status']['updateTime'];
// final String time = (timestamp != null)
// ? DateFormat('yyyy-MM-dd HH:mm')
// .format(DateTime.fromMillisecondsSinceEpoch(timestamp))
// : '--';
final String time = (timestamp != null) final String time = (timestamp != null)
? DateFormat('yyyy-MM-dd HH:mm') ? DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now())
.format(DateTime.fromMillisecondsSinceEpoch(timestamp))
: '--'; : '--';
return ClickableContainer( return ClickableContainer(
backgroundColor: Color(0xFF003058), backgroundColor: Color(0xFF003058),
@@ -883,7 +886,6 @@ class VitalWidget extends StatelessWidget {
mac: data['mac'], mac: data['mac'],
firmwareUrl: firmwareUrl, firmwareUrl: firmwareUrl,
); );
} catch (e) { } catch (e) {
print("升级失败: $e"); print("升级失败: $e");
TopSlideNotification.show(context, TopSlideNotification.show(context,

14
lib/pages/setting/common_mesaage_setting.dart
View File

@@ -383,9 +383,10 @@ class _CommonMessageSettingPageState extends State<CommonMessageSettingPage> {
], ],
), ),
Text( Text(
AppConstants().ent_type == 1 // AppConstants().ent_type == 1
? "通用APP消息介绍".tr // ? "通用APP消息介绍".tr
: "打开“欢睡科技”APP，可以查看消息内容", // : "打开“欢睡科技”APP，可以查看消息内容",
"通用APP消息介绍".tr,
style: TextStyle( style: TextStyle(
color: color:
themeController.currentColor.sc4, themeController.currentColor.sc4,
@@ -492,9 +493,10 @@ class _CommonMessageSettingPageState extends State<CommonMessageSettingPage> {
], ],
), ),
Text( Text(
AppConstants().ent_type == 1 // AppConstants().ent_type == 1
? "通用服务号消息介绍".tr // ? "通用服务号消息介绍".tr
: "无需打开“欢睡科技”APP，关注欢睡智能睡眠研究所服务号后，微信内即可接收消息推送", // : "无需打开“欢睡科技”APP，关注欢睡智能睡眠研究所服务号后，微信内即可接收消息推送",
"通用服务号消息介绍".tr,
style: TextStyle( style: TextStyle(
color: color:
themeController.currentColor.sc4, themeController.currentColor.sc4,

221
lib/pages/user/setting_page.dart
View File

@@ -295,110 +295,115 @@ class _SettingPageState extends State<SettingPage> {
), ),
), ),
), ),
ClickableContainer( if (AppConstants().ent_type ==
backgroundColor: Colors.transparent, // 容器背景色 APPPackageType.TH.code)
highlightColor: themeController ClickableContainer(
.currentColor.sc21, // 点击时的背景色 backgroundColor:
padding: EdgeInsetsDirectional.fromSTEB( Colors.transparent, // 容器背景色
0.rpx, 0.rpx, 0.rpx, 0.rpx), highlightColor: themeController
onTap: () async { .currentColor.sc21, // 点击时的背景色
String url = padding: EdgeInsetsDirectional.fromSTEB(
"https://mp.weixin.qq.com/s/IAr4RNBy0hGJXGKyMxe7eQ"; 0.rpx, 0.rpx, 0.rpx, 0.rpx),
String serviceAddress = onTap: () async {
ServiceConstant.service_address; String url =
String serviceName = "https://mp.weixin.qq.com/s/IAr4RNBy0hGJXGKyMxe7eQ";
ServiceConstant.server_service; String serviceAddress =
String serviceApi = ServiceConstant.service_address;
ServiceConstant.user_setting; String serviceName =
String queryUrl = ServiceConstant.server_service;
"$serviceAddress$serviceName$serviceApi"; String serviceApi =
String type = "app_about_us"; ServiceConstant.user_setting;
String code = "th"; String queryUrl =
if (AppConstants().ent_type == "$serviceAddress$serviceName$serviceApi";
APPPackageType.TH.code) { String type = "app_about_us";
code = "th"; String code = "th";
} else if (AppConstants().ent_type == if (AppConstants().ent_type ==
APPPackageType.HUANSHUI.code) { APPPackageType.TH.code) {
code = "hs"; code = "th";
} else { } else if (AppConstants().ent_type ==
code = 'th'; APPPackageType.HUANSHUI.code) {
} code = "hs";
queryUrl = } else {
"$queryUrl?type=$type&code=$code"; code = 'th';
await requestWithLog( }
logTitle: "查询操作说明", queryUrl =
method: MyHttpMethod.get, "$queryUrl?type=$type&code=$code";
queryUrl: queryUrl, await requestWithLog(
onSuccess: (res) { logTitle: "查询操作说明",
String? language = "zh_CN"; method: MyHttpMethod.get,
if (AppConstants().ent_type == queryUrl: queryUrl,
APPPackageType.MHT.code) { onSuccess: (res) {
if (mhLanguageController String? language = "zh_CN";
.selectLanguage != if (AppConstants().ent_type ==
null) { APPPackageType.MHT.code) {
language = mhLanguageController if (mhLanguageController
.selectLanguage .selectLanguage !=
.value! null) {
.language_code; language = mhLanguageController
.selectLanguage
.value!
.language_code;
}
} else {
if (languageController
.selectLanguage !=
null) {
language = languageController
.selectLanguage
.value!
.language_code;
}
} }
} else { if (language == "zh_CN") {
if (languageController url = res.data['url'];
.selectLanguage != } else {
null) { url = res.data['en_url'];
language = languageController
.selectLanguage
.value!
.language_code;
} }
} },
if (language == "zh_CN") { );
url = res.data['url']; print('点击了容器');
} else { Get.toNamed("/aboutUsPage",
url = res.data['en_url']; arguments: url);
} },
}, child: Container(
); child: Padding(
print('点击了容器'); padding: EdgeInsetsDirectional.fromSTEB(
Get.toNamed("/aboutUsPage", arguments: url); 40.rpx, 30.rpx, 40.rpx, 30.rpx),
}, child: Row(
child: Container( mainAxisSize: MainAxisSize.max,
child: Padding( mainAxisAlignment:
padding: EdgeInsetsDirectional.fromSTEB( MainAxisAlignment.spaceBetween,
40.rpx, 30.rpx, 40.rpx, 30.rpx), children: [
child: Row( Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: children: [
MainAxisAlignment.spaceBetween, Text(
children: [ '关于我们'.tr,
Row( style: TextStyle(
mainAxisSize: MainAxisSize.max, fontFamily: 'Inter',
children: [ color: themeController
Text( .currentColor.sc3,
'关于我们'.tr, fontSize: AppConstants()
style: TextStyle( .title_text_fontSize,
fontFamily: 'Inter', letterSpacing: 0.0,
color: themeController ),
.currentColor.sc3,
fontSize: AppConstants()
.title_text_fontSize,
letterSpacing: 0.0,
), ),
), ].divide(SizedBox(width: 22.rpx)),
].divide(SizedBox(width: 22.rpx)), ),
), SvgPicture.asset(
SvgPicture.asset( 'assets/img/icon/arrow_right.svg',
'assets/img/icon/arrow_right.svg', width: 8.rpx,
width: 8.rpx, height: 14
height: .rpx, // 如果 SVG 中没有固定颜色，可以这样设置
14.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 color: themeController
color: themeController .currentColor.sc3,
.currentColor.sc3, ),
), ],
], ),
), ),
), ),
), ),
),
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, // 容器背景色 backgroundColor: Colors.transparent, // 容器背景色
highlightColor: themeController highlightColor: themeController
@@ -509,6 +514,11 @@ class _SettingPageState extends State<SettingPage> {
), ),
), ),
), ),
if (AppConstants().ent_type ==
APPPackageType.TH.code)
SizedBox(
height: 100.rpx,
),
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
100.rpx, 360.rpx, 100.rpx, 0), 100.rpx, 360.rpx, 100.rpx, 0),
@@ -644,10 +654,7 @@ class _SettingPageState extends State<SettingPage> {
), ),
), ),
Text( Text(
AppConstants().ent_type == 1 getCopyrightText(AppConstants().ent_type),
? '公司信息'.tr.tr
: "Copyright © 2019-2029 合肥眠花糖家具有限责任公司 版权所有"
.tr,
style: TextStyle( style: TextStyle(
color: themeController.currentColor.sc4, color: themeController.currentColor.sc4,
fontFamily: 'Inter', fontFamily: 'Inter',
@@ -719,4 +726,14 @@ class _SettingPageState extends State<SettingPage> {
), ),
); );
} }
String getCopyrightText(int entType) {
final Map<int, String> copyrightMap = {
1: '公司信息'.tr,
2: 'Copyright © 2019-2029 合肥眠花糖家具有限责任公司 版权所有'.tr,
4: 'Copyright © 2020-2030 东华智能睡眠中心 版权所有'.tr,
};
return copyrightMap[entType] ?? '公司信息'.tr;
}
} }

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

@@ -520,101 +520,105 @@ class _UpdateUserPageState extends State<UpdateUserPage> {
), ),
), ),
), ),
Padding( if (AppConstants().ent_type == 1)
padding: EdgeInsetsDirectional.fromSTEB( Padding(
40.rpx, 20.rpx, 40.rpx, 20.rpx),
child: ClickableContainer(
backgroundColor: Colors.transparent, // 容器背景色
highlightColor: themeController
.currentColor.sc21, // 点击时的背景色
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0.rpx, 0.rpx, 0.rpx), 40.rpx, 20.rpx, 40.rpx, 20.rpx),
onTap: () async { child: ClickableContainer(
if (userInfoController.model.user!.bindWx == backgroundColor:
null || Colors.transparent, // 容器背景色
userInfoController.model.user!.bindWx == highlightColor: themeController
false) { .currentColor.sc21, // 点击时的背景色
//微信绑定 padding: EdgeInsetsDirectional.fromSTEB(
LoginController loginController = 0.rpx, 0.rpx, 0.rpx, 0.rpx),
Get.find(); onTap: () async {
await loginController.wxLoginSendAuth( if (userInfoController
context, .model.user!.bindWx ==
login: false); null ||
} else { userInfoController
//取消微信绑定 .model.user!.bindWx ==
// LoginController loginController = false) {
// Get.find(); //微信绑定
// await loginController.wxLoginSendAuth( LoginController loginController =
// context, Get.find();
// login: false); await loginController.wxLoginSendAuth(
// TopSlideNotification.show(context, context,
// text: "暂不支持微信解绑授权".tr, login: false);
// textColor: } else {
// themeController.currentColor.sc9); //取消微信绑定
// return; // LoginController loginController =
showUnbindWxConfirmDialog(context); // Get.find();
} // await loginController.wxLoginSendAuth(
}, // context,
child: Container( // login: false);
child: Padding( // TopSlideNotification.show(context,
padding: EdgeInsetsDirectional.fromSTEB( // text: "暂不支持微信解绑授权".tr,
0.rpx, 30.rpx, 0.rpx, 30.rpx), // textColor:
child: Row( // themeController.currentColor.sc9);
mainAxisSize: MainAxisSize.max, // return;
mainAxisAlignment: showUnbindWxConfirmDialog(context);
MainAxisAlignment.spaceBetween, }
children: [ },
Row( child: Container(
mainAxisSize: MainAxisSize.max, child: Padding(
children: [ padding: EdgeInsetsDirectional.fromSTEB(
Text( 0.rpx, 30.rpx, 0.rpx, 30.rpx),
'微信'.tr, child: Row(
style: TextStyle( mainAxisSize: MainAxisSize.max,
fontFamily: 'Inter', mainAxisAlignment:
color: themeController MainAxisAlignment.spaceBetween,
.currentColor.sc3, children: [
fontSize: AppConstants() Row(
.title_text_fontSize, mainAxisSize: MainAxisSize.max,
letterSpacing: 0.0, children: [
), Text(
), '微信'.tr,
].divide(SizedBox(width: 22.rpx)),
),
Row(
mainAxisSize: MainAxisSize.max,
children: [
Obx(() {
var aa = userInfoController
.model.user!.tmpNickName;
print(aa);
return Text(
getTextByUserInfo('wechat'),
style: TextStyle( style: TextStyle(
fontFamily: 'Inter', fontFamily: 'Inter',
// color: Color(0xFFD9E3EB), color: themeController
color: getColorByUserInfo( .currentColor.sc3,
'wechat'), fontSize: AppConstants()
fontSize: 26.rpx, .title_text_fontSize,
letterSpacing: 0.0, letterSpacing: 0.0,
), ),
); ),
}), ].divide(SizedBox(width: 22.rpx)),
SvgPicture.asset( ),
'assets/img/icon/arrow_right.svg', Row(
width: 8.rpx, mainAxisSize: MainAxisSize.max,
height: 15 children: [
.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 Obx(() {
color: themeController var aa = userInfoController
.currentColor.sc3, .model.user!.tmpNickName;
), print(aa);
].divide(SizedBox(width: 28.rpx)), return Text(
), getTextByUserInfo('wechat'),
], style: TextStyle(
fontFamily: 'Inter',
// color: Color(0xFFD9E3EB),
color: getColorByUserInfo(
'wechat'),
fontSize: 26.rpx,
letterSpacing: 0.0,
),
);
}),
SvgPicture.asset(
'assets/img/icon/arrow_right.svg',
width: 8.rpx,
height: 15
.rpx, // 如果 SVG 中没有固定颜色，可以这样设置
color: themeController
.currentColor.sc3,
),
].divide(SizedBox(width: 28.rpx)),
),
],
),
), ),
), ),
), ),
), ),
),
], ],
), ),
), ),