From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 15f46ff..6ca7502 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -328,13 +328,8 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏇存敼
- var btnChanged = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnChanged.BackgroundColor = 0xff4a4a4a;
- btnChanged.TextSize = 12;
- btnChanged.TextColor = UserCenterColor.Current.White;
- btnChanged.TextAlignment = TextAlignment.Center;
+ var btnChanged = frameRow.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
- frameRow.AddRightView(btnChanged);
btnChanged.ButtonClickEvent += (sender, e) =>
{
//鍒涘缓鎴栬�呯紪杈戞ゼ灞�
@@ -574,8 +569,6 @@
var btnEditor = frameRow.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
{
- //鍏抽棴宸﹀彸鑿滃崟
- frameRow.HideMenu();
var form = new EditorRoomInforForm();
form.AddForm(room);
form.FinishEditorEvent += (roomName) =>
@@ -803,7 +796,7 @@
{
//璇疯緭鍏ヤ綇瀹呭悕绉�
string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInputFloorName);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
return false;
}
foreach (string floorKeys in Common.Config.Instance.Home.FloorDics.Keys)
@@ -812,7 +805,7 @@
{
//妤煎眰鍚嶇О宸茬粡瀛樺湪
string msg = Language.StringByID(R.MyInternationalizationString.uFloorNameIsExist);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
return false;
}
}
--
Gitblit v1.8.0