From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心,增加下划线和点击Alter提醒详情。

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |  961 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 666 insertions(+), 295 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6050b4a..f7166f9 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
 {
@@ -101,7 +99,7 @@
         public ResponsePackNew GetRegionByAccount(string account)
         {
             var requestJson = HttpUtil.GetSignRequestJson(new RegionByAccountObj() { account = account });
-            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson);
+            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetRegionByAccount, requestJson, HttpUtil.GlobalRequestHttpsHost);
         }
 
         /// <summary>
@@ -112,15 +110,15 @@
         {
             var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
             {
-                refreshToken = UserInfo.Current.refreshToken,
+                refreshToken = UserInfo.Current.RefreshToken,
             });
             var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
             if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
             {
                 var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
-                UserInfo.Current.loginTokenString = revertData.headerPrefix + revertData.accessToken;
-                UserInfo.Current.refreshToken = revertData.refreshToken;
-                UserInfo.Current.lastTime = DateTime.Now;
+                UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+                UserInfo.Current.RefreshToken = revertData.refreshToken;
+                UserInfo.Current.LastTime = DateTime.Now;
                 UserInfo.Current.SaveUserInfo();
                 return true;
             }
@@ -294,32 +292,14 @@
                 //鏄惁闇�瑕佽幏鍙栧ご鍍�
                 if (bGetHeadImage)
                 {
-                    var headImageBytes = DownHeadImage();
+                    var imageKey = ImageUtlis.Current.GetHeadImageKey(info.memberId);
+                   
+                    var headImageBytes = ImageUtlis.Current.DownHeadImage(info.memberId);
+
                     if (headImageBytes != null && headImageBytes.Length > 0)
                     {
-                        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();
-                            }
-                        }
-
+                        //UserInfo.Current.headImagePageBytes = headImageBytes;
+                        UserInfo.Current.headImagePagePath = imageKey;
                     }
                 }
 
@@ -380,11 +360,20 @@
         }
 
         /// <summary>
-        /// 涓嬭浇鐢ㄦ埛澶村儚
+        /// 鑾峰彇鐢ㄦ埛澶村儚
         /// </summary>
-        public byte[] DownHeadImage()
+        /// <param name="userId"></param>
+        public void GetUserHeadImage(string userId)
         {
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Head_Down, null);
+            var imageKey = ImageUtlis.Current.GetHeadImageKey(userId);
+
+            var headImageBytes = ImageUtlis.Current.DownHeadImage(userId);
+
+            if (headImageBytes != null && headImageBytes.Length > 0)
+            {
+                //UserInfo.Current.headImagePageBytes = headImageBytes;
+                UserInfo.Current.headImagePagePath = imageKey;
+            }
         }
 
         /// <summary>
@@ -401,19 +390,17 @@
             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="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>
         /// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
@@ -460,7 +447,7 @@
         /// </summary>
         public string GetHomePager(HomeTypeEnum homeType = HomeTypeEnum.ALL)
         {
-            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)
             {
@@ -503,9 +490,26 @@
                     if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
                     {
                         DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+                        //鎭㈠澶囦唤
+                        HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
                     }
+                    else
+                    {
+                        var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.residenceData.CurReginID);
+                        if(curRegion == null)
+                        {
+                            DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+                            //鎭㈠澶囦唤
+                            HDLCommon.Current.RestoreHomeBackup(DB_ResidenceData.residenceData.CurReginID);
+                        }
+                    }
+
+
                     DB_ResidenceData.residenceData.SaveResidenceData();
                     UserInfo.Current.SaveUserInfo();
+
+                    //鍒锋柊涓�娆′綇瀹呯綉鍏�
+                    GetHomeGatewayList();
                 }
 
             }
@@ -607,47 +611,53 @@
                 requestObj.Address = 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()
         {
-            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.residenceData.residecenInfo.RegionID)) return;
+                var nowhomeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+                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.residenceData.residecenInfo.RegionID)
                     {
-                        if (mHomeGatewayRes.Count > 0)
+                        if (mHomeGatewayRes != null)
                         {
-                            DB_ResidenceData.residenceData.residenceGatewayMAC = mHomeGatewayRes[0].mac;
+                            if (mHomeGatewayRes.Count > 0)
+                            {
+                                DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];
+                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
+                                {
+                                    DriverLayer.Control.Ins.IsRemote = true;
+                                    DriverLayer.Control.Ins.GatewayOnline = true;
+                                }
+                                DB_ResidenceData.residenceData.SaveResidenceData();
+                                return;
+                            }
                         }
-                        else
-                        {
-                            DB_ResidenceData.residenceData.residenceGatewayMAC = "";
-
-                        }
+                        //鍏朵綑鎯呭喌娓呯┖缃戝叧淇℃伅
+                        DB_ResidenceData.residenceData.HomeGateway = null;
                         DB_ResidenceData.residenceData.SaveResidenceData();
                     }
-
-                    if (mHomeGatewayRes != null)
-                    {
-                        //Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
-                    }
+                }
+                else
+                {
+                    //鎻愮ず閿欒
                 }
             }
-            else
+            catch
             {
-                //鎻愮ず閿欒
+
             }
         }
 
@@ -657,7 +667,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.residenceData.residecenInfo.RegionID });
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
         }
 
@@ -672,7 +682,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,7 +694,7 @@
         /// <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,
                 childAccountId = childAccountId,
@@ -701,7 +711,7 @@
         /// <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,
                 childAccountId = childAccountId,
@@ -710,115 +720,157 @@
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
         }
 
+        #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
+                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>
@@ -842,43 +894,24 @@
         {
             //娣诲姞瀛愯处鍙�
             var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
 
         }
 
-        /// <summary>
-        /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePack GetResidenceMemberAccountInfo(string account)
-        {
-            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);
-        }
+        ///// <summary>
+        ///// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿淇℃伅
+        ///// </summary>
+        ///// <returns></returns>
+        //public ResponsePack GetResidenceMemberAccountInfo(string account)
+        //{
+        //    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);
+        //}
 
-        /// <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
@@ -889,7 +922,7 @@
         {
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new GetMqttRemoteInfoObj()
                 {
                     attachClientId = attachClientId,
                     homeType = HomeTypeEnum.BUSPRO.ToString()
@@ -923,23 +956,27 @@
 #if __IOS__
                 deviceType = PhoneDeviceType.IOS.ToString();
 #endif
-                //鏄惁鐢熸垚妯″紡
+                //鏄惁鐢熶骇妯″紡
                 bool isProduce = true;
 #if DEBUG
                 isProduce = false;
 #endif
 
-                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false;
+                if (string.IsNullOrEmpty(UserInfo.Current.PushDeviceToken)) {
+                    Utlis.WriteLine("PushDeviceToken 涓虹┖");
+                    return false;
+                }
 
                 var mAddpushinfoObj = new AddpushinfoObj()
                 {
-                    pushToken = OnAppConfig.Instance.PushDeviceToken,
-                    deviceName = OnAppConfig.Instance.PhoneName,
+                    pushToken = UserInfo.Current.PushDeviceToken,
+                    deviceName = UserInfo.Current.PhoneName,
                     deviceType = deviceType,
                     produce = isProduce,
-
                 };
-                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+
+                //var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+                var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
                 if (revertObj.Code == StateCode.SUCCESS)
                 {
@@ -948,16 +985,18 @@
                         var pushId = revertObj.Data.ToString();
                         if (!string.IsNullOrEmpty(pushId))
                         {
-                            OnAppConfig.Instance.PushId = pushId;
-                            OnAppConfig.Instance.SaveUserConfig();
+                            UserInfo.Current.PushId = pushId;
+                            UserInfo.Current.SaveUserInfo();
+                            Utlis.WriteLine("PushId: " + pushId);
+                           
                             return true;
                         }
                     }
-                    Utlis.WriteLine("AddToken 鎴愬姛");
+                 
                 }
                 else
                 {
-                    Utlis.WriteLine("AddToken 澶辫触");
+                    //Utlis.WriteLine("AddToken 澶辫触");
                 }
                 return false;
             }
@@ -967,15 +1006,33 @@
             }
         }
 
+
         /// <summary>
         /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
         /// </summary>
+        /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</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();
+            }
+
+            var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
+            {
+                pushId = UserInfo.Current.PushId,
+                pushType = pushType
             });
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
         }
@@ -986,11 +1043,11 @@
         /// <returns></returns>
         public bool PushSerivceClearmessagelist()
         {
-            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
 
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+            var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
             {
-                pushId = OnAppConfig.Instance.PushId
+                pushId = UserInfo.Current.PushId
             });
 
             var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
@@ -1011,11 +1068,11 @@
         /// <returns></returns>
         public bool PushSerivceSignOut()
         {
-            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
-                    pushId = OnAppConfig.Instance.PushId
+                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
+                    pushId = UserInfo.Current.PushId
                 });
                
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
@@ -1042,13 +1099,13 @@
         /// <returns></returns>
         public bool PushSerivceMarkAllMessageRead()
         {
-            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
 
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
                 {
-                    pushId = OnAppConfig.Instance.PushId
+                    pushId = UserInfo.Current.PushId
                 });
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
                 if (revertObj.Code == StateCode.SUCCESS)
@@ -1074,11 +1131,11 @@
         /// <returns></returns>
         public bool PushSerivceMarkMessageRead(string msgId)
         {
-            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
 
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
                 {
                     msgId = msgId
                 });
@@ -1107,11 +1164,11 @@
         /// <returns></returns>
         public bool PushSerivceDeleteMessage(string msgId)
         {
-            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
 
             try
             {
-                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
+                var requestJson = HttpUtil.GetSignRequestJson(new PushMsgIdObj()
                 {
                     msgId = msgId
                 });
@@ -1123,7 +1180,7 @@
                 }
                 else
                 {
-
+                    IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                 }
                 return false;
             }
@@ -1132,6 +1189,47 @@
                 return false;
             }
         }
+
+        /// <summary>
+        /// 娉ㄥ唽鎺ㄩ��
+        /// </summary>
+        public void RegisteredPush()
+        {
+            new System.Threading.Thread(() =>
+            {
+                var success = PushSerivceAddPushInfo();
+                if (success)
+                {
+                    Utlis.WriteLine("鎺ㄩ�佹敞鍐屾垚鍔�");
+                }
+                else
+                {
+                    Utlis.WriteLine("鎺ㄩ�佹敞鍐屽け璐�");
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
+        /// <summary>
+        /// 娉ㄩ攢鎺ㄩ��
+        /// </summary>
+        public void SignOutPush()
+        {
+            new System.Threading.Thread(() =>
+            {
+                var success = PushSerivceSignOut();
+                if (success)
+                {
+                    Utlis.WriteLine("鎺ㄩ�佹敞閿�鎴愬姛");
+                }
+                else
+                {
+                    Utlis.WriteLine("鎺ㄩ�佹敞閿�澶辫触");
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
         #endregion
 
         #region 妫�娴嬫洿鏂�
@@ -1141,40 +1239,27 @@
         /// <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
 
         #region 鑾峰彇澶╂皵閮ㄥ垎
         /// <summary>
+        /// /// <summary>
         /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
         /// </summary>
+        /// </summary>
+        /// <param name="lon">缁忓害</param>
+        /// <param name="lat">绾害</param>
         public void GetCityInfo(string lon, string lat)
         {
             System.Threading.Tasks.Task.Run(() =>
@@ -1238,52 +1323,6 @@
 
         #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 澶囦唤閮ㄥ垎
         ///// <summary>
@@ -1759,5 +1798,337 @@
         #endregion
 
 
+        #region Kaede --璁惧鍔熻兘鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+        /// <summary>
+        /// 鑾峰彇璁惧鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetDeviceList()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("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>
+        /// <returns></returns>
+        public ResponsePackNew GetDeviceInfoList(List<string> functionIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("deviceIds", functionIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.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.residenceData.residecenInfo.RegionID);
+            d.Add("deviceIds", functionIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            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.residenceData.residecenInfo.RegionID);
+            d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);
+            d.Add("actions", actionObjs);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            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.residenceData.residecenInfo.RegionID);
+            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>
+        public string BindDeviceToRoom(string deviceId,string roomId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("deviceIds", new List<string>() { deviceId});
+            d.Add("roomIds", new List<string>() { roomId});
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_BindDeviceToRoom, requestJson).Code;
+        }
+        /// <summary>
+        /// 璁惧瑙g粦鎴块棿
+        /// </summary>
+        public string UnbindDeviceToRoom(string deviceId, string roomId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("deviceIds", new List<string>() { deviceId });
+            d.Add("roomIds", new List<string>() { roomId });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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_GetSecneList, requestJson);
+        }
+        /// <summary>
+        /// 娣诲姞鍦烘櫙
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew AddScene(Scene scene)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("scenes", new List<Scene>() { scene });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
+        }
+        /// <summary>
+        /// 缂栬緫鍦烘櫙
+        /// </summary>
+        /// <param name="scene"></param>
+        /// <returns></returns>
+        public ResponsePackNew EditScene(Scene scene)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("scenes", new List<Scene>() { scene });
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            if (GetType != "All")
+            {
+                d.Add("roomType", GetType);
+            }
+            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.residenceData.residecenInfo.RegionID);
+            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.residenceData.residecenInfo.RegionID);
+            d.Add("rooms", rooms);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateRoom, requestJson);
+            //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+            //if (revData != null)
+            //{
+            //    SpatialInfo.CurrentSpatial.UpdateSpatialList(revData,OptionType.Update);
+            //}
+            return pack;
+        }
+        /// <summary>
+        /// 鍒犻櫎鎴块棿
+        /// </summary>
+        /// <param name="roomIds"></param>
+        /// <returns></returns>
+        public ResponsePackNew DeleteRoom(List<string> roomIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+            d.Add("ids", roomIds);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelRoom, requestJson);
+            return pack;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0