From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 5ee0d16..78ee519 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -109,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);
@@ -298,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);
@@ -444,19 +444,19 @@
int second = int.Parse(conditions["IgnoreTime"]) % 60;
if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
else
{
if (minute == 0 && second != 0)
{
- devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+ 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.closetime);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
}
@@ -612,11 +612,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);
@@ -1139,23 +1139,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);
@@ -1206,7 +1195,31 @@
#endregion
+ bool tag = false;//鏍囪寮�鍏崇姸鎬�;
+ btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ {
+ btnswitch.IsSelected = !btnswitch.IsSelected;
+ if (btnswitch.IsSelected)
+ {
+ tag = true;
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ if (Common.Logic.CurrentLogic.LogicId != 0)
+ {
+ Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ }
+ }
+ else
+ {
+ tag = false;
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ if (Common.Logic.CurrentLogic.LogicId != 0)
+ {
+ Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
+ }
+
+ }
+ };
var saveFrameLayout = new FrameLayout
{
Y = middle.Bottom,
@@ -1222,7 +1235,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);
@@ -1238,12 +1251,12 @@
new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), 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;
- }
+ //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;
@@ -1257,6 +1270,10 @@
{
Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
+ if (tag)
+ {
+ Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ }
}
}
else
--
Gitblit v1.8.0