From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 150 ++++++++++++++++++++++++++++++-------------------
1 files changed, 92 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 92f05bc..9231d7a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -44,6 +44,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -108,7 +109,7 @@
Height = Application.GetRealHeight(436),
X = Application.GetRealWidth(72),
Y = Application.GetRealHeight(30),
- UnSelectedImagePath = "ZigeeLogic/logicbj" + s + ".png",
+ UnSelectedImagePath = $"ZigeeLogic/logicbj{s}.png",
};
logiciconfl.AddChidren(iconBtn);
@@ -138,7 +139,7 @@
logicTextBox = new EditText
{
Y = Application.GetRealHeight(35),
- Width = Application.GetRealWidth(900),
+ Width = Application.GetRealWidth(1080 - 58 - 300),
Height = Application.GetRealHeight(60),
X = text.Right,
TextAlignment = TextAlignment.CenterLeft,
@@ -297,11 +298,11 @@
var addtextbtn = new Button
{
Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(300),
+ Width = Application.GetRealWidth(400),
Y = Application.GetRealHeight(45 + 30),
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addconditions,
- X = Application.GetRealWidth(390),
+ TextID = MyInternationalizationString.addsensor,
+ X = Application.GetRealWidth(340),
TextSize = 14,
};
addfl.AddChidren(addtextbtn);
@@ -441,14 +442,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+
}
}
}
@@ -483,21 +494,18 @@
del.MouseUpEventHandler += (sender, e) =>
{
-
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
- {
- if (e1)
- {
- Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
- }
- };
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
+ alert.ConfirmClickEvent += () =>
+ {
+ Common.Logic.CurrentLogic.Conditions.Remove(conditions);
+ var templatePage = new TemplatePage();
+ UserView.HomePage.Instance.AddChidren(templatePage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ templatePage.Show();
+ };
};
@@ -601,11 +609,11 @@
var addtextbtn = new Button
{
Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(300),
+ Width = Application.GetRealWidth(400),
Y = Application.GetRealHeight(45 + 30),
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addfunction,
- X = Application.GetRealWidth(390),
+ TextID = MyInternationalizationString.addlighting,
+ X = Application.GetRealWidth(340),
TextSize = 14,
};
addfl.AddChidren(addtextbtn);
@@ -985,20 +993,19 @@
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
- {
- if (e1)
- {
- Common.Logic.CurrentLogic.Actions.Remove(actions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
- }
- };
+
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
+ alert.ConfirmClickEvent += () =>
+ {
+ Common.Logic.CurrentLogic.Actions.Remove(actions);
+ var templatePage = new TemplatePage();
+ UserView.HomePage.Instance.AddChidren(templatePage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ templatePage.Show();
+ };
};
@@ -1128,23 +1135,12 @@
Gravity = Gravity.CenterVertical,
};
pushswitchRowlayout.AddChidren(btnswitch);
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
- {
- btnswitch.IsSelected = !btnswitch.IsSelected;
- if (btnswitch.IsSelected)
- {
-
- }
- else
- {
-
- }
- };
+
var custompushFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(160),
+ Height = Application.GetRealHeight(0),
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(custompushFrameLayout);
@@ -1195,7 +1191,38 @@
#endregion
+ bool tag = false;//鏍囪寮�鍏崇姸鎬�;
+ btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ {
+ btnswitch.IsSelected = !btnswitch.IsSelected;
+ if (btnswitch.IsSelected)
+ {
+ tag = true;
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
+ }
+ else
+ {
+ tag = false;
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
+
+ }
+ Send.Zj(tag, Common.Logic.CurrentLogic);
+ };
+ if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0)
+ {
+ tag = false;
+ btnswitch.IsSelected = false;
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ }
+ else
+ {
+ tag = true;
+ btnswitch.IsSelected = true;
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ }
var saveFrameLayout = new FrameLayout
{
Y = middle.Bottom,
@@ -1211,7 +1238,7 @@
Width = Application.GetRealWidth(910),
Radius = (uint)Application.GetRealHeight(60),
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
- TextID = MyInternationalizationString.Save,
+ TextID = MyInternationalizationString.application,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
saveFrameLayout.AddChidren(btnsave);
@@ -1224,15 +1251,18 @@
//}
if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
{
- new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
- var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
- if (logicname != null)
- {
- new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
- return;
- }
+ //var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
+ //if (logicname != null)
+ //{
+ // new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
+ // return;
+ //}
Common.Logic.CurrentLogic.LogicName = name;
@@ -1246,6 +1276,10 @@
{
Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
+ if (tag)
+ {
+ Send.Zj(tag, Common.Logic.CurrentLogic);
+ }
}
}
else
--
Gitblit v1.8.0