From 813aee559e544e6bf7777404612a4712cad184c8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 16:31:38 +0800
Subject: [PATCH] 2021-04-01 1.更新丰林iOS最新SDK
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 100 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 9539a84..e4d944d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -31,7 +31,7 @@
/// <returns></returns>
public static ResponsePackNew GetCall(string flBindId)
{
- var jObject = new JObject { { "homeId", PirSend.HomeId }, { "flBindId", flBindId }, { "pageSize", int.MaxValue } };
+ var jObject = new JObject { { "homeId", PirSend.HomeId }, { "flBindId", flBindId }, { "pageSize", 100 } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_FL_GetCallList);
return responsePackNew;
}
@@ -61,47 +61,38 @@
{
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<VideoMethod.FlVideo>>(json["list"].ToString());
+
}
catch { }
return eSVideoInfosList;
}
+
/// <summary>
- /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�
+ /// 闅忔満瀵嗙爜6浣�
/// </summary>
- public static void GetQRcode(FrameLayout frame, VideoMethod.VideoClouds video,Action<bool,string>action)
+ /// <returns></returns>
public static string getCode()
{
Random rand = new Random();
string code = "";
for (int ctr = 0; ctr < 6; ctr++)
{
code += rand.Next(10).ToString();
}
return code;
}
+
+
+ /// <summary>
+ /// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
+ /// </summary>
+ public static void GetQRcode(FrameLayout frame, VideoMethod.VideoClouds video, Action<bool, string> action)
{
+ System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+ var timeStamp = ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
+ var timeStamp2 = ((long)(DateTime.Now.AddDays(1) - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
+
///鏍囪鏄惁鎴愬姛
bool if_bool = false;
//涓存椂瀵嗙爜
- string pwd = VideoMethod.getCode();
+ string pwd = getCode();
var jobject = new JObject();
jobject.Add("communityID", video.flCmtId);//绀惧尯ID
- jobject.Add("fromTime", VideoMethod.GetCurrentTimeStamp());//寮�濮嬫椂闂�
- jobject.Add("validTime", VideoMethod.GetTomorrowTimeStamp());//鏈夋晥鏃堕棿
+ jobject.Add("fromTime", timeStamp);//寮�濮嬫椂闂�
+ jobject.Add("validTime", timeStamp2);//鏈夋晥鏃堕棿
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", timeStamp);
jobject.Add("secretKey", video.flSecretKey);
jobject.Add("method", "setdynamicpwd");
jobject.Add("numTimes", "5");
//鍔犺浇log
Loading loading = new Loading();
frame.AddChidren(loading);
@@ -113,20 +104,14 @@
var str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST");
if (!string.IsNullOrEmpty(str))
{
- try
+ var json = JObject.Parse(str);
+ if (json != null)
{
- var json = JObject.Parse(str);
- if (json != null)
+ var stateCode = json["status"].ToString();
+ if (stateCode == "0")
{
- var stateCode = json["resCode"].ToString();
- if (stateCode != "0")
- {
- if_bool = true;
- }
+ if_bool = true;
}
- }
- catch {
-
}
}
}
@@ -137,6 +122,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 +209,13 @@
return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
}
+
+
+ }
+ class FlResponsePackNew
+ {//
+ public string status = string.Empty;
+ public string desc = string.Empty;
+
}
}
--
Gitblit v1.8.0