From 427a6e93b8946b9d91727166a352b2ee2ef75d19 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:10:08 +0800
Subject: [PATCH] Delete .DS_Store

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
old mode 100644
new mode 100755
index c27acef..369d632
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1810,7 +1810,7 @@
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
             d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
-            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);//DriverLayer.Control.Ins.GatewayId);
+            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);
@@ -2125,5 +2125,34 @@
         }
 
         #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.RegionID);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetBindBrandList, requestJson);
+
+            return pack;
+        }
+
+        #endregion
+
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0