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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	lib/pages/mh_page/room_picker.dart
This commit is contained in:
czz
2025-07-15 14:54:26 +08:00
parent 8ec4da3488 6423485e34
commit d062b751c5
10 changed files with 684 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@ class DeviceInfoWidget extends GetView {
webviewTestController.web.jsbridge?.dart
.pageActive(false);
await Future.delayed(Duration(seconds: 1));
// await Future.delayed(Duration(seconds: 1));
webviewTestController.web.jsbridge?.dart
.appToHtmlDevice(device);
MainPageBBottomChange.jumpTo(2);

51
lib/pages/mh_page/homepage/component/HomeDeviceStausWidget.dart
View File

@@ -33,32 +33,39 @@ class _HomeDeviceStausWidgetState extends State<HomeDeviceStausWidget> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 170.rpx,
height: 81.rpx,
child: ClipRRect(
borderRadius: BorderRadius.circular(8.rpx),
child: Image.network(
widget.deviceStatus['device_image'], // 从DeviceStatus获取图片
width: 200.rpx,
height: 200.rpx,
fit: BoxFit.cover,
Flexible(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 170.rpx,
height: 81.rpx,
child: ClipRRect(
borderRadius: BorderRadius.circular(8.rpx),
child: Image.network(
widget
.deviceStatus['device_image'], // 从DeviceStatus获取图片
width: 200.rpx,
height: 200.rpx,
fit: BoxFit.cover,
),
),
),
),
Text(
'${(widget.deviceStatus['name'] ?? '').isEmpty ? '未命名'.tr : widget.deviceStatus['name']}',
style: TextStyle(
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0.rpx,
Text(
'${(widget.deviceStatus['name'] ?? '').isEmpty ? '未命名'.tr : widget.deviceStatus['name']}',
style: TextStyle(
color: Colors.white,
fontSize: 26.rpx,
letterSpacing: 0.0.rpx,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
].divide(SizedBox(height: 26.rpx)),
].divide(SizedBox(height: 26.rpx)),
),
),
SizedBox(width: 26.rpx),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [

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

@@ -282,7 +282,7 @@ class _MhtSleepReportPageState extends State<MhtSleepReportPage> {
borderColor:
Colors.transparent,
borderWidth: 2,
borderRadius: 0.rpx,
borderRadius: 100.rpx,
margin:
EdgeInsetsDirectional
.fromSTEB(

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

@@ -540,7 +540,7 @@ class _NewHomePageState extends State<NewHomePage> {
borderColor:
Colors.transparent,
borderWidth: 2,
borderRadius: 18,
borderRadius: 100.rpx,
margin:
EdgeInsetsDirectional
.fromSTEB(

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

@@ -13,6 +13,7 @@ import 'package:vbvs_app/common/util/FitTool.dart';
import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/common/util/requestWithLog.dart';
import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/model/WebSocketMessage.dart';
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
class WebviewTestModel {
@@ -69,13 +70,15 @@ class WebviewTestController extends GetControllerEx<WebviewTestModel> {
(selectDevice['mac'] != args[0]['mac'])) {
lastSelectDevice = selectDevice;
}
edm.EasyDartModule.websocket.sendData(jsonEncode(
WebSocketMessage(path: "/smartbed/connect", type: 5, data: {
'mac': selectDevice['mac'],
})));
dealInstantData(selectDevice);
} catch (e) {
ef.log("[aaaa]$e");
ef.log("[切换设备失败]$e");
}
//查询人员信息
return true;
});
bridge.sdk.updateBlueToothStatus((args) async {