blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
JLChen
2020-12-08 9dce5facf5c6aa29928880a0fa2fbfc7366a6dad 
 HDL_ON/DAL/Server/HttpServerRequest.cs


@@ -99,7 +99,7 @@


        public ResponsePackNew GetRegionByAccount(string account)


        {


            var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });


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


            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson, HttpUtil.GlobalRequestHttpsHost);


        }




        /// <summary>


@@ -636,6 +636,11 @@


                            if (mHomeGatewayRes.Count > 0)


                            {


                                DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];


                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")


                                {


                                    DriverLayer.Control.Ins.IsRemote = true;


                                    DriverLayer.Control.Ins.GatewayOnline = true;


                                }


                                DB_ResidenceData.residenceData.SaveResidenceData();


                                return;


                            }


@@ -1798,13 +1803,14 @@


        {


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


            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);


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


            //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);


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


        }


        /// <summary>


        /// 获取设备详情列表


@@ -1817,7 +1823,7 @@


            d.Add("deviceIds", functionIds);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        /// <summary>


        /// 控制设备


@@ -1827,11 +1833,11 @@


        {


            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("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);


            d.Add("actions", actionObjs);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        /// <summary>


        /// 设备绑定房间


@@ -1844,7 +1850,7 @@


            d.Add("roomIds", new List<string>() { roomId});




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;


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


        }


        /// <summary>


        /// 设备解绑房间


@@ -1857,7 +1863,7 @@


            d.Add("roomIds", new List<string>() { roomId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_UnbindDeviceToRoom, requestJson).Code;


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


        }


        /// <summary>


        /// 设备名称修改


@@ -1870,7 +1876,7 @@


            d.Add("name", deviceName);




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EditDeviceName, requestJson).Code;


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


        }


        /// <summary>


        /// 收藏设备


@@ -1882,7 +1888,7 @@


            d.Add("deviceId",new List<string>() { deviceId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectDevice, requestJson).Code;


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


        }


        /// <summary>


        /// 取消收藏设备


@@ -1894,7 +1900,7 @@


            d.Add("deviceId", new List<string>() { deviceId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CancelCollectDevice, requestJson).Code;


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


        }




        #endregion


@@ -1916,7 +1922,7 @@


            }




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        /// <summary>


        /// 获取场景详情


@@ -1929,7 +1935,7 @@


            d.Add("userSceneIds",new List<string>() { seceneId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        /// <summary>


        /// 添加场景


@@ -1938,10 +1944,11 @@


        public ResponsePackNew AddScene(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);


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


        }


        /// <summary>


        /// 编辑场景


@@ -1955,7 +1962,7 @@


            d.Add("scenes", new List<Scene>() { scene });




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        /// <summary>


        /// 删除场景


@@ -1968,7 +1975,7 @@


            d.Add("userSceneIds", new List<string>() { userSceneId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_DeleteSecne, requestJson).Code;


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


        }


        /// <summary>


        /// 执行场景


@@ -1981,7 +1988,7 @@


            d.Add("userSceneIds", new List<string>() { userSceneId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ExecuteSecne, requestJson).Code;


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


        }


        /// <summary>


        /// 收藏场景


@@ -1995,7 +2002,7 @@


            d.Add("userSceneIds", new List<string>() { userSceneId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_CollectScene, requestJson).Code;


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


        }


        /// <summary>


        /// 取消收藏场景


@@ -2009,7 +2016,7 @@


            d.Add("userSceneIds", new List<string>() { userSceneId });




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


        }


        #endregion




@@ -2017,42 +2024,74 @@


        /// <summary>


        /// 获取房间列表


        /// </summary>


        /// <param name="GetType">获取类型：ROOM\FLOOR;不输入返回全部</param>


        /// <returns></returns>


        public ResponsePackNew GetRoomList()


        public ResponsePackNew GetRoomList(string GetType = "All")


        {


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


            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);




            if (GetType != "All")


            {


                d.Add("roomType", GetType);


            }


            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


            


            return pack;


        }


        /// <summary>


        /// 添加房间


        /// 添加房间\楼层


        /// 楼层也属于房间


        /// </summary>


        /// <returns></returns>


        public ResponsePackNew AddRoom(List<Room> rooms)


        public ResponsePackNew AddRoom(List<SpatialInfo> 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.


            }


            d.Add("rooms", rooms);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


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


            var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());


            if (revData != null)


            {


                SpatialInfo.CurrentSpatial.UpdateSpatialList(revData, OptionType.Update);


            }


            return pack;


        }


        /// <summary>


        /// 添加楼层


        /// 修改房间信息


        /// </summary>


        /// <returns></returns>


        public ResponsePackNew AddFloor()


        public ResponsePackNew UpdateRoom(List<SpatialInfo> rooms)


        {


            return null;


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


            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);


            d.Add("rooms", rooms);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


            //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());


            //if (revData != null)


            //{


            //    SpatialInfo.CurrentSpatial.UpdateSpatialList(revData,OptionType.Update);


            //}


            return pack;


        }


        /// <summary>


        /// 删除房间


        /// </summary>


        /// <param name="roomIds"></param>


        /// <returns></returns>


        public ResponsePackNew DeleteRoom(List<string> roomIds)


        {


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


            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);


            d.Add("ids", roomIds);




            var requestJson = HttpUtil.GetSignRequestJson(d);


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


            return pack;


        }




        #endregion