From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index 4266eeb..70d86b1 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)
{
//濡傛灉鏈湴娌℃湁,閭ｄ箞搴旇鏄湪涔嬪悗鐨勭紪杈戠晫闈㈠垹闄や簡
@@ -120,23 +120,15 @@
//搴曠嚎
frameRow.frameTable.AddBottomLine();
}
- frameRow.frameTable.ButtonClickEvent += (sender, e) =>
- {
- var form = new GatewayProductInfoForm();
- form.AddForm(gateway);
- };
-
if (dicZbGatewayDiv[gwid] == 2)
{
- //鎹㈢粦
- var btnBind = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnBind.BackgroundColor = 0xfffb744a;
- btnBind.TextAlignment = TextAlignment.Center;
- btnBind.TextColor = UserCenterColor.Current.White;
- btnBind.TextSize = 12;
- btnBind.TextID = R.MyInternationalizationString.uReBindAgain;
- frameRow.AddRightView(btnBind);
- btnBind.ButtonClickEvent += (sender, e) =>
+ //闇�閲嶆柊缁戝畾
+ frameRow.frameTable.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uNeedToRebind), 300);
+ }
+
+ frameRow.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ if (dicZbGatewayDiv[gwid] == 2)
{
//纭缁戝畾鏃х綉鍏筹紵
string msg = Language.StringByID(R.MyInternationalizationString.uRebindGatewayMsg);
@@ -145,16 +137,17 @@
var form = new GatewayRebindForm();
form.AddForm(gateway, dicZbGatewayDiv);
});
- };
- }
+ }
+ else
+ {
+ var form = new GatewayProductInfoForm();
+ form.AddForm(gateway);
+ }
+ };
+
//瀹氫綅
- 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 +170,20 @@
}
#endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ //鍒锋柊涓婚〉
+ UserView.UserPage.Instance.ReFreshControl();
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0