From 8ccc71771efec9434ad3b4a45c5f2ec11326d40f Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期五, 23 四月 2021 10:25:24 +0800
Subject: [PATCH] 2021-04-23 添加乐橙可视对讲
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 5a8a945..ae759bb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -22,16 +22,18 @@
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_FL_Check);
return responsePackNew;
}
+
/// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </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>
@@ -64,21 +66,36 @@
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, VideoClouds video, Action<bool, string> action)
+ 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.flCmtId);//绀惧尯ID
+ 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.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");
+ 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);
@@ -90,29 +107,13 @@
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 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["status"].ToString();
+ if (stateCode == "0")
{
- var stateCode = json["desc"].ToString();
- Application.RunOnMainThread(() =>
- {
- //閿欒鎻愮ず
- new Intelligence.Automation.LogicView.TipPopView().FlashingBox(stateCode);
- });
+ if_bool = true;
}
}
}
@@ -131,6 +132,7 @@
})
{ IsBackground = true }.Start();
}
+
/// <summary>
/// 涓嬭浇鍥剧墖
/// </summary>
@@ -158,6 +160,7 @@
})
{ IsBackground = true }.Start();
}
+
/// <summary>
/// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(鏀寔璇锋眰鏂瑰紡涓篜OST/GET)
/// </summary>
@@ -201,6 +204,7 @@
return null;
}
}
+
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
--
Gitblit v1.8.0