Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 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);