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 | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 9539a84..5a8a945 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -12,8 +12,6 @@
public class VideoSend
{
-
-
/// <summary>
/// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙ｆ満鍒楄〃
/// </summary>
@@ -24,7 +22,6 @@
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_FL_Check);
return responsePackNew;
}
-
/// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </summary>
@@ -38,9 +35,9 @@
/// <summary>
/// 鑾峰彇闂ㄥ彛鏈哄垪琛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
/// </summary>
- public static List<VideoMethod.FlVideo> GetVideoInfoList(VideoMethod.VideoClouds video)
+ public static List<FlVideo> GetVideoInfoList(VideoClouds video)
{
- List<VideoMethod.FlVideo> eSVideoInfosList = new List<VideoMethod.FlVideo>();
+ List<FlVideo> eSVideoInfosList = new List<FlVideo>();
var jobject = new JObject();
jobject.Add("cmtID", video.flCmtId);
jobject.Add("unitno", video.flBuildingId);
@@ -61,47 +58,27 @@
{
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)
- {
- VideoMethod.FlVideo flVideo = new VideoMethod.FlVideo();
- flVideo.aliasName = videoInfo["aliasName"];
- if (videoInfo["uuid"].Contains(","))
- {
- var uuid = videoInfo["uuid"].Split(',');
- flVideo.uuid = uuid[0];
- }
- else
- {
- flVideo.uuid = videoInfo["uuid"];
- }
- flVideo.devType = videoInfo["devType"];
- //eSVideoInfo.roomno = video.flRoomId;
- eSVideoInfosList.Add(flVideo);
- }
+ eSVideoInfosList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FlVideo>>(json["list"].ToString());
+
}
catch { }
return eSVideoInfosList;
}
/// <summary>
- /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�
+ /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
/// </summary>
- public static void GetQRcode(FrameLayout frame, VideoMethod.VideoClouds video,Action<bool,string>action)
+ public static void GetQRcode(FrameLayout frame, VideoClouds video, Action<bool, string> action)
{
///鏍囪鏄惁鎴愬姛
bool if_bool = false;
//涓存椂瀵嗙爜
- string pwd = VideoMethod.getCode();
+ 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.flSecretKey);
jobject.Add("timestamp", VideoMethod.GetCurrentTimeStamp());
jobject.Add("secretKey", video.flSecretKey);
jobject.Add("method", "setdynamicpwd");
jobject.Add("numTimes", "5");
+ 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);
@@ -113,20 +90,30 @@
var str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST");
if (!string.IsNullOrEmpty(str))
{
- try
+ 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["resCode"].ToString();
- if (stateCode != "0")
+ var stateCode = json["desc"].ToString();
+ Application.RunOnMainThread(() =>
{
- if_bool = true;
- }
+ //閿欒鎻愮ず
+ new Intelligence.Automation.LogicView.TipPopView().FlashingBox(stateCode);
+ });
}
- }
- catch {
-
}
}
}
@@ -137,6 +124,33 @@
{
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();
});
}
@@ -197,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