From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc

---
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
index 9388f8b..96acc51 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs
@@ -82,6 +82,10 @@
             return revertObj;
         }
 
+        /// <summary>
+        /// 鑾峰彇闂ㄧ浜岀淮鐮侊紙鑷爺锛�
+        /// </summary>
+        /// <returns></returns>
         public static ResponsePackNew GetQRcode()
         {
             var jobject = new JObject();
@@ -103,21 +107,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 +121,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