From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 9388f8b..ae759bb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -3,7 +3,6 @@
using System.IO;
using System.Net;
using HDL_ON.DAL.Server;
-using HDL_ON.Entity;
using HDL_ON.UI.UI2.PersonalCenter.PirDevice;
using Newtonsoft.Json.Linq;
using Shared;
@@ -82,18 +81,6 @@
return revertObj;
}
- public static ResponsePackNew GetQRcode()
- {
- var jobject = new JObject();
- jobject.Add("userId", UserInfo.Current.ID);
- jobject.Add("userType", "C");
- jobject.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
- jobject.Add("codeSecond", "60");
- var requestJson = HttpUtil.GetSignRequestJson(jobject);//鏁版嵁绛惧悕
- var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_OwnerQRCode, requestJson);
- return revertObj;
- }
-
/// <summary>
/// 涓婃姤鍔ㄦ�佸紑閿佸瘑鐮�(娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥)
/// </summary>
@@ -103,21 +90,12 @@
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");
-
+ 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);
@@ -126,9 +104,7 @@
{
try
{
- string str = "";
-
- str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST");
+ var str = HttpWebRequest(NewAPI.API_POST_FL_QRcode, jobject.ToString(), "POST");
if (!string.IsNullOrEmpty(str))
{
var json = JObject.Parse(str);
--
Gitblit v1.8.0