From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index c1a0d9e..c32ca0c 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -727,6 +727,24 @@
             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>
         /// 娣诲姞鍒嗕韩
@@ -1045,7 +1063,8 @@
             var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
             {
                 pushId = OnAppConfig.Instance.PushId,
-                pushType = pushType
+                pushType = pushType,
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
             });
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
         }
@@ -1940,7 +1959,7 @@
             d.Add("actions", actionObjs);
 
             var requestJson = HttpUtil.GetSignRequestJson(d);
-            MainPage.Log($"{requestJson}");
+            MainPage.Log($"api鍔熻兘鎺у埗锛歿requestJson}");
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlDevice, requestJson);
         }
         /// <summary>
@@ -2462,7 +2481,7 @@
 
         #region 鈻� 鍙瀵硅_________________________
         /// <summary>
-        /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙f満鍒楄〃
+        /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
         /// </summary>
         /// <returns></returns>
         public ResponsePackNew CheckFlVideo()

--
Gitblit v1.8.0