From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
index 0b3a7d8..de5e249 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayAddSuccessForm.cs
@@ -51,6 +51,7 @@
//娣诲姞鏅鸿兘缃戝叧鎴愬姛
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(85), false);
+ btnMsg.IsBold = true;
btnMsg.Y = Application.GetRealHeight(732);
btnMsg.TextAlignment = TextAlignment.Center;
btnMsg.TextSize = 20;
@@ -58,7 +59,7 @@
bodyFrameLayout.AddChidren(btnMsg);
//缁х画娣诲姞缃戝叧
- var frameAdd = new FrameLayoutControl();
+ var frameAdd = new FrameLayoutStatuControl();
frameAdd.UseClickStatu = false;
frameAdd.Y = Application.GetRealHeight(1224);
frameAdd.Gravity = Gravity.CenterHorizontal;
@@ -67,6 +68,7 @@
frameAdd.BackgroundImagePath = "Item/BottomButtonGround.png";
bodyFrameLayout.AddChidren(frameAdd);
var btnAdd = new NormalViewControl(300, 65, true);
+ btnAdd.IsBold = true;
btnAdd.TextColor = UserCenterColor.Current.White;
btnAdd.TextSize = 16;
btnAdd.Y = Application.GetRealHeight(49);
@@ -76,11 +78,8 @@
frameAdd.AddChidren(btnAdd, ChidrenBindMode.BindEventOnly);
frameAdd.ButtonClickEvent += (sender, e) =>
{
- //鍏抽棴鑷韩
- this.CloseForm();
- //鍏抽棴鍒楄〃鐣岄潰
- this.CloseFormByFormName("WiredGatewayListForm");
//璁╁畠閫�鍒拌彍鍗曢�夋嫨鐣岄潰
+ UserCenterLogic.CloseAllOpenForm("NewGateWayMenuSelectForm");
};
//杩斿洖涓婚〉
@@ -90,13 +89,8 @@
bodyFrameLayout.AddChidren(btnGoback);
btnGoback.ButtonClickEvent += (sender, e) =>
{
- //鍏抽棴鑷韩
- this.CloseForm();
- //鍏抽棴鍒楄〃鐣岄潰
- this.CloseFormByFormName("WiredGatewayListForm");
- //鍏抽棴鑿滃崟閫夋嫨鐣岄潰
- this.CloseFormByFormName("NewGateWayMenuSelectForm");
//璁╁畠閫�鍒颁富椤�
+ UserCenterLogic.CloseAllOpenForm();
};
}
--
Gitblit v1.8.0