From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index c91a3c2..ca44a7a 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,8 +137,14 @@
var form = new GatewayRebindForm();
form.AddForm(gateway, dicZbGatewayDiv);
});
- };
- }
+ }
+ else
+ {
+ var form = new GatewayProductInfoForm();
+ form.AddForm(gateway);
+ }
+ };
+
//瀹氫綅
var btnPosition = frameRow.AddEditorControl(false);
btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
@@ -180,7 +178,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