Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -1356,13 +1356,47 @@
            {

            };
            #if __IOS__
            requestObj.releaseSystem = "IOS";
            #else
            requestObj.releaseSystem = "Android";
            #endif

            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
        }
        #endregion



        #region 注销账号
        /// <summary>
        /// 获取当前版本注销账号模式
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetUnregisterModel()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("version", MainPage.VersionString);
            d.Add("appCode", "1588071238036582401");
#if __IOS__
            d.Add("releaseSystem", "IOS");
#else
            d.Add("releaseSystem", "Android");
#endif
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetUnregisterModel, requestJson);
        }
        /// <summary>
        /// 注销账号
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew Unregister(string pwd)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("userId", UserInfo.Current.ID);
            d.Add("pwd", pwd);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_Unregister, requestJson);
        }
        #endregion

        #region 获取天气部分
@@ -1999,8 +2033,10 @@
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("productPlatform", productPlatform);
            d.Add("productBrand", productBrand);
            if (productBrand != "MegaHealth")
            if (productBrand == "MegaHealth" || productBrand == "IMOU")
            {
            }
            else { 
                d.Add("networkConfig", true);
            }

@@ -2044,6 +2080,21 @@
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
        }

        /// <summary>
        /// 删除第三方设备
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew Delete3tyDevice(string deviceId)
        {

            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("deviceId", deviceId);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            var responsePackNew = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Remove3tyDevcie, requestJson);
            return responsePackNew;
        }