From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 162 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 124 insertions(+), 38 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs index 5e2a6c0..ae759bb 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs @@ -6,15 +6,12 @@ using HDL_ON.UI.UI2.PersonalCenter.PirDevice; using Newtonsoft.Json.Linq; using Shared; -using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod; namespace HDL_ON.UI.UI2.FuntionControlView.Video { public class VideoSend { - - /// <summary> /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙f満鍒楄〃 /// </summary> @@ -30,60 +27,140 @@ /// 鑾峰彇閫氳瘽璁板綍 /// </summary> /// <returns></returns> - public static ResponsePackNew GetCall(string flBindId) + public static ResponsePackNew GetCall() { - var jObject = new JObject { { "homeId", PirSend.HomeId }, { "flBindId", flBindId }, { "pageSize", int.MaxValue } }; + var jObject = new JObject { { "homeId", PirSend.HomeId }, { "pageSize", int.MaxValue } }; var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_FL_GetCallList); return responsePackNew; } + /// <summary> /// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠$悊鏈�,5浜屾纭鏈�) /// </summary> - public static List<ESVideoInfo> GetVideoInfoList(VideoObj video) + public static List<FlVideo> GetVideoInfoList(VideoClouds video) { - List<ESVideoInfo> eSVideoInfosList = new List<ESVideoInfo>(); + List<FlVideo> eSVideoInfosList = new List<FlVideo>(); 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; + } + eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FlVideo>>(json["list"].ToString()); + } + catch { } return eSVideoInfosList; } + + /// <summary> + /// 鑾峰彇鍙瀵硅璁惧鍒楄〃 + /// </summary> + /// <returns></returns> + public static ResponsePackNew GetVideoInfoList() + { + var jobject = new JObject(); + jobject.Add("homeId", PirSend.HomeId);//1382596006055460866 + var requestJson = HttpUtil.GetSignRequestJson(jobject);//鏁版嵁绛惧悕 + // 鑾峰彇鍙瀵硅璁惧鍒楄〃 + var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDeviceList, requestJson); + return revertObj; + } + + /// <summary> + /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥) + /// </summary> + public static void GetQRcode(FrameLayout frame, Video video, Action<bool, string> action) + { + ///鏍囪鏄惁鎴愬姛 + bool if_bool = false; + //涓存椂瀵嗙爜 + string pwd = VideoMethod.GetCode(); + var jobject = new JObject(); jobject.Add("communityID", video.flRoomBindVO.flCmtId);//绀惧尯ID + jobject.Add("fromTime", VideoMethod.GetCurrentTimeStamp());//寮�濮嬫椂闂� + jobject.Add("validTime", VideoMethod.GetTomorrowTimeStamp());//鏈夋晥鏃堕棿 + jobject.Add("unitno", video.flRoomBindVO.flBuildingId);//鍗曞厓鍙� + jobject.Add("roomno", video.flRoomBindVO.flRoomId);//鎴块棿鍙� + jobject.Add("code", pwd); jobject.Add("userKey", video.flRoomBindVO.id); jobject.Add("timestamp", VideoMethod.GetCurrentTimeStamp()); jobject.Add("secretKey", video.flRoomBindVO.flSecretKey); jobject.Add("method", "setdynamicpwd"); jobject.Add("numTimes", "5"); + //鍔犺浇log + Loading loading = new Loading(); + frame.AddChidren(loading); + loading.Start(); + new System.Threading.Thread(() => + { + try + { + var str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST"); + if (!string.IsNullOrEmpty(str)) + { + var json = JObject.Parse(str); + if (json != null) + { + var stateCode = json["status"].ToString(); + if (stateCode == "0") + { + if_bool = true; + } + } + } + } + catch { } + finally + { + Application.RunOnMainThread(() => + { + loading.Hide(); + action(if_bool, pwd); + + }); + } + + }) + { IsBackground = true }.Start(); + } + + /// <summary> + /// 涓嬭浇鍥剧墖 + /// </summary> + public static void GetIcon(FrameLayout frame,string url) + { + Loading loading = new Loading(); + frame.AddChidren(loading); + loading.Start(); + new System.Threading.Thread(() => + { + try + { + var responsePackNew = RequestServerhomeId(null, url); + } + catch { } + finally + { + Application.RunOnMainThread(() => + { + loading.Hide(); + + }); + } + + }) + { IsBackground = true }.Start(); + } + /// <summary> /// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(鏀寔璇锋眰鏂瑰紡涓篜OST/GET) /// </summary> @@ -127,6 +204,7 @@ return null; } } + /// <summary> ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� /// </summary> @@ -137,5 +215,13 @@ return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout); } + + + } + class FlResponsePackNew + {// + public string status = string.Empty; + public string desc = string.Empty; + } } -- Gitblit v1.8.0