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-12 10:26:30 +08:00
parent 101b60611a
commit b528ab950d
16 changed files with 78 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,9 +390,8 @@ class _EPageState extends State<DeviceTypePage> {
if (type != null) {
if (type == 1) {
Get.toNamed("/blueteethDevice");
}
if (type == 2) {
TopSlideNotification.show(
}else{
TopSlideNotification.show(
context,
text: "待开发.提示".tr,
textColor: themeController.currentColor.sc2,

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

@@ -20,8 +20,6 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/controller/time/countdown_controller.dart';
import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/model/api_response.dart';
import 'package:vbvs_app/pages/user/privacy_scheme_page.dart';
import 'package:vbvs_app/pages/user/user_scheme_page.dart';
class OtherLoginPage extends StatefulWidget {
const OtherLoginPage({super.key});

2
lib/pages/mh_page/bluetooth.dart
View File

@@ -279,7 +279,7 @@ class _BluetoothPageState extends State<BluetoothPage> {
arguments: obsData,
),
_buildMenuButton(
context, '睡眠习惯', "/sleepHabitPage"),
context, '睡眠习惯'.tr, "/sleepHabitPage"),
_buildMenuButton(
context, '分享设备'.tr, "/deviceSharePage",
arguments: obsData),

10
lib/pages/mh_page/user/controller/bind_tel_controller.dart
View File

@@ -94,7 +94,7 @@ class AuthBindTelController extends GetControllerEx<AuthBindTelModel> {
// }
}
getCode(BuildContext context) async {
getCode(BuildContext context, [Map? img]) async {
String message = "";
if (model.phone == null || model.phone!.isEmpty) {
message = "请输入手机号".tr;
@@ -116,7 +116,11 @@ class AuthBindTelController extends GetControllerEx<AuthBindTelModel> {
"userName": model.phone!,
'type': 5,
};
data['code'] = "mht";
if (img != null) {
if (img!['code'] != null) {
data['code'] = img!['code'];
}
}
await requestWithLog(
logTitle: "获取验证码".tr,
method: MyHttpMethod.post,
@@ -147,7 +151,7 @@ class AuthBindTelController extends GetControllerEx<AuthBindTelModel> {
String serviceApi = ServiceConstant.user_info;
String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
String? language = "";
if (languageController.selectLanguage != null) {
if (languageController.selectLanguage.value != null) {
language = languageController.selectLanguage.value!.language_code;
}
if (language != null && language.isNotEmpty) {

8
lib/pages/mh_page/user/controller/mht_login_controller.dart
View File

@@ -271,12 +271,6 @@ class MHTLoginController extends GetControllerEx<LoginModel> {
queryUrl: queryUrl,
data: data);
if (apiResponse.code == HttpStatusCodes.ok) {
// UserInfoController userInfoController = Get.find();
// if (userInfoController.model.user!.phone == null ||
// userInfoController.model.user!.phone!.isEmpty) {
// Get.toNamed("/auth_bind_tel");
// return;
// }
UserInfoController userInfoController = Get.find();
userInfoController.model.user = UserModel.fromJson(apiResponse.data);
userInfoController.model.login = 1;
@@ -287,7 +281,7 @@ class MHTLoginController extends GetControllerEx<LoginModel> {
box.write('user', userInfoController.model.user!.toJson()); // 存储用户信息
if (userInfoController.model.user!.phone == null ||
userInfoController.model.user!.phone!.isEmpty) {
await Get.toNamed("/auth_bind_tel");
await Get.toNamed("/auth_bind_tel", arguments: {'code':'mht'});
}
if (userInfoController.model.user!.phone == null ||
userInfoController.model.user!.phone!.isEmpty) {

9
lib/pages/mh_page/user/page/bind_tel_page.dart
View File

@@ -17,9 +17,12 @@ import 'package:vbvs_app/pages/mh_page/user/controller/mht_login_controller.dart
class BindTelWidget extends GetView<AuthBindTelController> {
BoxConstraints? bodysize;
Map img;
final scaffoldKey = GlobalKey<ScaffoldState>();
BindTelWidget({super.key, required this.img});
@override
Widget build(BuildContext context) {
return LayoutBuilder(builder: (context, cc) {
@@ -28,7 +31,9 @@ class BindTelWidget extends GetView<AuthBindTelController> {
// onTap: () => FocusScope.of(context).unfocus(),
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/images/new_background.png'),
image: AssetImage((img!['img'] == null || "" == img!['img'])
? 'assets/images/new_background.png'
: img!['img']!),
fit: BoxFit.fill,
),
),
@@ -304,7 +309,7 @@ class BindTelWidget extends GetView<AuthBindTelController> {
}
String msg =
await controller
.getCode(context);
.getCode(context,img);
if (msg.isNotEmpty) {
return;
}

2
lib/pages/sleep_report/component/Vital_signs.dart
View File

@@ -223,7 +223,7 @@ class _VitalSignsWidgetState extends State<VitalSignsWidget> {
onPressed: () {
MHTHomeController homeController = Get.find();
Get.toNamed("/newSleepReportPage", arguments: {
'date': widget.sleepReport['startTime'],
'date': widget.sleepReport['endTime'],
"mac": homeController.selectDevcie.value,
'type': 1,
'backgroundImg': 'assets/images/new_background.png',

4
lib/pages/sleep_report/component/new_sleep_view.dart
View File

@@ -154,7 +154,7 @@ class _NewSleepViewWidgetState extends State<NewSleepViewWidget> {
Container(
alignment: Alignment(-1, 0),
child: Text(
"在床时长 ${formatDecimalHoursWithTr(matched['value'])}",
"在床时长".tr + " ${formatDecimalHoursWithTr(matched['value'])}",
style: TextStyle(color: Color(0xFF929699), fontSize: 20.rpx),
),
),
@@ -258,7 +258,7 @@ class _NewSleepViewWidgetState extends State<NewSleepViewWidget> {
onPressed: () {
MHTHomeController homeController = Get.find();
Get.toNamed("/newSleepReportPage", arguments: {
'date': widget.sleepReport['startTime'],
'date': widget.sleepReport['endTime'],
"mac": homeController.selectDevcie.value,
'type': 1,
'backgroundImg': 'assets/images/new_background.png',