From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
index 1c3300a..5dafe35 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -16,7 +16,7 @@
}
Button selectedIcon = new Button();
- public void Show(CommonDevice common, string name, bool edit, int timevalue)
+ public void Show(CommonDevice common, string name, bool edit, int timevalue,string _if)
{
#region 涓婇潰鐨勫竷灞�浠ｇ爜
@@ -46,8 +46,8 @@
monView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
monView.funnameBtn.Text = intValue + Language.StringByID(MyInternationalizationString.Minute);
monView.funnameBtn.Tag = intValue;
- monView.funnextBtn.Width = Application.GetMinRealAverage(60);
- monView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ monView.funnextBtn.Width = Application.GetRealWidth(60);
+ monView.funnextBtn.Height = Application.GetRealWidth(60);
monView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
monView.funnextBtn.Visible = false;
middle.AddChidren(monView.FunFrameView());
@@ -107,7 +107,7 @@
PickerView.ShowNormal(minuteList, secondList, null, (Index1, Index2, Index3) =>
{
selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
- TimeMethod(common, selectetimedvalue, timevalue, edit);
+ TimeMethod(common, selectetimedvalue, timevalue, edit, _if);
}, selectIndex1, selectIndex2, 0, Language.StringByID(MyInternationalizationString.logiccustom));
}
else
@@ -120,11 +120,11 @@
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- TimeMethod(common, selectetimedvalue, timevalue, edit);
+ TimeMethod(common, selectetimedvalue, timevalue, edit,_if);
};
}
- public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit)
+ public void TimeMethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit,string _if)
{
var deviceConditionsInfo = new Dictionary<string, string>();
@@ -134,9 +134,9 @@
deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
deviceConditionsInfo.Add("Cluster_ID", "1280");
deviceConditionsInfo.Add("AttriButeId", "1281");
- deviceConditionsInfo.Add("AttriButeData1", "0");
+ deviceConditionsInfo.Add("AttriButeData1", "1");
deviceConditionsInfo.Add("AttriButeData2", "0");
- deviceConditionsInfo.Add("Range", "1");
+ deviceConditionsInfo.Add("Range", "5");
if (selectetimedvalue != 0)
{
if (timevalue != selectetimedvalue)
@@ -155,7 +155,7 @@
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.delaytip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -163,10 +163,35 @@
}
}
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+
+ switch (_if)
+ {
+ case "logic":
+ {
+ //鑷姩鍖�
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
+ break;
+ case "mould":
+ {
+ //鑷姩鍖栨帹鑽愭ā鏉�
+ var templatePage = new TemplatePage();
+ UserView.HomePage.Instance.AddChidren(templatePage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ templatePage.Show();
+ }
+ break;
+
+ }
+
+
+ //var logicCommunalPage = new LogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //logicCommunalPage.Show(() => { });
}
}
--
Gitblit v1.8.0