From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。

---
 HDL_ON/DAL/Server/HttpServerRequest.cs | 1853 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 1,376 insertions(+), 477 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index c070a38..aec2776 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/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
 {
@@ -39,34 +37,60 @@
         {
         }
 
+        #region kaede ___________浼犳劅鍣ㄥ巻鍙叉暟鎹甠_________________
         /// <summary>
         /// 鑾峰彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
         /// </summary>
-        /// <param name="subnetId"></param>
-        /// <param name="deviceId"></param>
-        /// <param name="bigClass"></param>
-        /// <param name="minClass"></param>
-        /// <param name="queryType"></param>
-        /// <param name="loopId"></param>
-        /// <param name="nowMonth"></param>
-        /// <param name="mac"></param>
+        /// <param name="qType">鏃堕棿鏌ヨ绫诲瀷锛歨our=杩�24灏忔椂銆亀eek=杩戜竴鍛ㄣ�乵onth = 杩戜竴鏈� </param>
+        /// <param name="deviceId">璁惧ID</param>
+        /// <param name="deviceKey">鍔熻兘鏌ヨ绫诲瀷锛歱m25</param>
         /// <returns></returns>
-        public ResponsePack GetSensorHistory(int subnetId, int deviceId, int bigClass, int minClass, int queryType, int loopId, int nowMonth, string mac)
+        public ResponsePackNew GetSensorHistory(string qType, string deviceId,string deviceKey)
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("SubnetID", subnetId);
-            d.Add("DeviceID", deviceId);
-            d.Add("LargeType", bigClass);
-            d.Add("SmallType", minClass);
-            d.Add("QueryType", queryType);
-            d.Add("loopId", loopId);
-            d.Add("NowMonth", nowMonth);
-            d.Add("MAC", DB_ResidenceData.residenceData.residenceGatewayMAC);
-            d.Add("LocalTimeZone", 8);
-            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            return RequestHttps("https://developer.hdlcontrol.com/api/GetSensorPushHistory", jsonString, true);
+            d.Add("type", qType);
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId",  deviceId );
+            d.Add("key",  deviceKey );
 
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_EnvironmentalSensorHistoricalData, requestJson);
         }
+        /// <summary>
+        /// 鑾峰彇瀹夐槻浼犳劅鍣ㄥ巻鍙叉暟鎹�
+        /// </summary>
+        /// <param name="deviceId">璁惧ID</param>
+        /// <param name="pageSize">椤甸潰澶у皬</param>
+        /// <param name="pageNo">椤靛彿</param>
+        /// <returns></returns>
+        public ResponsePackNew GetArmSensorHistory( string deviceId,string pageSize, string pageNo)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            d.Add("pageSize", pageSize);
+            d.Add("pageNo", pageNo);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_ArmSensorHistoricalData, requestJson);
+        }
+        /// <summary>
+        /// 璇诲彇鏈�杩戜竴涓湀鐨勬暟鎹�
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetLastMonthHistory(string deviceId,string key)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            d.Add("key", key);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_SensorLastMonthHistoricalData, requestJson);
+        }
+
+
+        #endregion
 
         //public string GetRequestResultMsg(string resultCode)
         //{
@@ -101,14 +125,14 @@
         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>
         /// 鍒锋柊Token
         /// </summary>
         /// <returns></returns>
-        public bool RefreshToken()
+        public string RefreshToken()
         {
             var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
             {
@@ -122,16 +146,50 @@
                 UserInfo.Current.RefreshToken = revertData.refreshToken;
                 UserInfo.Current.LastTime = DateTime.Now;
                 UserInfo.Current.SaveUserInfo();
-                return true;
             }
-            return false;
+            return revertObj.Code;
         }
 
         #endregion
 
+        /// <summary>
+        /// 缁戝畾璋冭瘯浜哄憳鎻愪氦鐨勪綇瀹�,涓�涓綇瀹呭彧鑳界粦瀹氫竴娆�
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew BindingResidence(string strUrl)
+        {
+            try
+            {
+                if (strUrl.Contains("app/home/deliver") == false)
+                {
+                    //闈炴硶鐨刄RL 杩斿洖涓�涓嚜瀹氫箟鐨勭姸鎬佺爜
+                    return new ResponsePackNew() { Code = "-100" };
+                }
+                var client = new RestSharp.RestClient(strUrl);
+
+                var request = new RestSharp.RestRequest(RestSharp.Method.GET);
+                request.Timeout = 5 * 1000;
+                request.AddHeader("content-type", "application/json");
+                request.AddHeader("Authorization", UserInfo.Current.LoginTokenString);
+
+                var response = client.Execute(request);
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
 
         #region 娉ㄥ唽銆佺櫥褰曢儴鍒�
-       
+
 
         /// <summary>
         /// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -206,7 +264,7 @@
         /// <returns></returns>
         public ResponsePackNew ValidataCodeAndRegister(string account, string password, string code, bool isPhone = false)
         {
-            var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code, memberName = account };
+            var requestObj = new RegisterObj() { loginPwd = password, verifyCode = code};//, memberName = account 
             if (isPhone)
             {
                 requestObj.memberPhone = account;
@@ -277,7 +335,7 @@
         /// 鑾峰彇鐢ㄦ埛淇℃伅
         /// </summary>
         /// <returns></returns>
-        public void GetUserInfo(bool bGetHeadImage = true)
+        public string GetUserInfo(bool bGetHeadImage = true)
         {
             var requestJson = HttpUtil.GetSignRequestJson(new NullObj());
             var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfo, requestJson);
@@ -287,6 +345,7 @@
                 UserInfo.Current.userEmailInfo = info.memberEmail;
                 UserInfo.Current.userMobileInfo = info.memberPhone;
                 UserInfo.Current.userName = info.memberName;
+                
                 if (!string.IsNullOrEmpty(info.memberPhonePrefix))
                 {
                     UserInfo.Current.areaCode = info.memberPhonePrefix;
@@ -294,97 +353,38 @@
                 //鏄惁闇�瑕佽幏鍙栧ご鍍�
                 if (bGetHeadImage)
                 {
-                    var headImageBytes = DownHeadImage();
-                    if (headImageBytes != null && headImageBytes.Length > 0)
+                    //2020-12-15 淇敼澶村儚鏂规
+                    if (!string.IsNullOrEmpty(info.memberHeadIcon))
                     {
-                        UserInfo.Current.headImagePageBytes = headImageBytes;
-                        FileStream fs = null;
-                        try
-                        {
-                            UserInfo.Current.headImagePageBytes = headImageBytes;
-                            var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
-                            fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
-                            fs.Write(headImageBytes, 0, headImageBytes.Length);
-                            fs.Flush();
-                            UserInfo.Current.headImagePagePath = filePath;
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"download headImage error : {ex.Message}");
-                        }
-                        finally
-                        {
-                            if (fs != null)
-                            {
-                                fs.Close();
-                            }
-                        }
+                        var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(info.memberHeadIcon);
 
+                        if (headImageBytes != null && headImageBytes.Length > 0)
+                        {
+                            UserInfo.Current.headImagePagePath = info.memberHeadIcon;
+                            //UserInfo.Current.headImagePagePath = imageKey;
+                        }
                     }
                 }
 
                 UserInfo.Current.SaveUserInfo();
                 MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
             }
-
-
-            //    Dictionary<string, object> d = new Dictionary<string, object>();
-            //var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //var revertObj = RequestHttps($"{severAddress}/ZigbeeUsers/GetAccountInfo", requestJson, true);
-
-            //if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS)
-            //{
-            //    var dataStr = JObject.FromObject(revertObj.ResponseData);
-            //    //"DistributedMark": "96439601-fd26-4768-8440-1d9dfa32c109",  < !--甯愬彿Id-- >
-            //     UserInfo.Current.userEmailInfo = dataStr.GetValue("Email").ToString();
-            //     UserInfo.Current.userMobileInfo = dataStr.GetValue("Phone").ToString();
-            //    FileStream fs = null;
-            //    try
-            //    {
-            //        var headImageString = dataStr.GetValue("HeadImage").ToString();
-            //        if (!string.IsNullOrEmpty(headImageString))
-            //        {
-            //            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
-            //            var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
-            //             UserInfo.Current.headImagePageBytes = headImageBytes;
-            //            var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
-            //            fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
-            //            fs.Write(headImageBytes, 0, headImageBytes.Length);
-            //            fs.Flush();
-            //             UserInfo.Current.headImagePagePath = filePath;
-            //        }
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        MainPage.Log($"download headImage error : {ex.Message}");
-            //    }
-            //    finally
-            //    {
-            //        if (fs != null)
-            //        {
-            //            fs.Close();
-            //        }
-            //    }
-            //    // "GesturePwd": null,  < !--鎵嬪娍瀵嗙爜-- >
-            //    // "StringPwd": null , < !--瀛楃涓插瘑鐮�-- >
-            //     UserInfo.Current.userName = dataStr.GetValue("UserName").ToString();
-
-            //    Application.RunOnMainThread(() =>
-            //    {
-            //    });
-
-            //     UserInfo.Current.SaveUserInfo();
-            //    MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
-            //}
-
+            return resultObj.Code;
         }
 
         /// <summary>
-        /// 涓嬭浇鐢ㄦ埛澶村儚
+        /// 鑾峰彇鐢ㄦ埛澶村儚
         /// </summary>
-        public byte[] DownHeadImage()
+        /// <param name="userId"></param>
+        public void GetUserHeadImageByKey(string imageKey)
         {
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
+            var headImageBytes = ImageUtlis.Current.DownHeadImageByImageKey(imageKey);
+
+            if (headImageBytes != null && headImageBytes.Length > 0)
+            {
+                //UserInfo.Current.headImagePageBytes = headImageBytes;
+                UserInfo.Current.headImagePagePath = imageKey;
+            }
         }
 
         /// <summary>
@@ -401,19 +401,31 @@
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
         }
 
-        /// <summary>
-        /// 鏇存柊鐢ㄦ埛澶村儚
-        /// </summary>
-        /// <param name="vs"></param>
-        /// <returns></returns>
-        public string UpdataUserHeadImage(string fileName)
-        {
-            FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
-            byte[] bytes = new byte[fs.Length];
-            fs.Read(bytes, 0, bytes.Length);
-            var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
-            return revertObj.Code;
-        }
+        ///// <summary>
+        ///// 鏇存柊鐢ㄦ埛澶村儚
+        ///// </summary>
+        ///// <param name="userName"></param>
+        ///// <returns></returns>
+        //public ResponsePackNew UpdateMemberHeadIcon(string memberHeadIcon)
+        //{
+        //    var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberHeadIconRes()
+        //    {
+        //        memberHeadIcon = memberHeadIcon
+        //    });
+        //    return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+        //}
+
+        ///// <summary>
+        ///// 鏇存柊鐢ㄦ埛澶村儚
+        ///// </summary>
+        ///// <param name="vs"></param>
+        ///// <returns></returns>
+        //public string UpdataUserHeadImage(string fileName)
+        //{
+        //    byte[] bytes = Shared.IO.FileUtils.ReadFile(fileName);
+        //    var revertObj = HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Head_Upload, bytes);
+        //    return revertObj.Code;
+        //}
 
         /// <summary>
         /// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
@@ -452,137 +464,99 @@
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
         }
 
+        /// <summary>
+        /// 鏍规嵁璐﹀彿,鑾峰彇璐﹀彿淇℃伅
+        /// </summary>
+        /// <param name="i_account">鎸囧畾璐﹀彿</param>
+        /// <returns></returns>
+        public ResponsePackNew GetMemberInfoByAccount(string i_account)
+        {
+            var pra = new { account = i_account };
+            var requestJson = HttpUtil.GetSignRequestJson(pra);
+            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
+        }
+
         #endregion
 
         #region 浣忓畢閮ㄥ垎
         /// <summary>
         /// 鑾峰彇浣忓畢鍒楄〃
         /// </summary>
-        public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
+        public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL,string homeId = "")
         {
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
+            var requestJson = HttpUtil.GetSignRequestJson(new GetHomeListObj() { homeType = homeType.ToString() });
             var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
             if (resultObj.Code == StateCode.SUCCESS)
             {
-                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
+                UserInfo.Current.regionList = new List<RegionInfoRes>();
+                var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());
                 if (homeList == null || homeList.Count == 0)
                 {
-
-
                 }
                 else
                 {
-                    UserInfo.Current.regionList = new List<RegionInfoRes>();
-
-                    foreach (var mHome in homeList)
+                    foreach (var home in homeList)
                     {
-                        var home = new RegionInfoRes()
+                        if (home.isBindGateway)
                         {
-                            RegionID = mHome.Id,
-                            Name = mHome.homeName,
-                            IsOthreShare = mHome.IsOtherShare,
-                            accountType = mHome.accountType,
-                            isRemoteControl = mHome.isRemoteControl,
-                            longitude = mHome.longitude,
-                            latitude = mHome.latitude,
-                            deliverstatus = mHome.deliverstatus,
-                            homeType = mHome.homeType,
-                            regionUrl = mHome.regionUrl,
-                            emqUrl = mHome.emqUrl,
-                            homeRegionName = mHome.homeRegionName,
-                            homeRegionId = mHome.homeRegionId,
-                            Address = mHome.homeAddress,
-                        };
-                        if (home.IsOthreShare)
-                        {
-                            continue;
+                            UserInfo.Current.regionList.Add(home);
+                            //鏂扮粦瀹氱殑浣忓畢锛岀洿鎺ュ垏鎹㈠埌鏂颁綇瀹�
+                            if (!string.IsNullOrEmpty(homeId))
+                            {
+                                if (homeId.Contains(home.id))
+                                {
+                                    DB_ResidenceData.Instance.CurrentRegion = home;
+                                }
+                            }
                         }
-                        UserInfo.Current.regionList.Add(home);
                     }
-
-                    if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+                    if(UserInfo.Current.regionList.Count== 0)
                     {
-                        DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+                        return "null";
                     }
-                    DB_ResidenceData.residenceData.SaveResidenceData();
-                    UserInfo.Current.SaveUserInfo();
+                    //-------濡傛灉璐﹀彿鏄娆＄櫥褰�
+                    if (DB_ResidenceData.Instance.CurrentRegion == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.id))
+                    {
+                        //鍒锋柊褰撳墠浣忓畢
+                        DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+                        DB_ResidenceData.Instance.SaveResidenceData();
+                        UserInfo.Current.SaveUserInfo();
+                        //鍒锋柊涓�娆′綇瀹呯綉鍏�
+                        GetHomeGatewayList();
+                    }
+                    else
+                    {
+                        //浣忓畢琚垹闄�
+                        var findHome = UserInfo.Current.regionList.Find((obj) => obj.id == DB_ResidenceData.Instance.CurrentRegion.id);
+                        if (findHome == null)
+                        {
+                            Shared.Application.RunOnMainThread(() =>
+                            {
+                                DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
+                                GetHomeGatewayList();
+                                DB_ResidenceData.Instance.SaveResidenceData();
+                                UserInfo.Current.SaveUserInfo();
+                                Action action = () =>
+                                {
+                                    MainPage.GoUserPage(true);
+                                };
+                                new UI.PublicAssmebly().TipMsg(StringId.Tip, StringId.ResidenceDeletedSwitchToAnotherResidence, action);
+                            });
+                        }
+                        else
+                        {
+                            //鍒锋柊褰撳墠浣忓畢
+                            DB_ResidenceData.Instance.CurrentRegion = findHome;
+                            DB_ResidenceData.Instance.SaveResidenceData();
+                            UserInfo.Current.SaveUserInfo();
+                            //鍒锋柊涓�娆′綇瀹呯綉鍏�
+                            GetHomeGatewayList();
+                        }
+                    }
                 }
-
             }
 
             return resultObj.Code;
-
-            //string jsonString = "{" +
-            //                    "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
-            //                    "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
-            //                    "\"HomeType\":" + "\"" + "1" + "\"" + "," +
-            //                    "\"LoginAccessToken\":" + "\"" +  UserInfo.Current.loginTokenString + "\"" +
-            //                    "}";
-            //var responsePack = RequestHttps($"{severAddress}/App/GetHomePager", jsonString, false);
-
-            //if (responsePack.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
-            //{
-            //    var dataStr = JObject.FromObject(responsePack.ResponseData);
-            //    //娌℃湁浣忓畢
-            //    if (dataStr.GetValue("PageData").ToString() == "[]")
-            //    {
-
-            //    }
-            //    else
-            //    {
-            //        //{
-            //        // {
-            //        //  "Id": "1107487",
-            //        //  "HomeStatus": 2,
-            //        //  "UserGuid": "22980",
-            //        //  "Name": "鍟�",
-            //        //  "Address": null,
-            //        //  "Longitude": 0.0,
-            //        //  "Latitude": 0.0,
-            //        //  "RegionName": null,
-            //        //  "Company": null,
-            //        //  "ContactPerson": null,
-            //        //  "ContactPersonPhone": null,
-            //        //  "Remarks": null,
-            //        //  "ChangeDate": null,
-            //        //  "AccountType": 0,
-            //        //  "CreatedOnUtc": "2020-05-27T06:52:03",
-            //        //  "IsOthreShare": false,
-            //        //  "MainUserDistributedMark": null,
-            //        //  "HomeGateways": [
-            //        //    {
-            //        //      "GatewayUniqueId": "4E47323347591243"
-            //        //    }
-            //        //  ]
-            //        //}}
-            //         UserInfo.Current.regionList = new List<RegionInfoRes>();
-            //        foreach (var jsonData in dataStr.GetValue("PageData"))
-            //        {
-            //            var homeJsonStr = JObject.FromObject(jsonData);
-            //            var home = new RegionInfoRes()
-            //            {
-            //                RegionID = homeJsonStr.GetValue("Id").ToString(),
-            //                RegionName = homeJsonStr.GetValue("RegionName").ToString(),
-            //                Name = homeJsonStr.GetValue("Name").ToString(),
-            //                Address = homeJsonStr.GetValue("Address").ToString(),
-            //                IsOthreShare = (bool)homeJsonStr.GetValue("IsOthreShare"),
-            //                homeGateways = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGateways>>(homeJsonStr.GetValue("HomeGateways").ToString()),
-            //            };
-            //            if (home.IsOthreShare)
-            //            {
-            //                continue;
-            //            }
-            //             UserInfo.Current.regionList.Add(home);
-            //            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
-            //            {
-            //                DB_ResidenceData.residenceData.CurReginID =  UserInfo.Current.regionList[0].RegionID;
-            //            }
-            //        }
-            //        DB_ResidenceData.residenceData.SaveResidenceData();
-            //         UserInfo.Current.SaveUserInfo();
-            //    }
-            //}
-            //return responsePack.StateCode;
         }
 
         /// <summary>
@@ -595,7 +569,7 @@
         {
             var requestObj = new AddOrUpdateHomeObj()
             {
-                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
             };
 
             if (editId == 0)
@@ -604,51 +578,76 @@
             }
             else if (editId == 1)
             {
-                requestObj.Address = editName;
+                requestObj.homeAddress = editName;
             }
 
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_UpdateHome, requestJson);
         }
 
         /// <summary>
-        /// 鑾峰彇鍒锋柊褰撳墠浣忓畢缃戝叧鎺ュ彛
+        /// 鑾峰彇鍒锋柊褰撳墠浣忓畢鐨勭綉鍏冲垪琛�
         /// </summary>
-        public void GetHomeGatewayList()
+        public string GetHomeGatewayList()
         {
-            if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.residecenInfo.RegionID)) return;
-            var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = nowhomeId });
-            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
-            if (revertObj.Code == StateCode.SUCCESS)
+            try
             {
-                var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
-                if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
+                if (string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.id)) return "";
+                var nowhomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = nowhomeId });
+                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetGatewayList, requestJson);
+                if (revertObj.Code == StateCode.SUCCESS)
                 {
-                    if (mHomeGatewayRes != null)
+                    var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
+                    if (nowhomeId == DB_ResidenceData.Instance.CurrentRegion.id)
                     {
-                        if (mHomeGatewayRes.Count > 0)
+                        if (mHomeGatewayRes != null)
                         {
-                            DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
+                            if (mHomeGatewayRes.Count > 0)
+                            {
+                                DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0];
+                                DriverLayer.Control.Ins.GatewayOnline_Cloud = mHomeGatewayRes[0].gatewayStatus;
+                                DB_ResidenceData.Instance.SaveResidenceData();
+                                return revertObj.Code;
+                            }
                         }
-                        else
-                        {
-                            DB_ResidenceData.residenceData.residenceGatewayMAC = "";
-
-                        }
-                        DB_ResidenceData.residenceData.SaveResidenceData();
-                    }
-
-                    if (mHomeGatewayRes != null)
-                    {
-                        //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
+                        //鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
+                        DB_ResidenceData.Instance.HomeGateway = null;
+                        DB_ResidenceData.Instance.SaveResidenceData();
                     }
                 }
+                else
+                {
+                    //鎻愮ず閿欒
+                }
+                return revertObj.Code;
             }
-            else
+            catch
             {
-                //鎻愮ず閿欒
+                return "";
             }
+        }
+        /// <summary>
+        /// 鑾峰彇缃戝叧淇℃伅
+        /// </summary>
+        public string GetGatewayInfo()
+        {
+            if (DB_ResidenceData.Instance.HomeGateway == null)
+                return StateCode.NETWORK_ERROR;
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            var jsonString = HttpUtil.GetSignRequestJson(d);
+            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGatewayInfo, jsonString);
+            if (revertObj.Code == StateCode.SUCCESS)
+            {
+                var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<HomeGatewayInfo>(revertObj.Data.ToString());
+                if (mHomeGatewayRes != null)
+                {
+                    DriverLayer.Control.Ins.GatewayOnline_Cloud = mHomeGatewayRes.gatewayStatus;
+                }
+            }
+            return revertObj.Code;
         }
 
         /// <summary>
@@ -657,7 +656,7 @@
         /// <returns></returns>
         public ResponsePackNew GetResidenceMemberAccount()
         {
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+            var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.id });
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
         }
 
@@ -672,7 +671,7 @@
                 childAccountId = subaccount.childAccountId,
                 homeId = subaccount.homeId
             };
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
         }
 
@@ -684,9 +683,9 @@
         /// <returns></returns>
         public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
         {
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()
+            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
             {
-                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
                 childAccountId = childAccountId,
                 nickName = nickName,
             });
@@ -701,9 +700,9 @@
         /// <returns></returns>
         public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
         {
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()
+            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
             {
-                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
                 childAccountId = childAccountId,
                 isAllowCreateScene = isAllow,
             });
@@ -711,114 +710,193 @@
         }
 
         /// <summary>
-        /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+        /// 杩囨埛
         /// </summary>
+        /// <param name="i_account">瀵规柟璐﹀彿</param>
+        /// <returns></returns>
+        public bool TransferResidence(string i_account)
+        {
+            var pra2 = new
+            {
+                homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.id,
+                account = i_account
+            };
+            var requestJson = HttpUtil.GetSignRequestJson(pra2);
+            var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_TransferResidence, requestJson);
+
+            return result != null && result.Code == StateCode.SUCCESS;
+        }
+
+        /// <summary>
+        /// 绠＄悊鍛樻潈闄愯縼绉�
+        /// </summary>
+        /// <param name="i_childAccountId">鎴愬憳璐﹀彿id</param>
+        /// <returns></returns>
+        public bool AdminAuthorityMigration(string i_childAccountId)
+        {
+            var pra2 = new
+            {
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+                childAccountId = i_childAccountId
+            };
+            var requestJson = HttpUtil.GetSignRequestJson(pra2);
+            var result = HttpUtil.RequestHttpsPost(NewAPI.API_Post_AdminAuthorityMigration, requestJson);
+
+            return result != null && result.Code == StateCode.SUCCESS;
+        }
+
+        #region 鏂版暟鎹垎浜�
+        /// <summary>
+        /// 娣诲姞鍒嗕韩
+        /// </summary>
+        /// <param name="addShareObj"></param>
+        /// <returns></returns>
+        public ResponsePackNew AddShareData(AddShareObj addShareObj)
+        {
+            var requestJson = HttpUtil.GetSignRequestJson(addShareObj);
+
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Add, requestJson);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍒嗕韩
+        /// </summary>
+        /// <param name="deleteShareObj"></param>
+        /// <returns></returns>
+        public ResponsePackNew DeleteShareData(DeleteShareObj deleteShareObj)
+        {
+            var requestJson = HttpUtil.GetSignRequestJson(deleteShareObj);
+
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍒嗕韩
+        /// </summary>
+        /// <param name="addShareObj"></param>
         /// <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 = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()
+            var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
             {
-                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
-                childAccountId = childAccountId
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+                childAccountId = childAccountId,
             });
-            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
 
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
         }
+       
+        #endregion
 
-        /// <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 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 = 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 = 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 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 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 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 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 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 = Newtonsoft.Json.JsonConvert.SerializeObject(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>
+        ///// <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);
+        //}
+
+        ///// <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>
@@ -841,45 +919,28 @@
         public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
         {
             //娣诲姞瀛愯处鍙�
-            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+            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);
 
         }
 
         /// <summary>
-        /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
+        /// 淇敼浣忓畢璋冭瘯鏉冮檺
         /// </summary>
         /// <returns></returns>
-        public ResponsePack GetResidenceMemberAccountInfo(string account)
+        public ResponsePackNew ChangeResidenceDebugPerm(bool debugPerm)
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
-            d.Add("Account", account);
-            string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("debugPerm", debugPerm);
+            var jsonString = HttpUtil.GetSignRequestJson(d,d);
+            var pack = HttpUtil.RequestHttpsPost(NewAPI.API_Post_Home_UpdateDebugPerm, jsonString);
+            return pack;
         }
 
-        /// <summary>
-        ///  涓嬭浇瀛愯处鍙风敤鎴峰ご鍍�
-        /// </summary>
-        /// <param name="subaccoun"></param>
-        /// <returns></returns>
-        public byte[] DownChildHeadImage(ResidenceMemberInfo subaccount)
-        {
-            var requestObj = new ChildBaseObj()
-            {
-                childAccountId = subaccount.childAccountId,
-                homeId = subaccount.homeId
-            };
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
-            var replaceToken = "";
-            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
-            {
-                replaceToken = DB_ResidenceData.residenceData.MasterToken;
-            }
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Child_DownloadHeadImage, requestJson,null);
-        }
-        
+
+
 
         #endregion
         /// <summary>
@@ -889,12 +950,12 @@
         {
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()
                 {
                     attachClientId = attachClientId,
                     homeType = HomeTypeEnum.BUSPRO.ToString()
                 });
-                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
+                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.Instance.CurrentRegion.regionUrl);
                 if (revertObj.Code == StateCode.SUCCESS)
                 {
                     return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
@@ -919,11 +980,14 @@
         {
             try
             {
+                //鍏堟竻绌烘帹閫両D锛岄伩鍏嶄娇鐢ㄧ紦瀛樼殑PushId涓哄叾瀹冭处鍙风殑鎯呭喌锛屽鑷存煡璇㈠埌鍏跺畠璐﹀彿鐨勬帹閫佽褰�
+                OnAppConfig.Instance.PushId = "";
+
                 string deviceType = PhoneDeviceType.Android.ToString();
 #if __IOS__
                 deviceType = PhoneDeviceType.IOS.ToString();
 #endif
-                //鏄惁鐢熸垚妯″紡
+                //鏄惁鐢熶骇妯″紡
                 bool isProduce = true;
 #if DEBUG
                 isProduce = false;
@@ -940,9 +1004,18 @@
                     deviceName = OnAppConfig.Instance.PhoneName,
                     deviceType = deviceType,
                     produce = isProduce,
-
+                    
                 };
-                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+                mAddpushinfoObj.languageType = Utlis.GetPostLanguageType();
+
+#if DEBUG
+                //List<string> communityCodes = new List<string>();
+                //communityCodes.Add("");
+                //mAddpushinfoObj.communityCodes = communityCodes;
+#endif
+
+                //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)
                 {
@@ -952,7 +1025,8 @@
                         if (!string.IsNullOrEmpty(pushId))
                         {
                             OnAppConfig.Instance.PushId = pushId;
-                            OnAppConfig.Instance.SaveUserConfig();
+                            OnAppConfig.Instance.SaveConfig();
+                            Utlis.WriteLine("PushId: " + pushId);
                            
                             return true;
                         }
@@ -971,18 +1045,40 @@
             }
         }
 
-       
+
         /// <summary>
         /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
         /// </summary>
+        /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
         /// <returns></returns>
-        public ResponsePackNew PushSerivceGetpushmessagelist()
+        public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
         {
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()
+            string pushType = null;
+
+            if (queryType == 1)
             {
-                pushId = OnAppConfig.Instance.PushId
+                pushType = PushType.Default.ToString();
+            }
+            else if (queryType == 2)
+            {
+                pushType = PushType.Alarm.ToString();
+            }
+            else if (queryType == 3)
+            {
+                pushType = PushType.Prompt.ToString();
+            }
+            else if (queryType == 4)
+            {
+                pushType = PushType.Notice.ToString();
+            }
+            var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
+            {
+                pushId = OnAppConfig.Instance.PushId,
+                pushType = pushType,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
             });
-            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+            //2021-08-28 鏀逛负鍒嗛〉鏌ヨ
+            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
         }
 
         /// <summary>
@@ -993,7 +1089,7 @@
         {
             if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
 
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+            var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
             {
                 pushId = OnAppConfig.Instance.PushId
             });
@@ -1019,7 +1115,7 @@
             if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
+                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
                     pushId = OnAppConfig.Instance.PushId
                 });
                
@@ -1051,7 +1147,7 @@
 
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
                 {
                     pushId = OnAppConfig.Instance.PushId
                 });
@@ -1083,7 +1179,7 @@
 
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
                 {
                     msgId = msgId
                 });
@@ -1110,16 +1206,13 @@
         /// </summary>
         /// <param name="msgId"></param>
         /// <returns></returns>
-        public bool PushSerivceDeleteMessage(string msgId)
+        public bool PushSerivceDeleteMessage(PushMsgIdObj mPushMsgIdObj)
         {
             if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
+            if (mPushMsgIdObj == null) return false;
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
-                {
-                    msgId = msgId
-                });
+                var requestJson = HttpUtil.GetSignRequestJson(mPushMsgIdObj);
 
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
                 if (revertObj.Code == StateCode.SUCCESS)
@@ -1128,7 +1221,7 @@
                 }
                 else
                 {
-
+                    IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                 }
                 return false;
             }
@@ -1178,6 +1271,18 @@
             { IsBackground = true }.Start();
         }
 
+        /// <summary>
+        /// 鑾峰彇鐗╀笟鍏憡璇︽儏
+        /// </summary>
+        /// <param name="noticeId"></param>
+        /// <returns></returns>
+        public ResponsePackNew GetPropertyNoticeDetails(string noticeId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("noticeId", noticeId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
+        }
         #endregion
 
         #region 妫�娴嬫洿鏂�
@@ -1187,37 +1292,20 @@
         /// <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 = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+
+            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 = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
-            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
-        }
 
-        #endregion
+#endregion
 
-        #region 鑾峰彇澶╂皵閮ㄥ垎
+#region 鑾峰彇澶╂皵閮ㄥ垎
         /// <summary>
         /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
         /// </summary>
@@ -1262,6 +1350,9 @@
                             MainPage.cityInfo.pm25 = jt.GetValue("Air_Quality").ToString();
                             MainPage.cityInfo.windLevel = jt.GetValue("WindLevel").ToString();
                             MainPage.cityInfo.weather = jt.GetValue("Weather").ToString();
+                            MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString();
+                            MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString();
+
                             break;
                         }
                         catch (Exception ex)
@@ -1282,56 +1373,10 @@
             });
         }
 
-        #endregion
+#endregion
 
-        #region mqtt杩滅▼杩炴帴锛堟棫锛�
-        /// <summary>
-        /// 璇锋眰Mqtt鏁版嵁
-        /// </summary>
-        /// <param name="dataStringJson">璇锋眰鐨勫弬鏁�.</param>
-        public ResponsePack RequestMqttInfo(string dataStringJson)
-        {
-            ResponsePack revertObj = null;
 
-            var webClient = new WebClient();
-            #region
-            webClient.Headers.Add("CONTENT-TYPE", "application/json");
-            var url = "https://global.hdlcontrol.com/ProposedProductionApi/EmqMqtt/GetConnMqttInfo";
-
-            byte[] bytes = null;
-            try
-            {
-                bytes = webClient.UploadData(url, Encoding.UTF8.GetBytes(dataStringJson));
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-                revertObj = new ResponsePack() { StateCode = "Net_Error" };
-            }
-
-            string responseString = null;
-            if (bytes != null)
-            {
-                responseString = Encoding.UTF8.GetString(bytes);
-            }
-
-            if (responseString != null)
-            {
-                try
-                {
-                    revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(responseString);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(ex.ToString());
-                }
-            }
-            return revertObj;
-            #endregion
-        }
-        #endregion
-
-        #region 澶囦唤閮ㄥ垎
+#region 澶囦唤閮ㄥ垎
         ///// <summary>
         ///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
         ///// </summary>
@@ -1377,11 +1422,11 @@
                 var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
                 var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/UserBackupList", requestJson, true);
                 var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
-                #region 鎭㈠鎴块棿鏁版嵁
+#region 鎭㈠鎴块棿鏁版嵁
 
 
                 GetBackupRoom(jt,loading);
-                #endregion
+#endregion
                
                 Application.RunOnMainThread(() => {
                     loading.Hide();
@@ -1802,8 +1847,862 @@
         }
         */
 
-        #endregion
+#endregion
 
 
+#region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+        /// <summary>
+        /// 鑾峰彇璁惧鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetDeviceList()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            //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.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
+        }
+        /// <summary>
+        /// 鑾峰彇鎸囧畾绗笁鏂瑰搧鐗岀殑缁戝畾杩囩殑璁惧鍒楄〃
+        /// </summary>
+        /// <param name="productPlatform"></param>
+        /// <param name="productBrand"></param>
+        /// <returns></returns>
+        public ResponsePackNew Get3TyBrandBindDeviceList(string productPlatform, string productBrand)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("productPlatform", productPlatform);
+            d.Add("productBrand", productBrand);
+            if (productBrand != "MegaHealth")
+            {
+                d.Add("networkConfig", true);
+            }
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
+        }
+        /// <summary>
+        /// 鑾峰彇鎸囧畾绗笁鏂瑰搧鐗岀殑璁惧鍒楄〃
+        /// </summary>
+        /// <param name="productPlatform"></param>
+        /// <param name="productBrand"></param>
+        /// <returns></returns>
+        public ResponsePackNew Get3TyBrandDeviceList(string productPlatform,string productBrand)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("categoryType", 1);
+            d.Add("productPlatform", productPlatform);
+            d.Add("productBrand", productBrand);
+            d.Add("networkConfig", true);
+            
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
+        }
+        /// <summary>
+        /// 娉ㄥ唽绗笁鏂硅澶�
+        /// </summary>
+        /// <param name="productPlatform"></param>
+        /// <param name="productBrand"></param>
+        /// <returns></returns>
+        public ResponsePackNew IndependentRegister3TyDevcie(string spk,string extDevId,string deviceName,string pairCode = "")
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("spk", spk);
+            d.Add("extDevId", extDevId);
+            d.Add("name", deviceName);
+            d.Add("code", pairCode);
+
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
+        }
+
+
+
+
+        /// <summary>
+        /// 鑾峰彇璁惧璇︽儏
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetDeviceInfo(string functionId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", new List<string>() { functionId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧璇︽儏鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetDeviceInfoList(List<string> functionIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", functionIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieInfoList, requestJson);
+        }
+        /// <summary>
+        /// 鍒锋柊璁惧鐘舵��
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew RefreshDeviceStatus(List<string> functionIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", functionIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            MainPage.Log($"璇诲彇璁惧鐘舵�侊細{requestJson}");
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_RefreshDeviceStatus, requestJson);
+        }
+
+        /// <summary>
+        /// 鎺у埗璁惧
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew ControlDevice(List<ApiAlinkControlActionObj> actionObjs)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway == null ? "0" : DB_ResidenceData.Instance.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);
+            d.Add("actions", actionObjs);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            MainPage.Log($"api鍔熻兘鎺у埗锛歿requestJson}");
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
+        }
+        /// <summary>
+        /// 缂栬緫璁惧淇℃伅
+        /// 缁戝畾鍏崇郴銆佸悕绉般�佹敹钘�
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew UpdataDevcieInfo(Function function)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", function.deviceId);
+            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 UpdataDevcieBindRoomInfo(Function function)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", function.deviceId);
+            d.Add("roomIds", function.roomIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDevice, requestJson);
+        }
+
+
+        /// <summary>
+        /// 璁惧缁戝畾鎴块棿
+        /// </summary>
+        public ResponsePackNew BindDeviceToRoom(List<string> deviceIds,List<string> roomIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", deviceIds);
+            d.Add("roomIds", roomIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_BindDeviceToRoom, requestJson);
+        }
+        /// <summary>
+        /// 璁惧瑙ｇ粦鎴块棿
+        /// </summary>
+        public string UnbindDeviceToRoom(string deviceId, string roomId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", new List<string>() { deviceId });
+            d.Add("roomIds", new List<string>() { roomId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            d.Add("name", deviceName);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditDeviceName, requestJson).Code;
+        }
+        /// <summary>
+        /// 鏀惰棌璁惧
+        /// </summary>
+        public ResponsePackNew CollectDevice(string deviceId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds",new List<string>() { deviceId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectDevice, requestJson);
+        }
+        /// <summary>
+        /// 鍙栨秷鏀惰棌璁惧
+        /// </summary>
+        public ResponsePackNew CancelCollectDevice(string deviceId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceIds", new List<string>() { deviceId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
+        }
+
+#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.Instance.CurrentRegion.id);
+            if (roomId != null)
+            {
+                d.Add("roomId", roomId);
+            }
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍦烘櫙璇︽儏鍒楄〃
+        /// </summary>
+        /// <param name="seceneId">鍦烘櫙ID</param>
+        /// <returns></returns>
+        public ResponsePackNew GetSceneListInfo(List<string> seceneIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("userSceneIds", seceneIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSecneInfo, requestJson);
+        }
+
+        /// <summary>
+        /// 娣诲姞鍦烘櫙
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew AddScene(Scene scene)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("scenes", new List<Scene>() { scene });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
+
+            MainPage.Log($"{pack.Data}");
+
+            return pack;
+        }
+        /// <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.Instance.CurrentRegion.id);
+            d.Add("scenes", new List<Scene>() { scene });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.Instance.CurrentRegion.id);
+            d.Add("userSceneIds", new List<string>() { userSceneId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.Instance.CurrentRegion.id);
+            d.Add("userSceneIds", new List<string>() { userSceneId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.Instance.CurrentRegion.id);
+            d.Add("userSceneIds", new List<string>() { userSceneId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(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.Instance.CurrentRegion.id);
+            d.Add("userSceneIds", new List<string>() { userSceneId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
+        }
+#endregion
+
+#region Kaede --鎴块棿鍔熻兘--------------------------
+        /// <summary>
+        /// 鑾峰彇鎴块棿鍒楄〃
+        /// </summary>
+        /// <param name="GetType">鑾峰彇绫诲瀷锛歊OOM\FLOOR;涓嶈緭鍏ヨ繑鍥炲叏閮�</param>
+        /// <returns></returns>
+        public ResponsePackNew GetRoomList(string GetType = "All")
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            if (GetType != "All")
+            {
+                d.Add("roomType", GetType);
+            }
+            d.Add("pageSize", "1000");
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
+            
+            return pack;
+        }
+        /// <summary>
+        /// 娣诲姞鎴块棿\妤煎眰
+        /// 妤煎眰涔熷睘浜庢埧闂�
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew AddRoom(List<SpatialInfo> rooms)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("rooms", rooms);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            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 UpdateRoom(List<SpatialInfo> rooms)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            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.Instance.CurrentRegion.id);
+            d.Add("ids", roomIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelRoom, requestJson);
+            return pack;
+        }
+
+#endregion
+
+
+#region Kaede -- 瀹夐槻鎺ュ彛____________________________
+        /// <summary>
+        /// 鑾峰彇瀹夐槻鍒楄〃
+        /// </summary>
+        public ResponsePackNew GetSecurityList()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_List, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鑾峰彇瀹夐槻璇︽儏
+        /// </summary>
+        /// <param name="sidList">瀹夐槻sid闆嗗悎</param>
+        /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+        /// <returns></returns>
+        public ResponsePackNew GetSecurityInfo(List<string> sidList, List<string> userSecurityIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+            d.Add("sids", sidList);
+            d.Add("userSecurityIds", userSecurityIds);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Info, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 娣诲姞瀹夐槻
+        /// </summary>
+        public ResponsePackNew AddSecurity(List<SecurityAlarm> securities)
+        {
+            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("securitys", securities);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Add, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 缂栬緫瀹夐槻
+        /// </summary>
+        public ResponsePackNew EditSecurity(List<SecurityAlarm> securities)
+        {
+            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("securitys", securities);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Edit, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鍒犻櫎瀹夐槻
+        /// </summary>
+        /// <param name="sidList">瀹夐槻sid</param>
+        /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+        /// <returns></returns>
+        public ResponsePackNew DeleteSecurity(List<string> sidList, List<string> userSecurityIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+            d.Add("sids", sidList);
+            d.Add("userSecurityIds", userSecurityIds);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_Delete, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 璇诲彇瀹夐槻闃插尯鐘舵��
+        /// </summary>
+        /// <param name="sidList">瀹夐槻sid</param>
+        /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+        /// <returns></returns>
+        public ResponsePackNew ReadSecurityStatus(List<string> sidList, List<string> userSecurityIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+            d.Add("sids", sidList);
+            d.Add("userSecurityIds", userSecurityIds);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusRead, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 璁剧疆瀹夐槻闃插尯鐘舵��
+        /// </summary>
+        public ResponsePackNew SetSecurityStatus(List<SecurityState> securityStates)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("securitys", securityStates);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            MainPage.Log($"api瀹夐槻鎺у埗锛歿requestJson}");
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusSet, requestJson);
+            return pack;
+        }
+
+        /// <summary>
+        /// 瀹夐槻bypass璁剧疆
+        /// </summary>
+        public ResponsePackNew SetSecurityBypass(List<SecurityBypass> securityBypassStates)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("securitys", securityBypassStates);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_BypassSet, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 瀹夐槻bypass璇诲彇
+        /// </summary>
+        /// <param name="sidList">瀹夐槻sid</param>
+        /// <param name="userSecurityIds">瀹夐槻浜戠id</param>
+        /// <returns></returns>
+        public ResponsePackNew ReadSecurityBypass(List<string> sidList, List<string> userSecurityIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            //sids userSecurityIds 涓嶈兘鍚屾椂涓虹┖
+            d.Add("sids", sidList);
+            d.Add("userSecurityIds", userSecurityIds);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_BypassRead, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鏌ヨ瀹夐槻鎵�鏈夎褰�
+        /// </summary>
+        public ResponsePackNew GetSecurityLogList(string pageSize,string pageNo)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("pageSize", pageSize);
+            d.Add("pageNo", pageNo);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_ListSecurityLog, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鏌ヨ瀹夐槻鎶ヨ璁板綍
+        /// </summary>
+        public ResponsePackNew GetSecurityAlarmLogList(string pageSize, string pageNo)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("pageSize", pageSize);
+            d.Add("pageNo", pageNo);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_ListAlarmLog, requestJson);
+            return pack;
+        }
+
+#endregion
+
+
+#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+        /// <summary>
+        /// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
+        /// </summary>
+        public ResponsePackNew Get3tyBrandList()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetBrandList, requestJson);
+
+            return pack;
+        }
+        /// <summary>
+        /// 鑾峰彇缁戝畾鐨勭涓夋柟鍝佺墝鍒楄〃
+        /// </summary>
+        public ResponsePackNew Get3tyBindBrandList()
+        {
+            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_GetBindBrandList, requestJson);
+
+            return pack;
+        }
+
+#endregion
+
+#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+        /// <summary>
+        /// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
+        /// 2021-07-07 鏂版柟妗堟帴鍙ｈ皟鏁村鎺�
+        /// </summary>
+        public ResponsePackNew EZGetChildToken()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("platform", "1");
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
+        }
+#endregion
+
+
+#region 鈻� 鍙瀵硅_________________________
+        /// <summary>
+        /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew CheckFlVideo()
+        {
+            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_FL_Check, requestJson);
+            return pack;
+        }
+#endregion
+
+#region 鈻� 闂ㄩ攣鐩稿叧____________________________
+
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
+        /// </summary>
+        /// <param name="i_device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public List<Stan.DoorHistoryLog> GetDoorHistoryLogs(Function i_device)
+        {
+            //var dicPra = new Dictionary<string, object>();
+            //dicPra.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            //dicPra.Add("deviceId", i_device.deviceId);
+            //dicPra.Add("logType", "OPEN_DOOR");
+            //dicPra.Add("pageSize", "200");
+            //var requestJson = HttpUtil.GetSignRequestJson(dicPra);
+            //var packData = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_DoorHistory, requestJson);
+            //if (packData.Code != StateCode.SUCCESS)
+            //{
+            //    return null;
+            //}
+
+
+            //娴嬭瘯
+            var listLog = new List<Stan.DoorHistoryLog>();
+            for (int i = 1; i <= 3; i++)
+            {
+                var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+                logInfo.Time = new DateTime(2000, 5, 6, 10, 45, 23).AddDays(i);
+                listLog.Add(logInfo);
+            }
+            for (int i = 1; i <= 3; i++)
+            {
+                var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+                logInfo.Time = new DateTime(2001, 5, 6, 10, 45, 23).AddDays(i);
+                listLog.Add(logInfo);
+            }
+            for (int i = 1; i <= 3; i++)
+            {
+                var logInfo = new Stan.DoorHistoryLog { StrMsg = "鐢甸噺浣庯紝璇锋洿鎹㈢數姹�" };
+                logInfo.Time = new DateTime(2002, 5, 6, 10, 45, 23).AddDays(i);
+                listLog.Add(logInfo);
+            }
+
+            //鎸夋椂闂撮檷搴�
+            var listSortLog = new List<Stan.DoorHistoryLog>();
+            foreach (var logInfo in listLog)
+            {
+                bool canAdd = true;
+                for (int i = 0; i < listSortLog.Count; i++)
+                {
+                    if (logInfo.Time > listSortLog[i].Time)
+                    {
+                        //鏃堕棿姣斿綋鍓嶇殑绱㈠紩澶�,鍒欐彃鍏ュ埌瀹冪殑鍓嶉潰
+                        listSortLog.Insert(i, logInfo);
+                        canAdd = false;
+                        break;
+                    }
+                }
+                if (canAdd == true)
+                {
+                    //鏃ユ湡鏈�灏�,鍒欐坊鍔犲埌鏈熬
+                    listSortLog.Add(logInfo);
+                }
+            }
+            //鎻愮ず
+            //IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
+            return listSortLog;
+        }
+
+#endregion
+#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+        /// <summary>
+        /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetSpeakerList()
+        {
+            var requestJson = HttpUtil.GetSignRequestJson(new GetSpeakerObj
+            {
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+            });
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_List_Get, requestJson);
+        }
+
+        /// <summary>
+        /// 缂栬緫闊崇鎺堟潈澶囨敞
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew UpdateSpeakerRemark(UpdateSpeakerRemarkObj remarkObj)
+        {
+            var requestJson = HttpUtil.GetSignRequestJson(remarkObj);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_Remark_Update, requestJson);
+        }
+
+        /// <summary>
+        /// 瑙ｉ櫎闊崇缁戝畾
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew UnbindSpeaker(string tokenId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("tokenId", tokenId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_Unbind, requestJson);
+        }
+
+        /// <summary>
+        /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃
+        /// </summary>
+        /// <param name="getType">0 鏄煡璇㈠叏閮� 1鏄煡璇㈣澶� 2鏄煡璇㈠満鏅�</param>
+        /// <param name="tokenId"></param>
+        /// <returns></returns>
+        public ResponsePackNew GetSpeakerDeviceList(int getType, string tokenId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("tokenId", tokenId);
+            if (getType > 0)
+            {
+                d.Add("isDevice", getType == 1);
+            }
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Get, requestJson);
+        }
+
+        /// <summary>
+        /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew UpdateSpeakerDeviceList(UpdateSpeakerDeviceListObj updateSpeakerDeviceListObj)
+        {
+            var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
+        }
+#endregion
+
+
+        /// <summary>
+        /// 浜鸿劯褰曞叆
+        /// </summary>
+        /// <param name="imageBytes"></param>
+        /// <returns></returns>
+        public ResponsePackNew FaceSetting(string imageBytes)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+            //MainPage.Log(imageBytes);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_InputUserFace, requestJson);
+        }
+
+
+        /// <summary>
+        /// 淇敼浣忔埛浜鸿劯鍏抽棴鐘舵��
+        /// 1锛氬紑鍚姸鎬� 2锛氬叧闂姸鎬�
+        /// 3:娓呴櫎浜鸿劯鏁版嵁
+        /// </summary>
+        public ResponsePackNew EditFaceFunction(int status)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("faceClose", status);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_SwitchFaceFunction, requestJson);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇浣忔埛璇︽儏
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetCustomerInfo()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0