diff --git a/star_lock/images/main/icon_lockDetail_rectangle.png b/star_lock/images/main/icon_lockDetail_rectangle.png new file mode 100644 index 00000000..df21718e Binary files /dev/null and b/star_lock/images/main/icon_lockDetail_rectangle.png differ diff --git a/star_lock/images/main/icon_main_attachment_ElectricCurtain.png b/star_lock/images/main/icon_main_attachment_ElectricCurtain.png new file mode 100644 index 00000000..a662ad60 Binary files /dev/null and b/star_lock/images/main/icon_main_attachment_ElectricCurtain.png differ diff --git a/star_lock/images/main/icon_main_attachment_doorOpener.png b/star_lock/images/main/icon_main_attachment_doorOpener.png new file mode 100644 index 00000000..74087c2b Binary files /dev/null and b/star_lock/images/main/icon_main_attachment_doorOpener.png differ diff --git a/star_lock/images/main/icon_main_attachment_doorSensor.png b/star_lock/images/main/icon_main_attachment_doorSensor.png new file mode 100644 index 00000000..d125e1f2 Binary files /dev/null and b/star_lock/images/main/icon_main_attachment_doorSensor.png differ diff --git a/star_lock/images/main/icon_main_attachment_lighting.png b/star_lock/images/main/icon_main_attachment_lighting.png new file mode 100644 index 00000000..571c0e56 Binary files /dev/null and b/star_lock/images/main/icon_main_attachment_lighting.png differ diff --git a/star_lock/images/main/icon_main_attachment_sensor.png b/star_lock/images/main/icon_main_attachment_sensor.png new file mode 100644 index 00000000..d97cbf70 Binary files /dev/null and b/star_lock/images/main/icon_main_attachment_sensor.png differ diff --git a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart b/star_lock/lib/main/accessoriesList/accessoriesList_page.dart index f24d03ff..347af63f 100644 --- a/star_lock/lib/main/accessoriesList/accessoriesList_page.dart +++ b/star_lock/lib/main/accessoriesList/accessoriesList_page.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:get/get.dart'; -import 'package:star_lock/appRouters.dart'; import 'package:star_lock/main/accessoriesList/accessoriesList_logic.dart'; import '../../../app_settings/app_colors.dart'; @@ -32,15 +30,17 @@ class _AccessoriesListPageState extends State body: ListView( children: [ _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "照明灯具", true), + 'images/main/icon_main_attachment_lighting.png', "照明灯具", true), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G4.png', "开门器", false), + 'images/main/icon_main_attachment_doorOpener.png', "开门器", false), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "电动窗帘", true), + 'images/main/icon_main_attachment_ElectricCurtain.png', + "电动窗帘", + true), + _accessoriesItem('images/main/icon_main_attachment_doorSensor.png', + "门窗传感器", false), _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G4.png', "门窗传感器", false), - _accessoriesItem( - 'images/mine/icon_mine_selectGatewayType_G2.png', "传感器", true), + 'images/main/icon_main_attachment_sensor.png', "传感器", true), ], ), ); @@ -57,22 +57,18 @@ class _AccessoriesListPageState extends State width: 1.sw, height: 140.h, padding: EdgeInsets.all(30.w), - child: Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - iconStr, - width: 150.w, - height: 150.w, - ), - // SizedBox(width: 20.w), - Text( - gatewayType, - style: TextStyle(fontSize: 22.sp), - ) - ], - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + iconStr, + ), + SizedBox(width: 20.w), + Text( + gatewayType, + style: TextStyle(fontSize: 22.sp), + ) + ], ), ), ); diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 6aa0bb07..f711621d 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -379,24 +379,24 @@ class _LockDetailPageState extends State List getAttachmentWidget() { var showWidgetArr = []; // 无线键盘 - if (state.isAttendance.value == 1) { - showWidgetArr.add(bottomItem( - 'images/main/icon_lockDetail_WirelessKeyboard.png', - '无线键盘', - state.bottomBtnisUneable.value, - () {})); - } - // 照明 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '照明', state.bottomBtnisUneable.value, () {})); + // if (state.isAttendance.value == 1) { + // showWidgetArr.add(bottomItem( + // 'images/main/icon_lockDetail_WirelessKeyboard.png', + // '无线键盘', + // state.bottomBtnisUneable.value, + // () {})); + // } + // // 照明 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '照明', state.bottomBtnisUneable.value, () {})); - // 照明 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '门磁', state.bottomBtnisUneable.value, () {})); + // // 照明 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '门磁', state.bottomBtnisUneable.value, () {})); - // 门磁 - showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', - '开门器', state.bottomBtnisUneable.value, () {})); + // // 门磁 + // showWidgetArr.add(bottomItem('images/main/icon_lockDetail_illuminator.png', + // '开门器', state.bottomBtnisUneable.value, () {})); // 新增配件 showWidgetArr.add(bottomItem('images/main/icon_main_addLock.png', '新增配件', diff --git a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart index 08abd363..de16104c 100644 --- a/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart +++ b/star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart @@ -79,31 +79,30 @@ class _RealTimePicturePageState extends State alignment: Alignment.center, children: [ Obx( - () => - state.listData.value.isEmpty || state.listData.value.length == 0 - ? Image.asset( - 'images/main/monitorBg.png', - width: ScreenUtil().screenWidth, - height: ScreenUtil().screenHeight, - fit: BoxFit.cover, - ) - : Builder( - builder: (BuildContext context) { - try { - return Image.memory( - state.listData.value, - gaplessPlayback: true, - width: 1.sw, - height: 1.sh, - fit: BoxFit.cover, - ); - } catch (e, stackTrace) { - print('Error loading image: $e'); - print('Stack trace: $stackTrace'); - return Container(); - } - }, - ), + () => state.listData.value.isEmpty || state.listData.value.isEmpty + ? Image.asset( + 'images/main/monitorBg.png', + width: ScreenUtil().screenWidth, + height: ScreenUtil().screenHeight, + fit: BoxFit.cover, + ) + : Builder( + builder: (BuildContext context) { + try { + return Image.memory( + state.listData.value, + gaplessPlayback: true, + width: 1.sw, + height: 1.sh, + fit: BoxFit.cover, + ); + } catch (e, stackTrace) { + print('Error loading image: $e'); + print('Stack trace: $stackTrace'); + return Container(); + } + }, + ), ), Obx(() => state.listData.value.isEmpty ? Positioned( @@ -161,7 +160,7 @@ class _RealTimePicturePageState extends State "images/main/icon_lockDetail_monitoringOpenVoice.png"))), ), ), - SizedBox(width: 60.w), + SizedBox(width: 30.w), // 截图 GestureDetector( onTap: () { @@ -178,7 +177,7 @@ class _RealTimePicturePageState extends State "images/main/icon_lockDetail_monitoringScreenshot.png")), ), ), - SizedBox(width: 60.w), + SizedBox(width: 30.w), // 录制 GestureDetector( onTap: () { @@ -191,10 +190,34 @@ class _RealTimePicturePageState extends State child: Image( width: 40.w, height: 40.w, + fit: BoxFit.fill, image: const AssetImage( "images/main/icon_lockDetail_monitoringScreenRecording.png")), ), ), + SizedBox(width: 30.w), + GestureDetector( + onTap: () { + logic.showToast('该功能暂未开放'); + }, + child: Image( + width: 28.w, + height: 28.w, + fit: BoxFit.fill, + image: + const AssetImage("images/main/icon_lockDetail_rectangle.png")) + // child: Container( + // width: 50.w, + // height: 50.w, + // padding: EdgeInsets.all(5.w), + // child: Image( + // width: 40.w, + // height: 40.w, + // fit: BoxFit.fill, + // image: const AssetImage( + // "images/main/icon_lockDetail_rectangle.png")), + // ), + ) ]); } diff --git a/star_lock/lib/talk/udp/udp_help.dart b/star_lock/lib/talk/udp/udp_help.dart index f248d10b..74634efb 100644 --- a/star_lock/lib/talk/udp/udp_help.dart +++ b/star_lock/lib/talk/udp/udp_help.dart @@ -53,7 +53,7 @@ class UdpHelp { } void closeUDP() { - if(udpHeartTimer != null){ + if (udpHeartTimer != null) { udpHeartTimer!.cancel(); } } diff --git a/star_lock/lib/talk/udp/udp_talkClass.dart b/star_lock/lib/talk/udp/udp_talkClass.dart index 62a28123..8740a9e3 100644 --- a/star_lock/lib/talk/udp/udp_talkClass.dart +++ b/star_lock/lib/talk/udp/udp_talkClass.dart @@ -1,12 +1,8 @@ import 'dart:async'; import 'package:audioplayers/audioplayers.dart'; import 'package:fast_gbk/fast_gbk.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:star_lock/tools/eventBusEventManage.dart'; - import '../../appRouters.dart'; -import '../../main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart'; import '../../tools/storage.dart'; import 'udp_manage.dart';