From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 15:47:28 +0800
Subject: [PATCH] 添加小度的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
index 0afbf47..7102037 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -160,7 +160,7 @@
             btnReDo.Gravity = Gravity.CenterHorizontal;
             btnReDo.TextAlignment = TextAlignment.Center;
             btnReDo.TextID = R.MyInternationalizationString.uReDoAgain;
-            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEventOnly);
+            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEvent);
             frameback.ButtonClickEvent += (sender, e) =>
             {
                 //鍒濆鍖栧垵濮嬩腑閮ㄦ帶浠�
@@ -331,7 +331,7 @@
             for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
             {
                 var way = ZbGateway.GateWayList[i];
-                var wayId = HdlGatewayLogic.Current.GetGatewayId(way);
+                var wayId = way.GwId;
                 if (dicZbGatewayDiv.ContainsKey(wayId) == true)
                 {
                     //宸茬粡澶勭悊浜�
@@ -342,9 +342,9 @@
                 GatewayBindMode mode = GatewayBindMode.BindAgain;
                 //濡傛灉鏄涓�娆$粦瀹�,鎴栬�呮槸浠ュ墠宸茬粡缁戝畾杩囦簡鐨�
                 if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true
-                    || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)
+                    || way.HomeId == Common.Config.Instance.HomeId)
                 {
-                    if (way.getGatewayBaseInfo.HomeId != Common.Config.Instance.HomeId)
+                    if (way.HomeId != Common.Config.Instance.HomeId)
                     {
                         //绗竴娆$粦瀹�,涔熷氨鏄綉鍏充綇瀹匢D涓虹┖
                         mode = GatewayBindMode.First;

--
Gitblit v1.8.0