From 23ca39219c5075d829d14137cb54896a24ae513d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 13:57:08 +0800
Subject: [PATCH] 20201204

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |  303 ++++++++++++++++++++++++-------------------------
 1 files changed, 149 insertions(+), 154 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f8a99b7..edf40dd 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -631,6 +631,11 @@
                             if (mHomeGatewayRes.Count > 0)
                             {
                                 DB_ResidenceData.residenceData.HomeGateway = mHomeGatewayRes[0];
+                                if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE")
+                                {
+                                    DriverLayer.Control.Ins.IsRemote = true;
+                                    DriverLayer.Control.Ins.GatewayOnline = true;
+                                }
                                 DB_ResidenceData.residenceData.SaveResidenceData();
                                 return;
                             }
@@ -716,7 +721,7 @@
         /// </summary>
         /// <param name="addShareObj"></param>
         /// <returns></returns>
-        public ResponsePackNew AddShare(AddShareObj addShareObj)
+        public ResponsePackNew AddShareData(AddShareObj addShareObj)
         {
             var requestJson = HttpUtil.GetSignRequestJson(addShareObj);
 
@@ -728,7 +733,7 @@
         /// </summary>
         /// <param name="deleteShareObj"></param>
         /// <returns></returns>
-        public ResponsePackNew DeleteShare(DeleteShareObj deleteShareObj)
+        public ResponsePackNew DeleteShareData(DeleteShareObj deleteShareObj)
         {
             var requestJson = HttpUtil.GetSignRequestJson(deleteShareObj);
 
@@ -740,123 +745,127 @@
         /// </summary>
         /// <param name="addShareObj"></param>
         /// <returns></returns>
-        public ResponsePackNew GetShare(GetShareObj getShareObj)
+        public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
         {
-            var requestJson = HttpUtil.GetSignRequestJson(getShareObj);
+            var requestJson = HttpUtil.GetSignRequestJson(new GetShareObj()
+            {
+                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+                childAccountId = childAccountId,
+            });
 
-            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_Delete, requestJson);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
         }
         #endregion
 
-        /// <summary>
-        /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
-        {
-            //Dictionary<string, object> d = new Dictionary<string, object>();
-            //d.Add("DistributedMark", memberId);
-            //d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
-            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
+        ///// <summary>
+        ///// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+        ///// </summary>
+        ///// <returns></returns>
+        //public ResponsePackNew GetShareDataByMemberAccount(string childAccountId)
+        //{
+        //    //Dictionary<string, object> d = new Dictionary<string, object>();
+        //    //d.Add("DistributedMark", memberId);
+        //    //d.Add("HouseDistributedMark", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
 
-            var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
-            {
-                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
-                childAccountId = childAccountId
-            });
-            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
+        //    var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
+        //    {
+        //        homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
+        //        childAccountId = childAccountId
+        //    });
+        //    return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
 
-        }
+        //}
 
-        /// <summary>
-        /// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
-        /// </summary>
-        /// <returns></returns>
-        public byte[] GetShareData(ShareData shareData)
-        {
-            //Dictionary<string, object> d = new Dictionary<string, object>();
-            //d.Add("DistributedMark", memberId);
-            //d.Add("HouseDistributedMark", hId);
-            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
+        ///// <summary>
+        ///// 涓嬭浇鍗曚釜鍒嗕韩鏂囦欢
+        ///// </summary>
+        ///// <returns></returns>
+        //public byte[] GetShareData(ShareData shareData)
+        //{
+        //    //Dictionary<string, object> d = new Dictionary<string, object>();
+        //    //d.Add("DistributedMark", memberId);
+        //    //d.Add("HouseDistributedMark", hId);
+        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetOneShareData", jsonString, true);
 
-            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
-            {
-                homeId = shareData.homeId,
-                homeShareId = shareData.id
-            });
-            var replaceToken = "";
-            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
-            {
-                replaceToken = DB_ResidenceData.residenceData.MasterToken;
-            }
-            return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+        //    var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new ShareFileDownObj()
+        //    {
+        //        homeId = shareData.homeId,
+        //        homeShareId = shareData.id
+        //    });
+        //    var replaceToken = "";
+        //    if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+        //    {
+        //        replaceToken = DB_ResidenceData.residenceData.MasterToken;
+        //    }
+        //    return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Home_Share_DownOne, requestJson, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
 
-        }
+        //}
 
-        /// <summary>
-        /// 澧炲姞鍏变韩鏁版嵁鍒楄〃
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePackNew AddShareData(ShareData shareData)
-        {
-            //Dictionary<string, object> d = new Dictionary<string, object>();
-            //d.Add("ShareName", shareData.ShareName);
-            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
-            //d.Add("ShareDataBytes", shareData.ShareDataBytes);
-            //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
-            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
+        ///// <summary>
+        ///// 澧炲姞鍏变韩鏁版嵁鍒楄〃
+        ///// </summary>
+        ///// <returns></returns>
+        //public ResponsePackNew AddShareData(ShareData shareData)
+        //{
+        //    //Dictionary<string, object> d = new Dictionary<string, object>();
+        //    //d.Add("ShareName", shareData.ShareName);
+        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+        //    //d.Add("ShareDataBytes", shareData.ShareDataBytes);
+        //    //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/AddShareData", jsonString, true);
 
-            var queryDic = new Dictionary<string, object>();
-            queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
-            queryDic.Add("childAccountId", shareData.childAccountId);
-            queryDic.Add("fileName", shareData.fileName);
-            var replaceToken = "";
-            if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
-            {
-                replaceToken = DB_ResidenceData.residenceData.MasterToken;
-            }
-            return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
-        }
+        //    var queryDic = new Dictionary<string, object>();
+        //    queryDic.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
+        //    queryDic.Add("childAccountId", shareData.childAccountId);
+        //    queryDic.Add("fileName", shareData.fileName);
+        //    var replaceToken = "";
+        //    if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+        //    {
+        //        replaceToken = DB_ResidenceData.residenceData.MasterToken;
+        //    }
+        //    return HttpUtil.RequestHttpsUpload(RestSharp.Method.POST, NewAPI.API_POST_Home_Share_Add, shareData.ShareDataBytes, queryDic, null, DB_ResidenceData.residenceData.residecenInfo.regionUrl, replaceToken);
+        //}
 
-        /// <summary>
-        /// 澧炲姞鍏变韩鏁版嵁
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePackNew EditShareData(ShareData shareData)
-        {
-            return AddShareData(shareData);
-            //Dictionary<string, object> d = new Dictionary<string, object>();
-            //d.Add("DistributedMark", shareData.DistributedMark);
-            //d.Add("ShareName", shareData.ShareName);
-            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
-            //d.Add("ShareDataBytes", shareData.ShareDataBytes);
-            //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
-            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
-        }
+        ///// <summary>
+        ///// 澧炲姞鍏变韩鏁版嵁
+        ///// </summary>
+        ///// <returns></returns>
+        //public ResponsePackNew EditShareData(ShareData shareData)
+        //{
+        //    return AddShareData(shareData);
+        //    //Dictionary<string, object> d = new Dictionary<string, object>();
+        //    //d.Add("DistributedMark", shareData.DistributedMark);
+        //    //d.Add("ShareName", shareData.ShareName);
+        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+        //    //d.Add("ShareDataBytes", shareData.ShareDataBytes);
+        //    //d.Add("SubAccountDistributedMark", shareData.SubAccountDistributedMark);
+        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/EditShareData", jsonString, true);
+        //}
 
-        /// <summary>
-        /// 鍒犻櫎鍏变韩鏁版嵁
-        /// </summary>
-        /// <param name="shareData"></param>
-        /// <returns></returns>
-        public ResponsePackNew DeleteShareData(ShareData shareData)
-        {
-            var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()
-            {
-                homeId = shareData.homeId,
-                homeShareId = shareData.id
-            });
-            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
-            //Dictionary<string, string> d = new Dictionary<string, string>();
-            //d.Add("DistributedMark", shareData.DistributedMark);
-            //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
-            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
-            //return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
-        }
+        ///// <summary>
+        ///// 鍒犻櫎鍏变韩鏁版嵁
+        ///// </summary>
+        ///// <param name="shareData"></param>
+        ///// <returns></returns>
+        //public ResponsePackNew DeleteShareData(ShareData shareData)
+        //{
+        //    var requestJson = HttpUtil.GetSignRequestJson(new ShareFileDownObj()
+        //    {
+        //        homeId = shareData.homeId,
+        //        homeShareId = shareData.id
+        //    });
+        //    return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
+        //    //Dictionary<string, string> d = new Dictionary<string, string>();
+        //    //d.Add("DistributedMark", shareData.DistributedMark);
+        //    //d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
+        //    //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+        //    //return RequestHttps($"{severAddress}/ZigbeeDataShare/DeleteShareData", jsonString, true);
+        //}
         ///// <summary>
         ///// 鍒犻櫎瀛愯处鍙峰綋鍓嶄綇瀹呯殑鎵�鏈夊叡浜暟鎹�
         ///// </summary>
@@ -979,9 +988,9 @@
                     deviceType = deviceType,
                     produce = isProduce,
                 };
-               
-                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
-                //var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
+
+                //var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
+                var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
                 if (revertObj.Code == StateCode.SUCCESS)
                 {
@@ -1010,16 +1019,31 @@
             }
         }
 
-       
+
         /// <summary>
         /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
         /// </summary>
+        /// <param name="queryType"></param>
         /// <returns></returns>
-        public ResponsePackNew PushSerivceGetPushmessagelist()
+        public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
         {
+            var pushType = "";
+            if (queryType == 1)
+            {
+                pushType = PushType.Default.ToString();
+            } else if (queryType == 1)
+            {
+                pushType = PushType.Alarm.ToString();
+            }
+            else if (queryType == 2)
+            {
+                pushType = PushType.Prompt.ToString();
+            }
+
             var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
             {
-                pushId = OnAppConfig.Instance.PushId
+                pushId = OnAppConfig.Instance.PushId,
+                pushType = pushType
             });
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
         }
@@ -1167,7 +1191,7 @@
                 }
                 else
                 {
-
+                    IMessageCommon.Current.ShowErrorInfoAlter(revertObj.Code);
                 }
                 return false;
             }
@@ -1226,33 +1250,16 @@
         /// <returns></returns>
         public ResponsePackNew CheckAppVersion()
         {
-            var requestObj = new ForceUpdateObj()
+            var requestObj = new AppVersionCheckObj()
             {
-                LanguageType = Utlis.GetPostLanguageType()
+
             };
-#if __IOS__
-            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
-#endif
+
             var requestJson = HttpUtil.GetSignRequestJson(requestObj);
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public ResponsePackNew GetAppVersion()
-        {
-            var requestObj = new ForceUpdateObj()
-            {
 
-            };
-#if __IOS__
-            requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
-#endif
-            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
-            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
-        }
 
         #endregion
 
@@ -1807,7 +1814,7 @@
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
             d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
-            d.Add("gatewayId", DB_ResidenceData.residenceData.HomeGateway.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);
@@ -1948,10 +1955,11 @@
         public ResponsePackNew AddScene(Scene scene)
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.residenceData.residecenInfo.RegionID);
             d.Add("scenes", new List<Scene>() { scene });
 
             var requestJson = HttpUtil.GetSignRequestJson(d);
-            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_EditSecne, requestJson);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddSecne, requestJson);
         }
         /// <summary>
         /// 缂栬緫鍦烘櫙
@@ -2039,14 +2047,7 @@
             }
             var requestJson = HttpUtil.GetSignRequestJson(d);
             var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetRoomList, requestJson);
-            var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
-            if (revData != null)
-            {
-                foreach (var spatial in revData)
-                {
-                    spatial.UpdateSpatialInfoData();
-                }
-            }
+            
             return pack;
         }
         /// <summary>
@@ -2065,10 +2066,7 @@
             var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
             if (revData != null)
             {
-                foreach (var spatial in revData)
-                {
-                    spatial.UpdateSpatialInfoData();
-                }
+                SpatialInfo.CurrentSpatial.UpdateSpatialList(revData, OptionType.Update);
             }
             return pack;
         }
@@ -2084,14 +2082,11 @@
 
             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)
-            {
-                foreach (var spatial in revData)
-                {
-                    spatial.UpdateSpatialInfoData();
-                }
-            }
+            //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(pack.Data.ToString());
+            //if (revData != null)
+            //{
+            //    SpatialInfo.CurrentSpatial.UpdateSpatialList(revData,OptionType.Update);
+            //}
             return pack;
         }
         /// <summary>

--
Gitblit v1.8.0