sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1，新增配件区域UI

Browse Source 
2，新增网络摄像头的设备
This commit is contained in:
Daisy 2024-03-06 17:19:52 +08:00
parent be4a182397
commit e97b68be00
11 changed files with 87 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
star_lock/images/main/icon_lockDetail_rectangle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
star_lock/images/main/icon_main_attachment_ElectricCurtain.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
star_lock/images/main/icon_main_attachment_doorOpener.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
star_lock/images/main/icon_main_attachment_doorSensor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
star_lock/images/main/icon_main_attachment_lighting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
star_lock/images/main/icon_main_attachment_sensor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

44
star_lock/lib/main/accessoriesList/accessoriesList_page.dart
View File

@ -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<AccessoriesListPage>
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<AccessoriesListPage>
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),
)
],
),
),
);

32
star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -379,24 +379,24 @@ class _LockDetailPageState extends State<LockDetailPage>
List<Widget> getAttachmentWidget() {
var showWidgetArr = <Widget>[];
// 无线键盘
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', '新增配件',

77
star_lock/lib/main/lockDetail/realTimePicture/realTimePicture_page.dart
View File

@ -79,31 +79,30 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
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<RealTimePicturePage>
"images/main/icon_lockDetail_monitoringOpenVoice.png"))),
),
),
SizedBox(width: 60.w),
SizedBox(width: 30.w),
// 截图
GestureDetector(
onTap: () {
@ -178,7 +177,7 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
"images/main/icon_lockDetail_monitoringScreenshot.png")),
),
),
SizedBox(width: 60.w),
SizedBox(width: 30.w),
// 录制
GestureDetector(
onTap: () {
@ -191,10 +190,34 @@ class _RealTimePicturePageState extends State<RealTimePicturePage>
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")),
// ),
)
]);
}

2
star_lock/lib/talk/udp/udp_help.dart
View File

@ -53,7 +53,7 @@ class UdpHelp {
}
void closeUDP() {
if(udpHeartTimer != null){
if (udpHeartTimer != null) {
udpHeartTimer!.cancel();
}
}

4
star_lock/lib/talk/udp/udp_talkClass.dart
View File

@ -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';