From 5d5a3cbf4aacca721745ff4267b0b4b4b437e548 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 30 三月 2021 15:17:26 +0800
Subject: [PATCH] 2021-3-30-1
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 5e2a6c0..e0dde18 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -39,49 +39,53 @@
/// <summary>
/// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
/// </summary>
- public static List<ESVideoInfo> GetVideoInfoList(VideoObj video)
+ public static List<ESVideoInfo> GetVideoInfoList(VideoClouds video)
{
List<ESVideoInfo> eSVideoInfosList = new List<ESVideoInfo>();
var jobject = new JObject();
- jobject.Add("cmtID",video.flCmtId);
+ jobject.Add("cmtID", video.flCmtId);
jobject.Add("unitno", video.flBuildingId);
jobject.Add("method", "getUUIDList");
- var str = HttpWebRequest(NewAPI.API_POST_FL_List, jobject.ToString(), "POST");
- if (string.IsNullOrEmpty(str))
+ try
{
- return eSVideoInfosList;
- }
- var json = JObject.Parse(str);
- if (json == null)
- {
- return eSVideoInfosList;
- }
- if (json["resCode"].ToString() != "0")
- {
- return eSVideoInfosList;
- }
- var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
- if (list.Count == 0)
- {
- return eSVideoInfosList;
- }
- foreach (var videoInfo in list)
- {
- ESVideoInfo eSVideoInfo = new ESVideoInfo();
- eSVideoInfo.DeviceName = videoInfo["aliasName"];
- if (videoInfo["uuid"].Contains(","))
+ var str = HttpWebRequest(NewAPI.API_POST_FL_List, jobject.ToString(), "POST");
+ if (string.IsNullOrEmpty(str))
{
- var uuid = videoInfo["uuid"].Split(',');
- eSVideoInfo.ESVideoUUID = uuid[0];
+ return eSVideoInfosList;
}
- else
+ var json = JObject.Parse(str);
+ if (json == null)
{
- eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ return eSVideoInfosList;
}
- eSVideoInfo.uuid = videoInfo["uuid"];
- eSVideoInfo.roomno = video.flRoomId;
- eSVideoInfosList.Add(eSVideoInfo);
+ if (json["resCode"].ToString() != "0")
+ {
+ return eSVideoInfosList;
+ }
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
+ if (list.Count == 0)
+ {
+ return eSVideoInfosList;
+ }
+ foreach (var videoInfo in list)
+ {
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();
+ eSVideoInfo.DeviceName = videoInfo["aliasName"];
+ if (videoInfo["uuid"].Contains(","))
+ {
+ var uuid = videoInfo["uuid"].Split(',');
+ eSVideoInfo.ESVideoUUID = uuid[0];
+ }
+ else
+ {
+ eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ }
+ eSVideoInfo.uuid = videoInfo["uuid"];
+ eSVideoInfo.roomno = video.flRoomId;
+ eSVideoInfosList.Add(eSVideoInfo);
+ }
}
+ catch { }
return eSVideoInfosList;
}
/// <summary>
--
Gitblit v1.8.0