blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2023-03-24 71fd5b743d0c5e46ba686449e7f855e91a688886 
 HDL_ON/DAL/Server/HttpServerRequest.cs


@@ -544,6 +544,13 @@


                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());


                if (homeList == null || homeList.Count == 0)


                {


                    if (DB_ResidenceData.Instance.CurrentRegion.id != "")


                    {


                        Shared.Application.RunOnMainThread(() =>StringId


                        {


                            MainPage.GoUserPage(false);


                        });


                    }


                }


                else


                {


@@ -564,6 +571,10 @@


                    }


                    if (UserInfo.Current.regionList.Count == 0)


                    {


                        Shared.Application.RunOnMainThread(() =>


                        {


                            MainPage.GoUserPage(false);


                        });


                        return "null";


                    }


                    //-------如果账号是首次登录


@@ -726,7 +737,7 @@


        {


            var requestObj = new ChildDeleteObj()


            {


                childAccountId = subaccount.childAccountId,


                childId = subaccount.id,


                homeId = subaccount.homeId


            };


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


@@ -741,12 +752,11 @@


        /// <returns></returns>


        public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)


        {


            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()


            {


                homeId = DB_ResidenceData.Instance.CurrentRegion.id,


                childAccountId = childAccountId,


                nickName = nickName,


            });


            var d = new Dictionary<string, string>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("childId", childAccountId);


            d.Add("nickName", nickName);


            var requestJson = HttpUtil.GetSignRequestJson(d);


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




        }


@@ -761,7 +771,7 @@


            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()


            {


                homeId = DB_ResidenceData.Instance.CurrentRegion.id,


                childAccountId = childAccountId,


                childId = childAccountId,


                isAllowCreateScene = isAllow,


            });


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


@@ -977,10 +987,60 @@


        public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)


        {


            //添加子账号


            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.id, account = subAccount, nickName = nickName };


            var requestObj = new ChildAddObj()


            {


                homeId = DB_ResidenceData.Instance.CurrentRegion.id,


                account = subAccount,


                nickName = nickName


            };


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


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


        }


        //v1.7更新接口


        public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName,string faceUrl)


        {


            //添加子账号




            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("nickName", nickName);


            if (!string.IsNullOrEmpty(subAccount))


            {


                d.Add("account", subAccount);


            }


            if (!string.IsNullOrEmpty(faceUrl))


            {


                d.Add("faceUrl", @"data:image/jpg;base64," + faceUrl);


            }


            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }


        /// <summary>


        /// 删除成员账号人脸数据


        /// </summary>


        /// <param name="subAccount"></param>


        /// <param name="nickName"></param>


        /// <param name="faceUrl"></param>


        /// <returns></returns>


        public ResponsePackNew DeleteMemberFace( string childId)


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("childId", childId);


            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }


        /// <summary>


        /// 更新成员账号人脸数据


        /// </summary>


        public ResponsePackNew UpdataMemberFace(string childId, string faceUrl)


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("childId", childId);


            d.Add("userFace", @"data:image/jpg;base64," + faceUrl);


            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }




        /// <summary>


@@ -2078,7 +2138,7 @@


        /// <param name="productPlatform"></param>


        /// <param name="productBrand"></param>


        /// <returns></returns>


        public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName, string pairCode = "")


        public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName,string productBrandIdentity, string pairCode = "")


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


@@ -2086,6 +2146,7 @@


            d.Add("extDevId", extDevId);


            d.Add("name", deviceName);


            d.Add("code", pairCode);


            d.Add("productBrandIdentity", productBrandIdentity);






            var requestJson = HttpUtil.GetSignRequestJson(d);


@@ -3071,7 +3132,7 @@








#region 光伏储能


        #region 光伏储能


        /// <summary>


        /// 获取住宅下逆变器列表


        /// </summary>


@@ -3096,7 +3157,55 @@


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetInverter_StatisticsInfo, requestJson);


            return pack;


        }


#endregion


        #endregion






        #region 群控，组合调光


        /// <summary>


        /// 获取群控类型


        /// </summary>


        /// <param name="spk"></param>


        /// <returns></returns>


        public ResponsePackNew GetGroupControlTypes(string spk)


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("spk", spk);


            var requestJson = HttpUtil.GetSignRequestJson(d);


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlTypes, requestJson);


            return pack;


        }


        /// <summary>


        /// 获取群控列表


        /// </summary>


        /// <param name="spk"></param>


        /// <returns></returns>


        public ResponsePackNew GetGroupControlList()


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            var requestJson = HttpUtil.GetSignRequestJson(d);


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlListByHome, requestJson);


            return pack;


        }






        /// <summary>


        /// 添加群控列表


        /// </summary>


        /// <param name="spk"></param>


        /// <returns></returns>


        public ResponsePackNew AddGroupControl(List<GroupControl> groupControls)


        {


            Dictionary<string, object> d = new Dictionary<string, object>();


            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);


            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);


            d.Add("infos", groupControls);


            var requestJson = HttpUtil.GetSignRequestJson(d);


            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlListByHome, requestJson);


            return pack;


        }




        #endregion




    }


}