From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 156 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 119 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 5e2a6c0..5a8a945 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>
/// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙ｆ満鍒楄〃
/// </summary>
@@ -25,7 +22,6 @@
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_FL_Check);
return responsePackNew;
}
-
/// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </summary>
@@ -39,50 +35,128 @@
/// <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>
+ /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
+ /// </summary>
+ public static void GetQRcode(FrameLayout frame, VideoClouds video, Action<bool, string> action)
+ {
+ ///鏍囪鏄惁鎴愬姛
+ bool if_bool = false;
+ //涓存椂瀵嗙爜
+ string pwd = VideoMethod.GetCode();
+ var jobject = new JObject();
jobject.Add("communityID", video.flCmtId);//绀惧尯ID
+ jobject.Add("fromTime", VideoMethod.GetCurrentTimeStamp());//寮�濮嬫椂闂�
+ jobject.Add("validTime", VideoMethod.GetTomorrowTimeStamp());//鏈夋晥鏃堕棿
+ jobject.Add("unitno", video.flBuildingId);//鍗曞厓鍙�
+ jobject.Add("roomno", video.flRoomId);//鎴块棿鍙�
+ jobject.Add("code", pwd);
jobject.Add("userKey", video.id);
jobject.Add("timestamp", VideoMethod.GetCurrentTimeStamp());
jobject.Add("secretKey", video.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))
+ {
+ if (str.Contains("status"))
+ {
+ //var json = JObject.Parse(str);
+ //if (json != null)
+ //{
+ // var stateCode = json["status"].ToString();
+ // if (stateCode == "0")
+ // {
+ // if_bool = true;
+ // }
+ //}
+ if_bool = true;
+ }
+ else {
+ var json = JObject.Parse(str);
+ if (json != null)
+ {
+ var stateCode = json["desc"].ToString();
+ Application.RunOnMainThread(() =>
+ {
+ //閿欒鎻愮ず
+ new Intelligence.Automation.LogicView.TipPopView().FlashingBox(stateCode);
+ });
+ }
+ }
+ }
+ }
+ 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)
@@ -137,5 +211,13 @@
return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
}
+
+
+ }
+ class FlResponsePackNew
+ {//
+ public string status = string.Empty;
+ public string desc = string.Empty;
+
}
}
--
Gitblit v1.8.0