blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wxr
2023-03-16 86c5efb3d78c3fe294da95872b43bac1ce324c08 
 HDL_ON/DAL/Server/HttpServerRequest.cs


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


        {


            var requestObj = new ChildDeleteObj()


            {


                childAccountId = subaccount.childAccountId,


                childId = subaccount.id,


                homeId = subaccount.homeId


            };


            var requestJson = HttpUtil.GetSignRequestJson(requestObj);


@@ -741,12 +741,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 +760,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 +976,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>


@@ -1354,18 +1403,52 @@


        {


            var requestObj = new AppVersionCheckObj()


            {




                


            };


            #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 获取天气部分


        #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 获取天气部分


        /// <summary>


        /// 获取指定经纬度的城市信息天气信息


        /// </summary>


@@ -1968,6 +2051,18 @@




        #region Kaede --设备功能——————————————————————————————————


        /// <summary>


        /// 获取乐橙子账号token


        /// </summary>


        /// <returns></returns>


        public ResponsePackNew GetLcSubAccountToken()


        {


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


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




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }


        /// <summary>


        /// 获取设备列表


        /// </summary>


        /// <returns></returns>


@@ -1999,8 +2094,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);


            }




@@ -2030,7 +2127,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);


@@ -2038,12 +2135,28 @@


            d.Add("extDevId", extDevId);


            d.Add("name", deviceName);


            d.Add("code", pairCode);


            d.Add("productBrandIdentity", productBrandIdentity);






            var requestJson = HttpUtil.GetSignRequestJson(d);


            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;


        }








@@ -2117,6 +2230,21 @@


            d.Add("name", function.name);


            d.Add("collect", function.collect);


            d.Add("roomIds", function.roomIds);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }


        /// <summary>


        /// 编辑设备信息


        /// 绑定关系、名称、收藏


        /// </summary>


        /// <returns></returns>


        public ResponsePackNew UpdataDevcieName(Function function,string name)


        {


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


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


            d.Add("deviceId", function.deviceId);


            d.Add("name", name);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


@@ -2246,9 +2374,9 @@


        }






        #endregion


#endregion




        #region Kaede --场景功能--------------------------


#region Kaede --场景功能--------------------------


        /// <summary>


        /// 获取场景列表


        /// 房间ID可空，默认查询住宅下所有房间


@@ -2380,9 +2508,9 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;


        }


        #endregion


#endregion




        #region Kaede --房间功能--------------------------


#region Kaede --房间功能--------------------------


        /// <summary>


        /// 获取房间列表


        /// </summary>


@@ -2457,10 +2585,10 @@


            return pack;


        }




        #endregion


#endregion






        #region Kaede -- 安防接口____________________________


#region Kaede -- 安防接口____________________________


        /// <summary>


        /// 获取安防列表


        /// </summary>


@@ -2624,10 +2752,10 @@


            return pack;


        }




        #endregion


#endregion






        #region Kaede --第三方品牌功能--------------------------


#region Kaede --第三方品牌功能--------------------------


        /// <summary>


        /// 获取第三方品牌列表


        /// </summary>


@@ -2739,9 +2867,9 @@


            return pack;


        }




        #endregion


#endregion




        #region ■ 萤石云SDK相关接口_________________________


#region ■ 萤石云SDK相关接口_________________________


        /// <summary>


        /// 河东获取萤石云子账号token的接口


        /// 2021-07-07 新方案接口调整对接


@@ -2754,10 +2882,10 @@


            var requestJson = HttpUtil.GetSignRequestJson(d);


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


        }


        #endregion


#endregion






        #region ■ 可视对讲_________________________


#region ■ 可视对讲_________________________


        /// <summary>


        /// 检查住宅是否绑定丰林


        /// </summary>


@@ -2789,9 +2917,9 @@




        }




        #endregion


#endregion




        #region ■ 门锁相关____________________________


#region ■ 门锁相关____________________________




        /// <summary>


        /// 获取门锁历史记录(按日期降序)


@@ -2860,8 +2988,8 @@


            return listSortLog;


        }




        #endregion


        #region ■ 音箱语言控制相关_________________________


#endregion


#region ■ 音箱语言控制相关_________________________


        /// <summary>


        /// 获取已授权的音箱列表


        /// </summary>


@@ -2925,7 +3053,7 @@


            var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);


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


        }


        #endregion


#endregion




        /// <summary>


        /// 绑定source面板


@@ -2993,7 +3121,7 @@








        #region 光伏储能


#region 光伏储能


        /// <summary>


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


        /// </summary>


@@ -3018,7 +3146,7 @@


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


            return pack;


        }


        #endregion


#endregion




    }


}