From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
index 070ceac..795c206 100755
--- a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -105,7 +105,16 @@
eSVideoInfo.RoomName = videoInfos.RoomName;
GateWay.Ios.ESVideo.ShowESVideoMonitor(eSVideoInfo);
#elif Android
-
+ ((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
};
@@ -115,7 +124,7 @@
/// <summary>
/// 鍒ゆ柇璐﹀彿鏄惁鏀寔鍙瀵硅
/// </summary>
- /// <param name="topFrameLayout"></param>
+ /// <param name="topFrameLayout">鍙瀵硅鍥炬爣鐨勭埗鎺т欢</param>
public async static void AccountSupportVideo(FrameLayout topFrameLayout)
{
var jobject = new JObject();
@@ -160,15 +169,12 @@
UserView.HomePage.Instance.AddChidren(videoMachine);
UserView.HomePage.Instance.PageIndex += 1;
videoMachine.Show(videoList);
-
+
};
}
}
catch { }
}
-
-
-
}
/// <summary>
/// 鑾峰彇鍙瀵硅鍒楄〃
--
Gitblit v1.8.0