2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。

JLChen

2020-12-02 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -3,10 +3,8 @@
using System.IO;
using System.Net;
using System.Text;
using HDL_ON.DAL.Mqtt;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;

namespace HDL_ON.DAL.Server
{
@@ -718,7 +716,7 @@
        /// </summary>
        /// <param name="addShareObj"></param>
        /// <returns></returns>
        public ResponsePackNew AddShare(AddShareObj addShareObj)
        public ResponsePackNew AddShareData(AddShareObj addShareObj)
        {
            var requestJson = HttpUtil.GetSignRequestJson(addShareObj);

@@ -730,7 +728,7 @@
        /// </summary>
        /// <param name="deleteShareObj"></param>
        /// <returns></returns>
        public ResponsePackNew DeleteShare(DeleteShareObj deleteShareObj)
        public ResponsePackNew DeleteShareData(DeleteShareObj deleteShareObj)
        {
            var requestJson = HttpUtil.GetSignRequestJson(deleteShareObj);

@@ -742,123 +740,127 @@
        /// </summary>
        /// <param name="addShareObj"></param>
        /// <returns></returns>
        public ResponsePackNew GetShare(GetShareObj getShareObj)
        public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
        {
            var requestJson = HttpUtil.GetSignRequestJson(getShareObj);
            var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId,
            });

            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
        }
        #endregion

        /// <summary>
        /// 获取住宅下子账号的共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
        {
            //Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("DistributedMark", memberId);
            //d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
        ///// <summary>
        ///// 获取住宅下子账号的共享数据列表
        ///// </summary>
        ///// <returns></returns>
        //public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
        //{
        //    //Dictionary<string, object> d = new Dictionary<string, object>();
        //    //d.Add("DistributedMark", memberId);
        //    //d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);

            var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId
            });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
        //    var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
        //    {
        //        homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
        //        childAccountId = childAccountId
        //    });
        //    return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);

        }
        //}

        /// <summary>
        /// 下载单个分享文件
        /// </summary>
        /// <returns></returns>
        public byte[] GetShareData(ShareData shareData)
        {
            //Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("DistributedMark", memberId);
            //d.Add("HouseDistributedMark", hId);
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
        ///// <summary>
        ///// 下载单个分享文件
        ///// </summary>
        ///// <returns></returns>
        //public byte[] GetShareData(ShareData shareData)
        //{
        //    //Dictionary<string, object> d = new Dictionary<string, object>();
        //    //d.Add("DistributedMark", memberId);
        //    //d.Add("HouseDistributedMark", hId);
        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);

            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
            {
                homeId = shareData.homeId,
                homeShareId = shareData.id
            });
            var replaceToken = "";
            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                replaceToken = DB_ResidenceData.residenceData.MasterToken;
            }
            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
        //    var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
        //    {
        //        homeId = shareData.homeId,
        //        homeShareId = shareData.id
        //    });
        //    var replaceToken = "";
        //    if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
        //    {
        //        replaceToken = DB_ResidenceData.residenceData.MasterToken;
        //    }
        //    return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);

        }
        //}

        /// <summary>
        /// 增加共享数据列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddShareData(ShareData shareData)
        {
            //Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("ShareName", shareData.ShareName);
            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            //d.Add("ShareDataBytes", shareData.ShareDataBytes);
            //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
        ///// <summary>
        ///// 增加共享数据列表
        ///// </summary>
        ///// <returns></returns>
        //public ResponsePackNew AddShareData(ShareData shareData)
        //{
        //    //Dictionary<string, object> d = new Dictionary<string, object>();
        //    //d.Add("ShareName", shareData.ShareName);
        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
        //    //d.Add("ShareDataBytes", shareData.ShareDataBytes);
        //    //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);

            var queryDic = new Dictionary<string, object>();
            queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            queryDic.Add("childAccountId", shareData.childAccountId);
            queryDic.Add("fileName", shareData.fileName);
            var replaceToken = "";
            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                replaceToken = DB_ResidenceData.residenceData.MasterToken;
            }
            return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
        }
        //    var queryDic = new Dictionary<string, object>();
        //    queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
        //    queryDic.Add("childAccountId", shareData.childAccountId);
        //    queryDic.Add("fileName", shareData.fileName);
        //    var replaceToken = "";
        //    if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
        //    {
        //        replaceToken = DB_ResidenceData.residenceData.MasterToken;
        //    }
        //    return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
        //}

        /// <summary>
        /// 增加共享数据
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew EditShareData(ShareData shareData)
        {
            return AddShareData(shareData);
            //Dictionary<string, object> d = new Dictionary<string, object>();
            //d.Add("DistributedMark", shareData.DistributedMark);
            //d.Add("ShareName", shareData.ShareName);
            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            //d.Add("ShareDataBytes", shareData.ShareDataBytes);
            //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
        }
        ///// <summary>
        ///// 增加共享数据
        ///// </summary>
        ///// <returns></returns>
        //public ResponsePackNew EditShareData(ShareData shareData)
        //{
        //    return AddShareData(shareData);
        //    //Dictionary<string, object> d = new Dictionary<string, object>();
        //    //d.Add("DistributedMark", shareData.DistributedMark);
        //    //d.Add("ShareName", shareData.ShareName);
        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
        //    //d.Add("ShareDataBytes", shareData.ShareDataBytes);
        //    //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
        //}

        /// <summary>
        /// 删除共享数据
        /// </summary>
        /// <param name="shareData"></param>
        /// <returns></returns>
        public ResponsePackNew DeleteShareData(ShareData shareData)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()
            {
                homeId = shareData.homeId,
                homeShareId = shareData.id
            });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
            //Dictionary<string, string> d = new Dictionary<string, string>();
            //d.Add("DistributedMark", shareData.DistributedMark);
            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        }
        ///// <summary>
        ///// 删除共享数据
        ///// </summary>
        ///// <param name="shareData"></param>
        ///// <returns></returns>
        //public ResponsePackNew DeleteShareData(ShareData shareData)
        //{
        //    var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()
        //    {
        //        homeId = shareData.homeId,
        //        homeShareId = shareData.id
        //    });
        //    return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
        //    //Dictionary<string, string> d = new Dictionary<string, string>();
        //    //d.Add("DistributedMark", shareData.DistributedMark);
        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
        //}
        ///// <summary>
        ///// 删除子账号当前住宅的所有共享数据
        ///// </summary>
@@ -981,9 +983,9 @@
                    deviceType = deviceType,
                    produce = isProduce,
                };
               
                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
                //var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);

                //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)
                {
@@ -1012,16 +1014,31 @@
            }
        }

       

        /// <summary>
        /// 查询推送信息列表
        /// </summary>
        /// <param name="queryType"></param>
        /// <returns></returns>
        public ResponsePackNew PushSerivceGetPushmessagelist()
        public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
        {
            var pushType = "";
            if (queryType == 1)
            {
                pushType = PushType.Default.ToString();
            } else if (queryType == 1)
            {
                pushType = PushType.Alarm.ToString();
            }
            else if (queryType == 2)
            {
                pushType = PushType.Prompt.ToString();
            }

            var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
            {
                pushId = OnAppConfig.Instance.PushId
                pushId = OnAppConfig.Instance.PushId,
                pushType = pushType
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
        }
@@ -1169,7 +1186,7 @@
                }
                else
                {

                    IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                }
                return false;
            }
@@ -1228,33 +1245,16 @@
        /// <returns></returns>
        public ResponsePackNew CheckAppVersion()
        {
            var requestObj = new ForceUpdateObj()
            var requestObj = new AppVersionCheckObj()
            {
                LanguageType = Utlis.GetPostLanguageType()

            };
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif

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

        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetAppVersion()
        {
            var requestObj = new ForceUpdateObj()
            {

            };
#if __IOS__
            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
#endif
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
        }

        #endregion

@@ -1800,5 +1800,272 @@
        #endregion


        #region Kaede --设备功能——————————————————————————————————
        /// <summary>
        /// 获取设备列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetDeviceList()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("roomId", DB_ResidenceData.residenceData.residecenInfo.RegionID);//可控参数，当需要分页获取，怎么知道分页总数
            //d.Add("searchType", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageSize", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            //d.Add("pageNo", DB_ResidenceData.residenceData.residecenInfo.RegionID);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieList, requestJson);
        }
        /// <summary>
        /// 获取设备详情列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetDeviceInfoList(List<string> functionIds)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceIds", functionIds);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
        }
        /// <summary>
        /// 控制设备
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew ControlDevice(List<ApiAlinkControlActionObj> actionObjs)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("gatewayId", DriverLayer.Control.Ins.GatewayId);
            d.Add("actions", actionObjs);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ControlDevice, requestJson);
        }
        /// <summary>
        /// 设备绑定房间
        /// </summary>
        public string BindDeviceToRoom(string deviceId,string roomId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceIds", new List<string>() { deviceId});
            d.Add("roomIds", new List<string>() { roomId});

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;
        }
        /// <summary>
        /// 设备解绑房间
        /// </summary>
        public string UnbindDeviceToRoom(string deviceId, string roomId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceIds", new List<string>() { deviceId });
            d.Add("roomIds", new List<string>() { roomId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;
        }
        /// <summary>
        /// 设备名称修改
        /// </summary>
        public string EditDeviceName(string deviceId, string deviceName)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceId", deviceId);
            d.Add("name", deviceName);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
        }
        /// <summary>
        /// 收藏设备
        /// </summary>
        public string CollectDevice(string deviceId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceId",new List<string>() { deviceId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectDevice, requestJson).Code;
        }
        /// <summary>
        /// 取消收藏设备
        /// </summary>
        public string CancelCollectDevice(string deviceId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("deviceId", new List<string>() { deviceId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code;
        }

        #endregion

        #region Kaede --场景功能--------------------------
        /// <summary>
        /// 获取场景列表
        /// 房间ID可空，默认查询住宅下所有房间
        /// </summary>
        /// <param name="roomId">房间ID</param>
        /// <returns></returns>
        public ResponsePackNew GetSceneList(string roomId = null)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            if (roomId != null)
            {
                d.Add("roomId", roomId);
            }

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
        }
        /// <summary>
        /// 获取场景详情
        /// </summary>
        /// <param name="seceneId">场景ID</param>
        /// <returns></returns>
        public ResponsePackNew GetSceneInfo(string seceneId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("userSceneIds",new List<string>() { seceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetSecneList, requestJson);
        }
        /// <summary>
        /// 添加场景
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddScene(Scene scene)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
        }
        /// <summary>
        /// 编辑场景
        /// </summary>
        /// <param name="scene"></param>
        /// <returns></returns>
        public ResponsePackNew EditScene(Scene scene)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("scenes", new List<Scene>() { scene });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditSecne, requestJson);
        }
        /// <summary>
        /// 删除场景
        /// </summary>
        /// <returns></returns>
        public string DeleteScene(string userSceneId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_DeleteSecne, requestJson).Code;
        }
        /// <summary>
        /// 执行场景
        /// </summary>
        /// <returns></returns>
        public string ExecuteScene(string userSceneId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;
        }
        /// <summary>
        /// 收藏场景
        /// </summary>
        /// <param name="userSceneId"></param>
        /// <returns></returns>
        public string CollectScene(string userSceneId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectScene, requestJson).Code;
        }
        /// <summary>
        /// 取消收藏场景
        /// </summary>
        /// <param name="userSceneId"></param>
        /// <returns></returns>
        public string CancelCollectScene(string userSceneId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            d.Add("userSceneIds", new List<string>() { userSceneId });

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
        }
        #endregion

        #region Kaede --房间功能--------------------------
        /// <summary>
        /// 获取房间列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew GetRoomList()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetRoomList, requestJson);
        }
        /// <summary>
        /// 添加房间
        /// 楼层也属于房间
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddRoom(List<Room> rooms)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
            foreach(var room in  rooms)
            {
                Dictionary<string, string> d1 = new Dictionary<string, string>();
                d1.Add("roomName", room.name);
                d1.Add("roomType", "ROOM");
                //d1.
            }

            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_AddRoom, requestJson);
        }
        /// <summary>
        /// 添加楼层
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew AddFloor()
        {
            return null;
        }

        #endregion
    }
}