From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp20200828/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
old mode 100644
new mode 100755
similarity index 93%
rename from ZigbeeApp20200828/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
rename to ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
index 5ccdaac..795c206
--- a/ZigbeeApp20200828/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -105,12 +105,16 @@
                      eSVideoInfo.RoomName = videoInfos.RoomName;
                      GateWay.Ios.ESVideo.ShowESVideoMonitor(eSVideoInfo);
 #elif Android
-                     Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo();
-                     eSVideoInfo.DeviceName = videoInfos.DeviceName;
-                     eSVideoInfo.ESVideoUUID = videoInfos.ESVideoUUID;
-                     eSVideoInfo.ESRoomID = videoInfos.ESRoomID;
-                     eSVideoInfo.RoomName = videoInfos.RoomName;
-                     Shared.Phone.VideoPhone.ESVideo.ShowESVideoMonitor(eSVideoInfo);
+                     ((BaseActivity)Application.Activity).AudioRecord((result) =>
+                     {
+                         if (result == false) { return; }
+                         Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo();
+                         eSVideoInfo.DeviceName = videoInfos.DeviceName;
+                         eSVideoInfo.ESVideoUUID = videoInfos.ESVideoUUID;
+                         eSVideoInfo.ESRoomID = videoInfos.ESRoomID;
+                         eSVideoInfo.RoomName = videoInfos.RoomName;
+                         Shared.Phone.VideoPhone.ESVideo.ShowESVideoMonitor(eSVideoInfo);
+                     });
 #endif
                  };
 
@@ -165,7 +169,7 @@
                             UserView.HomePage.Instance.AddChidren(videoMachine);
                             UserView.HomePage.Instance.PageIndex += 1;
                             videoMachine.Show(videoList);
-
+                            
                         };
                     }
                 }

--
Gitblit v1.8.0