From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index 4266eeb..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箞搴旇鏄湪涔嬪悗鐨勭紪杈戠晫闈㈠垹闄や簡
@@ -148,13 +148,8 @@
                 };
             }
             //瀹氫綅
-            var btnPosition = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
-            btnPosition.BackgroundColor = 0xff4a4a4a;
-            btnPosition.TextAlignment = TextAlignment.Center;
-            btnPosition.TextColor = UserCenterColor.Current.White;
-            btnPosition.TextSize = 12;
+            var btnPosition = frameRow.AddEditorControl(false);
             btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
-            frameRow.AddRightView(btnPosition);
             btnPosition.ButtonClickEvent += (sender, e) =>
             {
                 //鍙戦�佸畾浣嶅懡浠�
@@ -177,5 +172,23 @@
         }
 
         #endregion
+
+        #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+        /// <summary>
+        /// 鐣岄潰鍏抽棴
+        /// </summary>
+        public override void CloseFormBefore()
+        {
+            var userPageForm = UserView.UserPage.Instance.GetNowActionForm();
+            if (userPageForm != null && userPageForm.FormID == "UserMainForm")
+            {
+                //鍒锋柊涓婚〉
+                UserView.UserPage.Instance.ReFreshControl();
+            }
+            base.CloseFormBefore();
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0