From cf0bffdf072bae11bdb8c780d0a355818700f713 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 18 五月 2020 15:42:45 +0800
Subject: [PATCH] 请合并代码，优化面板问题
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 221 +++++++++++++++++++++++++++----------------------------
1 files changed, 109 insertions(+), 112 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
old mode 100755
new mode 100644
index 54e00a4..17e5641
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -16,15 +16,9 @@
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
- ///甯稿紑妯″紡鍥炬爣
- Button modeIconBtn = new Button();
- ///绗簩鍧楃浜岀骇鐖舵帶浠�
- FrameLayout modeFl = new FrameLayout();
- Button button1 = new Button();
- Button button2= new Button();
///绗笁鍧楃涓�绾х埗鎺т欢
FrameLayout listLogicFl = new FrameLayout();
///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
@@ -39,7 +33,7 @@
public int timeValue = 0;
public async void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -47,7 +41,7 @@
view.toptitleNameBtn.TextID = MyInternationalizationString.openmode;
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- UserView.HomePage.Instance.ScrollEnabled = true;
+ UserView.HomePage.Instance.ScrollEnabled = true;
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
soneLogicList = null;
this.RemoveFromParent();
@@ -92,30 +86,6 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
middle.AddChidren(fLayout);
- ///甯稿紑妯″紡鍥炬爣
- modeIconBtn = new Button
- {
- X = Application.GetRealWidth(395),
- Y = Application.GetRealHeight(92),
- Width = Application.GetMinRealAverage(294),
- Height = Application.GetMinRealAverage(294),
- };
- fLayout.AddChidren(modeIconBtn);
- ///绗簩鍧楃浜岀骇鐖舵帶浠�
- modeFl = new FrameLayout
- {
- };
- fLayout.AddChidren(modeFl);
-
- button1 = new Button
- {
- };
- modeFl.AddChidren(button1);
-
- button2 = new Button
- {
- };
- modeFl.AddChidren(button2);
ModeView();
#endregion
#region 甯稿紑鑷姩鍖�
@@ -162,7 +132,7 @@
UnSelectedImagePath = "ZigeeLogic/add.png",
};
addLogicfL.AddChidren(addIconBtn);
-
+ ///鍔犲ぇ鐐瑰嚮鐑敭
var addIconclickBtn = new Button
{
Width = Application.GetRealWidth(90 + 69 + 63),
@@ -245,33 +215,46 @@
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
/// </summary>
- public async void ModeView()
+ public void ModeView()
{
-
+
+ fLayout.RemoveAll();
+ ///甯稿紑妯″紡鍥炬爣
+ Button modeIconBtn = new Button
+ {
+ X = Application.GetRealWidth(395),
+ Y = Application.GetRealHeight(92),
+ Width = Application.GetMinRealAverage(294),
+ Height = Application.GetMinRealAverage(294),
+ };
+ fLayout.AddChidren(modeIconBtn);
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
- fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
+
+ fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
- modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
- modeFl.X = Application.GetRealWidth(0);
- modeFl.Height = Application.GetRealHeight(127 + 199);
- modeFl.Width = Application.GetRealHeight(1080);
- modeFl.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- modeFl.SetCornerWithSameRadius(Application.GetRealHeight(0), HDLUtils.RectCornerBottomLeft);
-
+ ///绗簩绾х埗鎺т欢
+ var openModeFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(455),
+ Height = Application.GetRealHeight(127 + 199),
+ Width = Application.GetRealWidth(1080),
+ };
+ fLayout.AddChidren(openModeFl);
///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
- button1.Y = Application.GetRealHeight(0);
- button1.X = Application.GetRealWidth(86);
- button1.Width = Application.GetRealWidth(907);
- button1.Height = Application.GetRealHeight(127);
- button1.Radius = (uint)Application.GetRealHeight(58);
- button1.BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor;
- button1.TextAlignment = TextAlignment.Center;
- button1.TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor;
- button1.TextID = MyInternationalizationString.closeUp;
- button1.TextSize = 16;
-
- button1.MouseUpEventHandler = async (sender, e) =>
+ Button closeBtn = new Button
+ {
+ X = Application.GetRealWidth(86),
+ Height = Application.GetRealHeight(127),
+ Width = Application.GetRealWidth(907),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+ TextID = MyInternationalizationString.closeUp,
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 16,
+ };
+ openModeFl.AddChidren(closeBtn);
+ closeBtn.MouseUpEventHandler += async (sender, e) =>
{
CommonPage.Loading.Start();
try
@@ -302,16 +285,20 @@
});
}
};
+
+ ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
+ var timeTextBtn = new Button
+ {
+ Y = Application.GetRealHeight(127 + 69),
+ X = Application.GetRealWidth(125),
+ Width = Application.GetRealWidth(634 + 200),
+ Height = Application.GetRealHeight(60),
+ TextSize = 15,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ };
if (logicId != 0)
{
- ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
- button2.Y = Application.GetRealHeight(127 + 69);
- button2.X = Application.GetRealWidth(125);
- button2.Width = Application.GetRealWidth(634 + 200);
- button2.Height = Application.GetRealHeight(60);
- button2.UnSelectedImagePath = "ZigeeLogic/1234.png";
- button2.TextSize = 15;
- button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ openModeFl.AddChidren(timeTextBtn);
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
@@ -325,53 +312,61 @@
string text3 = Language.StringByID(MyInternationalizationString.monthSone);
string text4 = Language.StringByID(MyInternationalizationString.numberSone);
string text5 = Language.StringByID(MyInternationalizationString.executeSone);
- button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+ timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
}
- else
- {
- button2.Y = Application.GetRealHeight(0);
- button2.X = Application.GetRealWidth(0);
- button2.Width = Application.GetRealWidth(0);
- button2.Height = Application.GetRealHeight(0);
- }
-
+
}
else
{
fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
- modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(92);
- modeFl.X = Application.GetRealWidth(58);
- modeFl.Height = Application.GetRealHeight(138);
- modeFl.Width = Application.GetRealHeight(1022);
- modeFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ ///绗簩绾х埗鎺т欢
+ var modeFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(478),
+ X = Application.GetRealWidth(58),
+ Height = Application.GetRealHeight(138),
+ Width = Application.GetRealWidth(1022),
+ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ };
+ fLayout.AddChidren(modeFl);
modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
-
///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
- button1.Y = Application.GetRealHeight(40);
- button1.X = Application.GetRealWidth(58);
- button1.Width = Application.GetRealWidth(600);
- button1.Height = Application.GetRealHeight(60);
- button1.Radius = (uint)Application.GetRealHeight(0);
- button1.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
- button1.TextAlignment = TextAlignment.CenterLeft;
- button1.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
- // Text = "鏃舵晥鎬у父寮�璁剧疆",
- button1.TextID = MyInternationalizationString.timeSetSone;
- button1.TextSize = 15;
+ var modeTextBtn = new Button
+ {
-
+ Y = Application.GetRealHeight(40),
+ X = Application.GetRealWidth(58),
+ Width = Application.GetRealWidth(600),
+ Height = Application.GetRealHeight(60),
+ TextSize = 15,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ // Text = "鏃舵晥鎬у父寮�璁剧疆",
+ TextID = MyInternationalizationString.timeSetSone,
+ };
+ modeFl.AddChidren(modeTextBtn);
///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
- button2.Width = Application.GetMinRealAverage(104);
- button2.Height = Application.GetMinRealAverage(104);
- button2.X = Application.GetRealWidth(861);
- button2.Y = Application.GetRealHeight(17);
- button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
- button2.TextSize = 15;
- button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
- button2.Text ="";
- button2.MouseUpEventHandler = (sender, e) =>
+ var nextIconBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(104),
+ X = Application.GetRealWidth(861),
+ Y = Application.GetRealHeight(17),
+ UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
+ };
+ modeFl.AddChidren(nextIconBtn);
+
+ ///鍔犲ぇ鐐瑰嚮鐑敭
+ var clickBtn = new Button
+ {
+ Width = Application.GetRealWidth(104 + 161 + 30),
+ Height = Application.GetRealHeight(138),
+ X = Application.GetRealWidth(700),
+ };
+ modeFl.AddChidren(clickBtn);
+ clickBtn.MouseUpEventHandler += (sender, e) =>
{
LogicView.TipView.ShowConfrimTip(() =>
@@ -405,8 +400,8 @@
logicId = addResult;
timeValue = int.Parse(str);
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
- ModeView();
- //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+ ModeView();
+ //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
}
}
@@ -439,7 +434,7 @@
/// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
/// </summary>
/// <param name="yes"></param>
- private async void Read( bool yes)
+ private async void Read(bool yes)
{
if (yes)
{
@@ -477,8 +472,10 @@
}
}
-
- RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+ /// <summary>
+ /// 璁板綍宸︽粦鐘舵��
+ /// </summary>
+ RowLayout selectedRow = new RowLayout() { Tag = "0" };
int a = 1;
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛�
@@ -514,7 +511,7 @@
selectedRow = logicRow;
};
a++;
- ///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
+ ///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
var nameBtn = new Button
{
Height = Application.GetRealHeight(58),
@@ -578,7 +575,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
-
+
///鍒犻櫎
var del = new Button
{
@@ -631,17 +628,17 @@
{
var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- alert.ConfirmClickEvent += () =>
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
Common.Logic.SoneLogicList.Remove(logic);
//logicRow.Parent.RemoveFromParent();
fLayoutLogic.RemoveFromParent();
- Send.DelLogic(logic.LogicId);
+ Send.DelLogic(logic.LogicId);
};
- };
+ };
}
}
--
Gitblit v1.8.0