From 5777c367f53c758546211d5f7f40a27f0b11c660 Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期二, 26 四月 2022 18:02:03 +0800 Subject: [PATCH] 2022-4-26 --- ZigbeeApp/GateWay.Droid/Application.cs | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs old mode 100755 new mode 100644 index 8e80a5c..3a13e7b --- a/ZigbeeApp/GateWay.Droid/Application.cs +++ b/ZigbeeApp/GateWay.Droid/Application.cs @@ -476,40 +476,7 @@ /// <param name="hiddenJson">浜戠鎺ㄨ繃鏉ョ殑鏁版嵁</param> private void VideoMethod(string hiddenJson) { - var hiddanJson = Newtonsoft.Json.Linq.JObject.Parse(hiddenJson); - if (hiddanJson == null) - { - return; - } - var json = Newtonsoft.Json.Linq.JObject.Parse(hiddanJson["HiddanJson"].ToString()); - if (json == null) - { - return; - } - Shared.Phone.VideoPhone.ESVideoInfo eSVideoInfo = new Shared.Phone.VideoPhone.ESVideoInfo(); - if (json["uuid"].ToString().Contains(",")) - { - var uuid = json["uuid"].ToString().Split(','); - eSVideoInfo.ESVideoUUID = uuid[0]; - - } - else - { - eSVideoInfo.ESVideoUUID = json["uuid"].ToString(); - } - - eSVideoInfo.DeviceName = Language.StringByID(Shared.R.MyInternationalizationString.theOutdoorUnit); - eSVideoInfo.ESRoomID = int.Parse(json["roomno"].ToString()); - if (!string.IsNullOrEmpty(json["unitno"].ToString())) - { - string str = json["unitno"].ToString(); - string str1 = str.Substring(0, 2).TrimStart('0'); - string str2 = str.Substring(2, 2).TrimStart('0'); - eSVideoInfo.RoomName = str1 + Language.StringByID(Shared.R.MyInternationalizationString.dong) + str2 + Language.StringByID(Shared.R.MyInternationalizationString.unit); - } - - Shared.Phone.VideoPhone.ESVideo.ShowESvideoVideoIntercom(eSVideoInfo); - + Com.Evoyohome.Sphonelibs.Global.Global.OpenCallActivity(null); } } } -- Gitblit v1.8.0