From adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 六月 2020 15:26:46 +0800
Subject: [PATCH] 2020.06.24.01

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index c91a3c2..03fad5d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
@@ -84,7 +84,7 @@
         /// <param name="addLine"></param>
         private void AddGatewayRow(VerticalListControl listView, ZbGateway gateway, bool addLine)
         {
-            string gwid = HdlGatewayLogic.Current.GetGatewayId(gateway);
+            string gwid = gateway.GwId;
             if (this.dicZbGatewayDiv[gwid] != 2)
             {
                 //濡傛灉鏈湴娌℃湁,閭d箞搴旇鏄湪涔嬪悗鐨勭紪杈戠晫闈㈠垹闄や簡
@@ -180,7 +180,8 @@
         /// </summary>
         public override void CloseFormBefore()
         {
-            if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)
+            var userPageForm = UserView.UserPage.Instance.GetNowActionForm();
+            if (userPageForm != null && userPageForm.FormID == "UserMainForm")
             {
                 //鍒锋柊涓婚〉
                 UserView.UserPage.Instance.ReFreshControl();

--
Gitblit v1.8.0