diff --git a/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_logic.dart index 3b10ae03..237e8df4 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_logic.dart @@ -127,7 +127,7 @@ class RealTimePictureLogic extends BaseGetXController { } /// 开门 - udpOpenDoorAction() async { + udpOpenDoorAction(List list) async { UDPSenderManage.sendMainProtocol( command: 152, commandTypeIsCalling: 1, @@ -136,7 +136,7 @@ class RealTimePictureLogic extends BaseGetXController { lockIP: UDPManage().host, userMobile: await state.userMobile, userMobileIP: await state.userMobileIP, - endData: []); + endData: list); Get.back(); } diff --git a/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_page.dart b/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_page.dart index fccb2fea..b41603dd 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/realTimePicture/realTimePicture_page.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -194,6 +195,8 @@ class _RealTimePicturePageState extends State // 接听 Obx(() => bottomBtnItemWidget( getAnswerBtnImg(), getAnswerBtnName(), Colors.white, () async { + Toast.show(msg: "监视中无音频"); + /* //获取麦克风权限 await logic.getPermissionStatus().then((value) async { if (!value) { @@ -205,7 +208,9 @@ class _RealTimePicturePageState extends State // 刚进来是接听状态,然后改为长按对讲 logic.udpAnswerAction(); }); + */ }, longPress: () { + /* // 开始长按 print("onLongPress"); state.listAudioData.value = []; @@ -214,12 +219,15 @@ class _RealTimePicturePageState extends State } // logic.readG711Data(); logic.startProcessing(); + */ }, longPressUp: () async { + /* // 长按结束 print("onLongPressUp"); if (state.udpStatus.value == 9) { state.udpStatus.value = 8; } + */ })), bottomBtnItemWidget( "images/main/icon_lockDetail_hangUp.png", "挂断", Colors.red, () async { @@ -229,7 +237,10 @@ class _RealTimePicturePageState extends State }), bottomBtnItemWidget("images/main/icon_lockDetail_monitoringUnlock.png", "开锁", AppColors.mainColor, () { + Toast.show(msg: "监视中暂不能开锁"); + /* showDeletPasswordAlertDialog(context); + */ }) ]); } @@ -308,8 +319,18 @@ class _RealTimePicturePageState extends State return; } + // List numbers = state.passwordTF.text.split('').map((char) => int.parse(char)).toList(); // 开锁 - logic.udpOpenDoorAction(); + // lockID + List numbers = []; + List lockIDData = utf8.encode(state.passwordTF.text); + numbers.addAll(lockIDData); + // topBytes = getFixedLengthList(lockIDData, 20 - lockIDData.length); + for (int i = 0; i < 6 - lockIDData.length; i++) { + numbers.add(0); + } + print("numbersnumbersnumbers:$numbers"); + logic.udpOpenDoorAction(numbers); }, cancelClick: () { Get.back(); diff --git a/star_lock/lib/talk/udp/udp_reciverData.dart b/star_lock/lib/talk/udp/udp_reciverData.dart index 4b4e8ada..8357107b 100644 --- a/star_lock/lib/talk/udp/udp_reciverData.dart +++ b/star_lock/lib/talk/udp/udp_reciverData.dart @@ -183,7 +183,11 @@ class CommandUDPReciverManager { //开门反馈 if ((data[7] & 0x3) == 2) { print("开门成功"); - } else {} + Toast.show(msg: "开门成功"); + } else { + print("开门失败"); + Toast.show(msg: "开门失败"); + } } break; case 30: @@ -196,6 +200,7 @@ class CommandUDPReciverManager { //结束对讲反馈 print("结束监视反馈"); } + Toast.show(msg: "对方已结束监视"); UDPTalkClass().status = 0; UDPTalkClass().isBeCall = false; UDPTalkClass().stopLocalAudio();