blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
JLChen
2020-11-30 8060dedbec31cc9dbc33adae91b94b8a977c7163 
 HDL_ON/DAL/Server/HttpServerRequest.cs


@@ -460,7 +460,7 @@


        /// </summary>


        public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });


            var requestJson = HttpUtil.GetSignRequestJson(new GetHomeListObj() { homeType = homeType.ToString() });


            var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);


            if (resultObj.Code == StateCode.SUCCESS)


            {


@@ -607,7 +607,7 @@


                requestObj.Address = editName;


            }




            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);


        }




@@ -618,7 +618,7 @@


        {


            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;


            var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = nowhomeId });


            var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });


            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);


            if (revertObj.Code == StateCode.SUCCESS)


            {


@@ -657,7 +657,7 @@


        /// <returns></returns>


        public ResponsePackNew GetResidenceMemberAccount()


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });


            var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);


        }




@@ -672,7 +672,7 @@


                childAccountId = subaccount.childAccountId,


                homeId = subaccount.homeId


            };


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);


        }




@@ -684,7 +684,7 @@


        /// <returns></returns>


        public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()


            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()


            {


                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,


                childAccountId = childAccountId,


@@ -701,7 +701,7 @@


        /// <returns></returns>


        public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()


            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()


            {


                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,


                childAccountId = childAccountId,


@@ -722,7 +722,7 @@


            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);


            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);




            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()


            var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()


            {


                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,


                childAccountId = childAccountId


@@ -807,7 +807,7 @@


        /// <returns></returns>


        public ResponsePackNew DeleteShareData(ShareData shareData)


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()


            var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()


            {


                homeId = shareData.homeId,


                homeShareId = shareData.id


@@ -842,7 +842,7 @@


        {


            //添加子账号


            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);




        }


@@ -889,7 +889,7 @@


        {


            try


            {


                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()


                var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()


                {


                    attachClientId = attachClientId,


                    homeType = HomeTypeEnum.BUSPRO.ToString()


@@ -923,7 +923,7 @@


#if __IOS__


                deviceType = PhoneDeviceType.IOS.ToString();


#endif


                //是否生成模式


                //是否生产模式


                bool isProduce = true;


#if DEBUG


                isProduce = false;


@@ -940,9 +940,10 @@


                    deviceName = OnAppConfig.Instance.PhoneName,


                    deviceType = deviceType,


                    produce = isProduce,




                };


               


                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);


                //var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);


                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);


                if (revertObj.Code == StateCode.SUCCESS)


                {


@@ -976,9 +977,9 @@


        /// 查询推送信息列表


        /// </summary>


        /// <returns></returns>


        public ResponsePackNew PushSerivceGetpushmessagelist()


        public ResponsePackNew PushSerivceGetPushmessagelist()


        {


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()


            var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()


            {


                pushId = OnAppConfig.Instance.PushId


            });


@@ -993,7 +994,7 @@


        {


            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;




            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()


            var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()


            {


                pushId = OnAppConfig.Instance.PushId


            });


@@ -1019,7 +1020,7 @@


            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;


            try


            {


                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {


                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {


                    pushId = OnAppConfig.Instance.PushId


                });


               


@@ -1051,7 +1052,7 @@




            try


            {


                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()


                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()


                {


                    pushId = OnAppConfig.Instance.PushId


                });


@@ -1083,7 +1084,7 @@




            try


            {


                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()


                var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()


                {


                    msgId = msgId


                });


@@ -1116,7 +1117,7 @@




            try


            {


                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()


                var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()


                {


                    msgId = msgId


                });


@@ -1194,7 +1195,7 @@


#if __IOS__


            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();


#endif


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);


        }




@@ -1211,7 +1212,7 @@


#if __IOS__


            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();


#endif


            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);


        }




@@ -1284,52 +1285,6 @@




        #endregion




        #region mqtt远程连接（旧）


        /// <summary>


        /// 请求Mqtt数据


        /// </summary>


        /// <param name="dataStringJson">请求的参数.</param>


        public ResponsePack RequestMqttInfo(string dataStringJson)


        {


            ResponsePack revertObj = null;




            var webClient = new WebClient();


            #region


            webClient.Headers.Add("CONTENT-TYPE", "application/json");


            var url = "https://global.hdlcontrol.com/ProposedProductionApi/EmqMqtt/GetConnMqttInfo";




            byte[] bytes = null;


            try


            {


                bytes = webClient.UploadData(url, Encoding.UTF8.GetBytes(dataStringJson));


            }


            catch (Exception ex)


            {


                Console.WriteLine(ex.Message);


                revertObj = new ResponsePack() { StateCode = "Net_Error" };


            }




            string responseString = null;


            if (bytes != null)


            {


                responseString = Encoding.UTF8.GetString(bytes);


            }




            if (responseString != null)


            {


                try


                {


                    revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);


                }


                catch (Exception ex)


                {


                    Console.WriteLine(ex.ToString());


                }


            }


            return revertObj;


            #endregion


        }


        #endregion




        #region 备份部分


        ///// <summary>