From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 1772 +++++++++++++++++++++-------------------------------------
1 files changed, 637 insertions(+), 1,135 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 4f954b9..171aa2f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -20,28 +20,33 @@
EditText logicTextBox;
public void Show(Action action)
{
-
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
+
+ this.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+ var topFrameLayout1 = new FrameLayout
{
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
};
- this.AddChidren(topRowLayout);
+ AddChidren(topFrameLayout1);
+
+ var topFrameLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(140),
+ Y = Application.GetRealHeight(80),
+ BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+ };
+ AddChidren(topFrameLayout);
var titleName = new Button
{
- TextSize = 16,
+
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.selection,
+ X = Application.GetRealWidth(150),
};
- topRowLayout.AddChidren(titleName);
+ topFrameLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
{
titleName.Text = Language.StringByID(MyInternationalizationString.editautomation);
@@ -51,183 +56,195 @@
titleName.Text = Language.StringByID(MyInternationalizationString.newautomation);
}
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
var back = new Button
{
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
+ Width = Application.GetRealWidth(110),
+ Height = Application.GetRealHeight(110),
+ X = Application.GetRealWidth(20),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "ZigeeLogic/Back.png",
};
- topRowLayout.AddChidren(back);
+ topFrameLayout.AddChidren(back);
+
back.MouseDownEventHandler += (sender, e) =>
{
+ //if (Common.Logic.CurrentLogic.LogicId != 0)
+ //{
+ // Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+ // action();
+ // Send.AddModifyLogic(Common.Logic.CurrentLogic);
+ //}
action();
RemoveFromParent();
};
-
- #endregion
-
-
-
- var middle = new VerticalScrolViewLayout
- {
- Y = topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184-180),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
+ var middle = new VerticalScrolViewLayout();
+ middle.Y = topFrameLayout.Bottom;
+ middle.Height = Application.GetRealHeight(1920 - 220 - 194);
+ middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
this.AddChidren(middle);
+ var fl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(280),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ };
+ middle.AddChidren(fl);
+
+ #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
+ var weekfl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(140),
+ Y = Application.GetRealHeight(20),
+ };
+ fl.AddChidren(weekfl);
+
+ var btnweektext = new Button
+ {
+ Width = Application.GetRealWidth(900 - 300),
+ Height = Application.GetRealHeight(70),
+ X = Application.GetRealWidth(140 + 300),
+ TextAlignment = TextAlignment.CenterRight,
+ //Text = "姣忓ぉ",
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextID = MyInternationalizationString.everyday,
+ };
+ weekfl.AddChidren(btnweektext);
+ var settxet = new Button
+ {
+ Width = Application.GetRealWidth(900 - 500),
+ Height = Application.GetRealHeight(70),
+ X = Application.GetRealWidth(140 + 500),
+ TextAlignment = TextAlignment.CenterRight,
+ Y = btnweektext.Bottom,
+ //Text = "璁剧疆鍛ㄦ湡",
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextID = MyInternationalizationString.setupcycle,
+ };
+ weekfl.AddChidren(settxet);
+
+ UpdateWeek(btnweektext);
+
+ EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
+ {
+ /*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
+ //var cycle = new Cycle(() => { UpdateWeek(btnweektext); });
+ //UserView.HomePage.Instance.AddChidren(cycle);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //cycle.Show();
+
+ var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
+ UserView.HomePage.Instance.AddChidren(cyclicCycle);
+ UserView.HomePage.Instance.PageIndex += 1;
+ cyclicCycle.Show();
+ };
+ btnweektext.MouseUpEventHandler += cycleclick;
+ settxet.MouseUpEventHandler += cycleclick;
+ #endregion
#region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
var logicnamefl = new FrameLayout
{
- Height = Application.GetRealHeight(130),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ Height = Application.GetRealHeight(140),
+ Y = weekfl.Bottom,
+ //BackgroundColor=0xff453736,
};
- middle.AddChidren(logicnamefl);
+ fl.AddChidren(logicnamefl);
var text = new Button
{
- Width = Application.GetRealWidth(300),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(60),
- X = Application.GetRealWidth(58),
+ X = Application.GetRealWidth(50),
TextAlignment = TextAlignment.CenterLeft,
//Text = "鑷姩鍖栧悕绉�",
TextID = MyInternationalizationString.automationname,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Y = Application.GetRealHeight(35),
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
};
logicnamefl.AddChidren(text);
logicTextBox = new EditText
{
- Y = Application.GetRealHeight(35),
- Width = Application.GetRealWidth(1080-58-300),
+ Width = Application.GetRealWidth(900),
Height = Application.GetRealHeight(60),
- X = text.Right,
+ X = Application.GetRealWidth(40 + 20),
+ Y = text.Bottom + Application.GetRealHeight(10),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextSize = 13,
Text = Common.Logic.CurrentLogic.LogicName,
//TextID=MyInternationalizationString.automation1,
};
logicnamefl.AddChidren(logicTextBox);
- var fraline = new FrameLayout
+ var btnline = new Button
{
- Height = Application.GetRealHeight(30),
+ Height = Application.GetRealHeight(4),
+ Y = Application.GetRealHeight(140 - 4),
+ BackgroundColor = ZigbeeColor.Current.LogicLineColor,
};
- middle.AddChidren(fraline);
+ logicnamefl.AddChidren(btnline);
#endregion
#region -----鏄剧ず閫昏緫鏉′欢-----
-
-
- var conditionFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(conditionFrameLayout);
-
-
var conditionRowLayout = new RowLayout
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ Height = Application.GetRealHeight(150),
+ //BackgroundColor = 0xff323232,
};
- conditionFrameLayout.AddChidren(conditionRowLayout);
-
+ middle.AddChidren(conditionRowLayout);
conditionRowLayout.AddChidren(new Button
{
-
- Text = Language.StringByID(MyInternationalizationString.ifcondition),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
+ //Text = "濡傛灉",
+ TextID = MyInternationalizationString.ifcondition,
+ TextAlignment = TextAlignment.CenterLeft,
+ X = Application.GetRealWidth(40),
+ // Gravity = Gravity.CenterVertical,
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+ Y = Application.GetRealHeight(90),
TextSize = 16,
- Gravity = Gravity.CenterVertical,
});
-
- var conditionadd1 = new Button
- {
-
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(57),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(965 + 58),
-
- };
- conditionFrameLayout.AddChidren(conditionadd1);
var conditionadd = new Button
{
-
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(110),
+ Height = Application.GetRealHeight(100),
UnSelectedImagePath = "ZigeeLogic/add.png",
- X = Application.GetRealWidth(965 - 58),
+ X = Application.GetRealWidth(1080 - 140),
Gravity = Gravity.CenterVertical,
-
};
conditionRowLayout.AddChidren(conditionadd);
///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
- EventHandler<MouseEventArgs> conditionaddclick = (sender, e) =>
+ conditionadd.MouseUpEventHandler += (sender, e) =>
{
- if (Common.Logic.CurrentLogic.Conditions.Count == 1)
- {
- ConditionView(false);
- }
- else
- {
- var addLogicPage = new AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
+ ConditionView();
};
- conditionadd.MouseUpEventHandler += conditionaddclick;
- conditionadd1.MouseUpEventHandler += conditionaddclick;
+
+
List<Dictionary<string, string>> ListConditions = new List<Dictionary<string, string>>();
ListConditions.Clear();
ListConditions.AddRange(Common.Logic.CurrentLogic.Conditions);
ListConditions.Add(new Dictionary<string, string>());
if (Common.Logic.CurrentLogic.Conditions.Count > 1)
{
+ //inputVerticalScrolViewLayout.Height = Application.GetRealHeight(160 * ListConditions.Count) + Application.GetRealHeight(60);
var row = new FrameLayout
{
Height = Application.GetRealHeight(60),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
+ //inputVerticalScrolViewLayout.AddChidren(row);
middle.AddChidren(row);
var relationship = new Button
{
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(60),
TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(58),
- TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+ X = Application.GetRealWidth(40),
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
};
row.AddChidren(relationship);
if (Common.Logic.CurrentLogic.Relationship == 0)
@@ -238,14 +255,6 @@
{
relationship.Text = Language.StringByID(MyInternationalizationString.followingconditions) + Language.StringByID(MyInternationalizationString.anycondition);
}
- EventHandler<MouseEventArgs> editclick = (sender, e) =>
- {
-
- ConditionView(true);
- };
- row.MouseUpEventHandler += editclick;
- relationship.MouseUpEventHandler += editclick;
-
}
for (int i = 0; i < ListConditions.Count; i++)
{
@@ -254,80 +263,34 @@
var addfl = new FrameLayout
{
- Height = Application.GetRealHeight(160 + 30 + 50),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Height = Application.GetRealHeight(160),
};
middle.AddChidren(addfl);
var addbtn = new Button
{
- Height = Application.GetRealHeight(130 + 50),
- Width = Application.GetRealWidth(908),
- Y = Application.GetRealHeight(30),
- X = Application.GetRealWidth(86),
- UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+ Height = Application.GetRealHeight(120),
+ Width = Application.GetRealWidth(1000),
+ X = Application.GetRealWidth(40),
+ Y = Application.GetRealHeight(40),
+ Radius = (uint)Application.GetRealHeight(30),
+ //Text = "娣诲姞鏉′欢",
+ BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextID = MyInternationalizationString.addconditions,
};
addfl.AddChidren(addbtn);
-
-
- var addtextbtn = new Button
+ addbtn.MouseUpEventHandler += (sender, e) =>
{
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(300),
- Y = Application.GetRealHeight(45 + 30),
- TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addconditions,
- X = Application.GetRealWidth(390),
+ ConditionView();
};
- addfl.AddChidren(addtextbtn);
-
- EventHandler<MouseEventArgs> addconditionsclick = (sender, e) =>
- {
- if (Common.Logic.CurrentLogic.Conditions.Count == 1)
- {
- ConditionView(false);
- }
- else
- {
- var addLogicPage = new AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
- };
- addbtn.MouseUpEventHandler += addconditionsclick;
- addtextbtn.MouseUpEventHandler += addconditionsclick;
}
else
{
- var devicesFrameLayout = new FrameLayout
+ var conditionsowLayout = new RowLayout
{
- Height = Application.GetRealHeight(130),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Height = Application.GetRealHeight(160),
};
- middle.AddChidren(devicesFrameLayout);
-
- ///鏄剧ず鍥炬爣
- var conditionIcon = new Button
- {
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(104),
- Y = Application.GetRealHeight(25),
- //UnSelectedImagePath = "ZigeeLogic/time.png",
-
- };
- devicesFrameLayout.AddChidren(conditionIcon);
-
-
- var conditionsRowLayout = new RowLayout
- {
- Width = Application.GetRealWidth(800),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(222),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- devicesFrameLayout.AddChidren(conditionsRowLayout);
-
+ middle.AddChidren(conditionsowLayout);
var Type = int.Parse(ListConditions[i]["Type"]);
var conditions = ListConditions[i];
switch (Type)
@@ -339,39 +302,31 @@
///鏄剧ず鏃堕棿
var timevalue = new Button
{
- Width = Application.GetRealWidth(200),
+ X = Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(800),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ //Text = starttime,
+ //TextColor = 0xff121212,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddChidren(timevalue);
-
-
- var timeTxet = new Button
- {
- Width = Application.GetRealWidth(400),
- TextAlignment = TextAlignment.CenterRight,
- Gravity = Gravity.CenterVertical,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- X = conditionsRowLayout.Width - Application.GetRealWidth(400),
- };
- conditionsRowLayout.AddChidren(timeTxet);
+ conditionsowLayout.AddChidren(timevalue);
var timeedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(timeedit);
+ conditionsowLayout.AddRightView(timeedit);
timeedit.MouseUpEventHandler += (sender, e) =>
{
var timePoint = new TimePoint();
UserView.HomePage.Instance.AddChidren(timePoint);
UserView.HomePage.Instance.PageIndex += 1;
- timePoint.IsEditor = true;
+ timePoint.IsDeviceEditor = true;
timePoint.Show(conditions);
};
@@ -382,57 +337,49 @@
{
string s = "";
s = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
- timevalue.Text = conditions["StartHour"] + ":" + s;
- timeTxet.TextID = MyInternationalizationString.immediateexecution;
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/timepoint.png";
+ timevalue.Text = Language.StringByID(MyInternationalizationString.time) + conditions["StartHour"] + ":" + s;
}
break;
case 1:
- timevalue.TextID = MyInternationalizationString.sunrise;
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/sunrise.png";
if (int.Parse(conditions["AdjustTime"]) > 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunriseafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
}
else if (int.Parse(conditions["AdjustTime"]) < 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunrisebefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
}
else
{
- //timeTxet.Text = Language.StringByID(MyInternationalizationString.sunrise);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunrise);
}
break;
case 2:
- timevalue.TextID = MyInternationalizationString.sunset;
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/sunset.png";
if (int.Parse(conditions["AdjustTime"]) > 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunsetafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
}
else if (int.Parse(conditions["AdjustTime"]) < 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunsetbefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
}
else
{
- // timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
}
break;
case 3:
- timevalue.TextID = MyInternationalizationString.noon;
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/noon.png";
if (int.Parse(conditions["AdjustTime"]) > 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.noonafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
}
else if (int.Parse(conditions["AdjustTime"]) < 0)
{
- timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.noonbefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
}
else
{
- // timeTxet.Text = Language.StringByID(MyInternationalizationString.noon);
+ timevalue.Text = Language.StringByID(MyInternationalizationString.noon);
}
break;
}
@@ -441,46 +388,37 @@
break;
case 5:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/timeparagraph.png";
string s1 = "", s2 = "";
s1 = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
s2 = conditions["StopMin"].Length < 2 ? "0" + conditions["StopMin"] : conditions["StopMin"];
///鏄剧ず鏃堕棿
var timevalue = new Button
{
- Width = Application.GetRealWidth(400),
+ X = Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2,
//TextColor = 0xff121212,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddChidren(timevalue);
- var timeTxet = new Button
- {
- Width = Application.GetRealWidth(400),
- TextAlignment = TextAlignment.CenterRight,
- Gravity = Gravity.CenterVertical,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- X = conditionsRowLayout.Width - Application.GetRealWidth(400),
- TextID = MyInternationalizationString.timeframe,
- };
- conditionsRowLayout.AddChidren(timeTxet);
+ conditionsowLayout.AddChidren(timevalue);
+
var timeedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ //TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(timeedit);
+ conditionsowLayout.AddRightView(timeedit);
timeedit.MouseUpEventHandler += (sender, e) =>
{
var timePage = new TimePage();
UserView.HomePage.Instance.AddChidren(timePage);
UserView.HomePage.Instance.PageIndex += 1;
timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
- timePage.IsEditor = true;
+ timePage.IsDeviceEditor1 = true;
timePage.Show();
};
}
@@ -495,74 +433,52 @@
///鏄剧ず璁惧鍚嶇О
var btndevice = new Button
{
- Y = Application.GetRealHeight(20),
- Height = Application.GetRealHeight(50),
- Width = Application.GetRealWidth(400),
+ X = Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
+ Gravity = Gravity.CenterVertical,
Text = deviceinof.DeviceEpointName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ //TextColor = 0xff121212,
};
- conditionsRowLayout.AddChidren(btndevice);
-
- ///鍖哄煙(鎴块棿)鍚嶇ОButton
- var btnregionname = new Button
- {
- Y = btndevice.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(400),
- TextAlignment = TextAlignment.CenterLeft,
- Height = Application.GetRealHeight(50),
- Text = "",//Language.StringByID(MyInternationalizationString.customroom),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- };
- conditionsRowLayout.AddChidren(btnregionname);
- ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
- Send.RoomNmae(btnregionname, deviceinof);
+ conditionsowLayout.AddChidren(btndevice);
var deviceedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(deviceedit);
+ conditionsowLayout.AddRightView(deviceedit);
deviceedit.MouseUpEventHandler += (sender, e) =>
{
-
- if (deviceinof.Type != DeviceType.DoorLock)
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- DeviceStateCondition.CurrentDeviceView(flMain, deviceinof, true);
- }
- else
- {
- var memberList = new MemberList();
- UserView.HomePage.Instance.AddChidren(memberList);
- UserView.HomePage.Instance.PageIndex += 1;
- MemberList.edit = true;
- memberList.Show(deviceinof);
- }
-
+ //var selectedDeviceState = new SelectedDeviceState();
+ //UserView.HomePage.Instance.AddChidren(selectedDeviceState);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //selectedDeviceState.IsDeviceEditor = true;
+ //selectedDeviceState.Show(deviceinof);
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ DeviceStateCondition.CurrentDeviceView(flMain, deviceinof, true);
};
///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
var devicestatus = new Button
{
- Width = Application.GetRealWidth(400),
- Height = Application.GetRealHeight(130),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(400),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ X = Application.GetRealWidth(1080 - 340),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddChidren(devicestatus);
+ conditionsowLayout.AddChidren(devicestatus);
switch (deviceinof.Type)
{
case DeviceType.OnOffOutput:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
if (conditions["AttriButeId"] == "0")
{
if (conditions["AttriButeData1"] == "1")
@@ -596,7 +512,6 @@
{
var iASZonedevice = deviceinof as IASZone;
var intvalue = conditions["AttriButeData1"];
- conditionIcon.UnSelectedImagePath = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
switch (iASZonedevice.IasDeviceType)
{
case 13:
@@ -607,56 +522,36 @@
}
else
{
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (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);
- }
+ devicestatus.TextID = MyInternationalizationString.unmanned;
}
}
break;
case 21:
- case 22:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.logicopen;
}
else
{
- if (conditions.ContainsKey("IgnoreTime"))
- {
-
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
- {
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- else
- {
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
- }
-
- }
- else
- {
- devicestatus.TextID = MyInternationalizationString.logicclose;
- }
+ devicestatus.TextID = MyInternationalizationString.logicclose;
+ }
+ }
+ break;
+ case 22:
+ {
+ if (intvalue == "1")
+ {
+ devicestatus.TextID = MyInternationalizationString.logicopen;
+ }
+ else
+ {
+ devicestatus.TextID = MyInternationalizationString.logicclose;
}
}
break;
case 40:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.smokescreen;
@@ -666,7 +561,6 @@
break;
case 42:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.waterleakage;
@@ -679,7 +573,6 @@
break;
case 43:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.gas;
@@ -689,7 +582,6 @@
break;
case 277:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -699,7 +591,6 @@
break;
default:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -712,45 +603,23 @@
break;
case DeviceType.OnOffSwitch:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/panel.png";
devicestatus.Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + conditions["Epoint"];
- }
- break;
- case DeviceType.DoorLock:
- {
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
- for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
- {
- if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
- {
- if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
- {
- devicestatus.Text = conditions["Account"];
- break;
-
- }
- }
-
- }
- }
- break;
- case DeviceType.TemperatureSensor:
- // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
- var dev = deviceinof as TemperatureSensor;
- if (conditions["Cluster_ID"]=="1026") {
- dev.SensorDiv = 1;
- } else {
- dev.SensorDiv = 2;
- }
- if (conditions["Cluster_ID"] == "1026")
- {
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
- devicestatus.Text = ">" + conditions["AttriButeData1"] + "鈩�";
- }
- else
- {
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
- devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
+ //if (conditions["Epoint"] == "1")
+ //{
+ // devicestatus.TextID = MyInternationalizationString.button1;
+ //}
+ //else if (conditions["Epoint"] == "2")
+ //{
+ // devicestatus.TextID = MyInternationalizationString.button2;
+ //}
+ //else if (conditions["Epoint"] == "3")
+ //{
+ // devicestatus.TextID = MyInternationalizationString.button3;
+ //}
+ //else if (conditions["Epoint"] == "4")
+ //{
+ // devicestatus.TextID = MyInternationalizationString.button4;
+ //}
}
break;
@@ -768,6 +637,7 @@
///鏄剧ず閫昏緫鍚嶇О
var btnlogic = new Button
{
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(700),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
@@ -775,16 +645,16 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
//TextColor = 0xff121212,
};
- conditionsRowLayout.AddChidren(btnlogic);
+ conditionsowLayout.AddChidren(btnlogic);
var logicedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(logicedit);
+ conditionsowLayout.AddRightView(logicedit);
logicedit.MouseUpEventHandler += (sender, e) =>
{
var selectedLogicStatus = new SelectedLogicStatus();
@@ -798,13 +668,14 @@
var logicstatus = new Button
{
Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(130),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
+ //TextColor = 0xff121212,
+ X = Application.GetRealWidth(1080 - 330),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(500),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
};
- conditionsRowLayout.AddChidren(logicstatus);
+ conditionsowLayout.AddChidren(logicstatus);
if (conditions["IsValid"] == "1")
{
@@ -820,6 +691,7 @@
{
var btnsecurity = new Button
{
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(700),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
@@ -828,16 +700,16 @@
//TextColor = 0xff121212,
TextID = MyInternationalizationString.security,
};
- //conditionsRowLayout.AddChidren(btnsecurity);
+ conditionsowLayout.AddChidren(btnsecurity);
var btnsecurityedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(btnsecurityedit);
+ conditionsowLayout.AddRightView(btnsecurityedit);
btnsecurityedit.MouseUpEventHandler += (sender, e) =>
{
//var securityPage = new SecurityPage();
@@ -854,33 +726,22 @@
///鏄剧ず瀹夐槻鏉′欢鐘舵�佹帶浠�
var securitystatus = new Button
{
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(130),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextAlignment = TextAlignment.CenterRight,
+ X = Application.GetRealWidth(1080 - 330),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddChidren(securitystatus);
+ conditionsowLayout.AddChidren(securitystatus);
if (conditions["EnOrWithdrawMode"] == "1")
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
}
else
{
- if (conditions["ModeId"] == "1")
- {
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
- securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
-
- }
- else
- {
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
- securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
-
- }
+ securitystatus.Text = Language.StringByID(MyInternationalizationString.defence);
}
}
break;
@@ -888,6 +749,7 @@
{
var btnlocation = new Button
{
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(700),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
@@ -896,16 +758,16 @@
//TextColor = 0xff121212,
TextID = MyInternationalizationString.geographicalposition,
};
- conditionsRowLayout.AddChidren(btnlocation);
+ conditionsowLayout.AddChidren(btnlocation);
var btnlocationedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddRightView(btnlocationedit);
+ conditionsowLayout.AddRightView(btnlocationedit);
btnlocationedit.MouseUpEventHandler += (sender, e) =>
{
@@ -917,26 +779,21 @@
var locationstatus = new Button
{
Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(130),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(500),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ X = Application.GetRealWidth(1080 - 330),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
- conditionsRowLayout.AddChidren(locationstatus);
- foreach (var radius in Common.Logic.CurrentLogic.Accounts)
+ conditionsowLayout.AddChidren(locationstatus);
+
+ if (conditions["AtHome"] == "1")
{
- if (radius["Type"] == "7")
- {
- if (conditions["AtHome"] == "1")
- {
- locationstatus.Text = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + "绫�";
- }
- else
- {
- locationstatus.Text = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + "绫�";
- }
- }
+ locationstatus.Text = Language.StringByID(MyInternationalizationString.athome);
+ }
+ else
+ {
+ locationstatus.Text = Language.StringByID(MyInternationalizationString.leavehome);
}
}
break;
@@ -945,10 +802,10 @@
///鍒犻櫎鎺т欢
var del = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicDelBackgroundColor,
Text = Language.StringByID(MyInternationalizationString.del),
};
- conditionsRowLayout.AddRightView(del);
+ conditionsowLayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
@@ -977,59 +834,38 @@
#endregion
#region ----鏄剧ず鎵ц鐩爣----
-
- var targetFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(targetFrameLayout);
-
-
var targetRowLayout = new RowLayout
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ Height = Application.GetRealHeight(150),
+ // BackgroundColor = 0xff323232,
};
- targetFrameLayout.AddChidren(targetRowLayout);
+ middle.AddChidren(targetRowLayout);
var btntargettitle = new Button
{
-
- Text = Language.StringByID(MyInternationalizationString.execute),
+ //Text = "灏辨墽琛�",
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ X = Application.GetRealWidth(40),
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+ Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
TextSize = 16,
- Gravity = Gravity.CenterVertical,
+ TextID = MyInternationalizationString.execute,
};
targetRowLayout.AddChidren(btntargettitle);
- var btntargetadd1 = new Button
- {
-
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(57),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(965+58),
- };
- targetFrameLayout.AddChidren(btntargetadd1);
-
var btntargetadd = new Button
{
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(100),
UnSelectedImagePath = "ZigeeLogic/add.png",
- X = Application.GetRealWidth(965 - 58),
+ X = Application.GetRealWidth(1080 - 140),
Gravity = Gravity.CenterVertical,
};
targetRowLayout.AddChidren(btntargetadd);
- EventHandler<MouseEventArgs> btntargetaddclick = (sender, e) =>
+ btntargetadd.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var deviceTarget = new DeviceTarget();
@@ -1037,13 +873,55 @@
UserView.HomePage.Instance.PageIndex += 1;
deviceTarget.Show();
};
- btntargetadd1.MouseUpEventHandler += btntargetaddclick;
- btntargetadd.MouseUpEventHandler += btntargetaddclick;
+
List<Dictionary<string, object>> ListActions = new List<Dictionary<string, object>>();
ListActions.Clear();
ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
- ListActions.Add(new Dictionary<string, object>());
+ //ListActions.Add(new Dictionary<string, object>());
+ ListActions.Add(new Dictionary<string, object>() { ["LinkType"] = "11" });
+ bool tag = false;
+ for (int i = 0; i < ListActions.Count; i++)
+ {
+ var linkType = ListActions[i]["LinkType"].ToString();
+ if (linkType == "10")
+ {
+ if (ListActions[i + 1]["LinkType"].ToString() == "0")
+ {
+ var delaytime = ListActions[i]["DelayTime"].ToString();
+ if (ListActions[i + 1].ContainsKey("Time"))
+ {
+ ListActions[i + 1].Remove("Time");
+ }
+ ListActions[i + 1].Add("Time", delaytime);
+ }
+ tag = true;
+ //break;
+ }
+
+ }
+
+ if (!tag)
+ {
+ for (int i = 0; i < ListActions.Count; i++)
+ {
+ var linkType = ListActions[i]["LinkType"].ToString();
+ if (linkType == "0")
+ {
+ var second = ListActions[i]["Time"].ToString();
+ if (second != "0")
+ {
+ Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 10);
+ actionsInfo.Add("DelayTime", second);
+ ListActions.Insert(i, actionsInfo);
+ }
+
+ }
+
+ }
+ }
+
for (int i = 0; i < ListActions.Count; i++)
{
@@ -1052,32 +930,23 @@
var addfl = new FrameLayout
{
- Height = Application.GetRealHeight(160 + 30 + 50),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Height = Application.GetRealHeight(160),
};
middle.AddChidren(addfl);
var addbtn = new Button
{
- Height = Application.GetRealHeight(130 + 50),
- Width = Application.GetRealWidth(908),
- Y = Application.GetRealHeight(30),
- X = Application.GetRealWidth(86),
- UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+ Height = Application.GetRealHeight(120),
+ Width = Application.GetRealWidth(1000),
+ X = Application.GetRealWidth(40),
+ Y = Application.GetRealHeight(40),
+ Radius = (uint)Application.GetRealHeight(30),
+ //Text = "娣诲姞鍔熻兘",
+ BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextID = MyInternationalizationString.addfunction,
};
addfl.AddChidren(addbtn);
-
-
- var addtextbtn = new Button
- {
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(300),
- Y = Application.GetRealHeight(45 + 30),
- TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- TextID = MyInternationalizationString.addfunction,
- X = Application.GetRealWidth(390),
- };
- addfl.AddChidren(addtextbtn);
- EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
+ addbtn.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var deviceTarget = new DeviceTarget();
@@ -1085,49 +954,67 @@
UserView.HomePage.Instance.PageIndex += 1;
deviceTarget.Show();
};
- addbtn.MouseUpEventHandler += addfunctionclick;
- addtextbtn.MouseUpEventHandler += addfunctionclick;
}
else
{
-
- var devicesFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(130),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(devicesFrameLayout);
-
- ///鏄剧ず鍥炬爣
- var actionsIcon = new Button
- {
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- X = Application.GetRealWidth(104),
- Y = Application.GetRealHeight(25),
- // UnSelectedImagePath = "ZigeeLogic/time.png",
-
- };
- devicesFrameLayout.AddChidren(actionsIcon);
-
-
var actionsrowLayout = new RowLayout
{
- Width = Application.GetRealWidth(800),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(222),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ Height = Application.GetRealHeight(160),
};
- devicesFrameLayout.AddChidren(actionsrowLayout);
-
+ middle.AddChidren(actionsrowLayout);
var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
var actions = ListActions[i];
switch (linkType)
{
+ case 10:
+ {
+ var delaytime = actions["DelayTime"].ToString();
+
+ var btnDelayTime = new Button
+ {
+ X = Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(382),
+ Height = Application.GetRealHeight(80),
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = delaytime,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ };
+ actionsrowLayout.AddChidren(btnDelayTime);
+
+ ///缂栬緫璁惧鐘舵�丅utton
+ var timeedit = new Button
+ {
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+ Text = Language.StringByID(MyInternationalizationString.edit),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ };
+ actionsrowLayout.AddRightView(timeedit);
+ timeedit.MouseUpEventHandler += (sender, e) =>
+ {
+ DeviceTarget.DelayTimeView(actions);
+ };
+
+ //if (tag)
+ //{
+ // if (ListActions[i + 1]["LinkType"].ToString() == "0")
+ // {
+ // if (ListActions[i + 1].ContainsKey("Time"))
+ // {
+ // ListActions[i + 1].Remove("Time");
+ // }
+ // ListActions[i + 1].Add("Time", delaytime);
+ // ///绉婚櫎鏃ф暟鎹啀娣诲姞鏂版暟鎹�
+ // //Common.Logic.CurrentLogic.Actions.RemoveAt(i+1);
+ // //Common.Logic.CurrentLogic.Actions.Insert(i + 1, Common.Logic.CurrentLogic.Actions[i + 1]);
+ // }
+ //}
+ }
+ break;
case 0:
{
+
var obj1 = actions["DeviceAddr"].ToString();
var obj2 = actions["Epoint"].ToString();
var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return ((obj.DeviceAddr == obj1) && (obj.DeviceEpoint.ToString() == obj2)); });
@@ -1136,12 +1023,21 @@
continue;
}
+ if (i != 0 && ListActions[i - 1]["LinkType"].ToString() != "10")
+ {
+ if (ListActions[i].ContainsKey("Time"))
+ {
+ ListActions[i].Remove("Time");
+ }
+ ListActions[i].Add("Time", 0);
+ }
+
///璁惧鍚嶇ОButton
var btndevicename = new Button
{
- Y = Application.GetRealHeight(20),
- Height = Application.GetRealHeight(50),
- Width = Application.GetRealWidth(450),
+ X = Application.GetRealWidth(40),
+ Width = Application.GetRealWidth(382),
+ Height = Application.GetRealHeight(80),
TextAlignment = TextAlignment.CenterLeft,
Text = deviceinof.DeviceEpointName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -1151,12 +1047,13 @@
///鍖哄煙(鎴块棿)鍚嶇ОButton
var btnregionname = new Button
{
- Y = btndevicename.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(450),
+ X = Application.GetRealWidth(40),
+ Y = Application.GetRealHeight(80),
+ Width = Application.GetRealWidth(382),
TextAlignment = TextAlignment.CenterLeft,
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(80),
Text = "",//Language.StringByID(MyInternationalizationString.customroom),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
};
actionsrowLayout.AddChidren(btnregionname);
///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
@@ -1164,27 +1061,34 @@
///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
var devicestatus = new Button
{
- Width = Application.GetRealWidth(350),
- Height = Application.GetRealHeight(130),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(450),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ X = Application.GetRealWidth(1080 - 340),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
actionsrowLayout.AddChidren(devicestatus);
///缂栬緫璁惧鐘舵�丅utton
var deviceedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
actionsrowLayout.AddRightView(deviceedit);
///缂栬緫鐐瑰嚮浜嬩欢
deviceedit.MouseUpEventHandler += (sender, e) =>
{
+ //var deviceStatePage = new DeviceStatePage();
+ //UserView.HomePage.Instance.AddChidren(deviceStatePage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //deviceStatePage.IsDeviceEditor = true;
+ //deviceStatePage.Show(deviceinof);
+
+ //ActionModifyDeviceStateView(deviceinof);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
@@ -1195,8 +1099,6 @@
{
case DeviceType.OnOffOutput:
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
-
var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
if (TaskList == null)
{
@@ -1206,20 +1108,13 @@
{
if (status["TaskType"].ToString() == "1")
{
- if (status["Data1"].ToString() == "0")
+ if (status["Data1"].ToString() == "1")
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
}
- else if (status["Data1"].ToString() == "1")
+ else
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
-
- }
- else if (status["Data1"].ToString() == "2")
- {
-
- devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
}
}
@@ -1229,7 +1124,6 @@
break;
case DeviceType.DimmableLight:
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
if (TaskList == null)
{
@@ -1245,14 +1139,13 @@
}
else if (status["TaskType"].ToString() == "1")
{
-
- if (status["Data1"].ToString() == "0")
+ if (status["Data1"].ToString() == "1")
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
}
- else if (status["Data1"].ToString() == "2")
+ else
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
}
}
@@ -1263,7 +1156,6 @@
break;
case DeviceType.WindowCoveringDevice:
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/curtain.png";
var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
if (TaskList == null)
{
@@ -1275,161 +1167,17 @@
{
if (status["Data1"] == "0")
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
}
else if (status["Data1"] == "1")
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+ devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
}
else if (status["Data1"] == "5")
{
- devicestatus.Text = status["Data2"] + "%";
+ devicestatus.Text = devicestatus.Text + status["Data2"] + "%";
}
}
-
- }
- }
- break;
- case DeviceType.AirSwitch:
- {
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
-
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- foreach (var status in TaskList)
- {
- if (status["TaskType"].ToString() == "1")
- {
- if (status["Data1"].ToString() == "0")
- {
- devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
- }
- else if (status["Data1"].ToString() == "1")
- {
- devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
-
- }
- else if (status["Data1"].ToString() == "2")
- {
-
- devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
- }
- }
-
- }
-
- }
- break;
- case DeviceType.Thermostat:
- {
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/ac.png";
-
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- string modetext = "", temperaturetext="", speedtext = "";
- bool ifclose = false;
- foreach (var status in TaskList)
- {
- if (status["TaskType"].ToString() == "1")
- {
- if (status["Data1"].ToString() == "0")
- {
- // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
- ifclose = false;
- }
- else if (status["Data1"].ToString() == "1")
- {
- //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
- ifclose = true;
- }
-
- }
- else if (status["TaskType"].ToString() == "5")
- {
- if (status["Data1"] == "3")
- {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
- switch (status["Data2"])
- {
- case "3":
- {
- modetext = Language.StringByID(MyInternationalizationString.logiccool);
- }
- break;
- case "4":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicheat);
- }
- break;
- case "1":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicauto);
- }
- break;
- case "8":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicdry);
- }
- break;
- case "7":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
- }
- break;
- }
- }
- else if (status["Data1"] == "6")
- {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
- switch (status["Data2"])
- {
- case "1":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logiclow);
- }
- break;
-
- case "2":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
- }
- break;
- case "3":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logichigh);
- }
- break;
-
- }
- }
- //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
- else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
- {
- var s = int.Parse(status["Data2"]) /100;
- temperaturetext = s.ToString();
- }
- else if (status["Data1"] == "20")
- {
- temperaturetext = "鏃�";
- }
-
-
- }
-
- }
- if (ifclose)
- {
- devicestatus.Text = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
- }
- else
- {
- devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
}
}
@@ -1448,37 +1196,18 @@
{
continue;
}
-
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/scene.png";
- ///璁惧鍚嶇ОButton
- var btndevicename = new Button
+ ///鏄剧ず閫昏緫鍚嶇О
+ var btnlogic = new Button
{
- Y = Application.GetRealHeight(20),
- Height = Application.GetRealHeight(50),
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
+ Gravity = Gravity.CenterVertical,
Text = sceneinof.Name,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ //TextColor = 0xff121212,
};
- actionsrowLayout.AddChidren(btndevicename);
-
- ///鍖哄煙(鎴块棿)鍚嶇ОButton
- var btnregionname = new Button
- {
- Y = btndevicename.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(500),
- TextAlignment = TextAlignment.CenterLeft,
- Height = Application.GetRealHeight(50),
- Text = "",//Language.StringByID(MyInternationalizationString.customroom),
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- };
- actionsrowLayout.AddChidren(btnregionname);
- /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
- Common.Room room = new Common.Room();
- btnregionname.Text = room.GetRoomNameBySceneId(sceneinof.Id);
- //Send.RoomNmae(btnregionname, deviceinof);
-
-
+ actionsrowLayout.AddChidren(btnlogic);
}
break;
@@ -1492,6 +1221,7 @@
///鏄剧ず閫昏緫鍚嶇О
var btnlogic = new Button
{
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
@@ -1504,9 +1234,9 @@
var logicedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
actionsrowLayout.AddRightView(logicedit);
logicedit.MouseUpEventHandler += (sender, e) =>
@@ -1545,6 +1275,7 @@
{
var btnsecurity = new Button
{
+ X = Application.GetRealWidth(40),
Width = Application.GetRealWidth(700),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
@@ -1552,14 +1283,14 @@
//TextColor = 0xff121212,
TextID = MyInternationalizationString.security,
};
- //actionsrowLayout.AddChidren(btnsecurity);
+ actionsrowLayout.AddChidren(btnsecurity);
var btnsecurityedit = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
actionsrowLayout.AddRightView(btnsecurityedit);
btnsecurityedit.MouseUpEventHandler += (sender, e) =>
@@ -1574,11 +1305,13 @@
///鏄剧ず瀹夐槻鏉′欢鐘舵�佹帶浠�
var securitystatus = new Button
{
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(130),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(160),
Gravity = Gravity.CenterVertical,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ //TextColor = 0xff121212,
+ X = Application.GetRealWidth(1080 - 330),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.CenterRight,
};
actionsrowLayout.AddChidren(securitystatus);
@@ -1587,12 +1320,11 @@
{
if (actions["Password"].ToString() == "888888")
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
+
securitystatus.Text = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
}
else
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
}
@@ -1601,77 +1333,22 @@
{
if (actions["SecurityModeId"].ToString() == "1")
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
+
securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
}
else if (actions["SecurityModeId"].ToString() == "2")
{
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
}
}
}
break;
- case 7:
- {
- var delaytimevalue = int.Parse(actions["DelayTime"].ToString());
- var Minutes = delaytimevalue / 60;
- var seconds = delaytimevalue % 60;
-
- actionsIcon.UnSelectedImagePath = "ZigeeLogic/delay.png";
- ///寤舵椂Button
- var delaytimeBtn = new Button
- {
- Width = Application.GetRealWidth(500),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- };
- actionsrowLayout.AddChidren(delaytimeBtn);
- if (Minutes != 0)
- {
- if (seconds == 0)
- {
- delaytimeBtn.Text = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute);
- }
- else
- {
- delaytimeBtn.Text = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute) + seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
-
- }
- }
- else
- {
- delaytimeBtn.Text = seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
- }
-
-
- ///寤舵椂缂栬緫Button
- var delaytimeedit = new Button
- {
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
- Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- Tag = i,
- };
- actionsrowLayout.AddRightView(delaytimeedit);
-
- ///缂栬緫鐐瑰嚮浜嬩欢
- delaytimeedit.MouseUpEventHandler += (sender, e) =>
- {
- var delayTime = new DelayTime();
- UserView.HomePage.Instance.AddChidren(delayTime);
- UserView.HomePage.Instance.PageIndex += 1;
- delayTime.Show(int.Parse(delaytimeedit.Tag.ToString()), true);
- };
-
- };
- break;
}
///鍒犻櫎鎺т欢
var del = new Button
{
- BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+ BackgroundColor = ZigbeeColor.Current.LogicDelBackgroundColor,
Text = Language.StringByID(MyInternationalizationString.del),
};
actionsrowLayout.AddRightView(del);
@@ -1700,173 +1377,98 @@
#endregion
- #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
-
- var fraline1 = new FrameLayout
+ #region ----鎺ㄩ�佽缃�----
+ /*
+ var pushRowLayout = new RowLayout
{
- Height = Application.GetRealHeight(30),
+ Height = Application.GetRealHeight(150),
};
- middle.AddChidren(fraline1);
-
-
- var weekFrameLayout = new FrameLayout
+ middle.AddChidren(pushRowLayout);
+
+ var btnpushtitle = new Button
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(weekFrameLayout);
- var weekRowLayout = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- weekFrameLayout.AddChidren(weekRowLayout);
-
- var settxet = new Button
- {
- Text = Language.StringByID(MyInternationalizationString.setupcycle),
+ //Text = "鎺ㄩ�佽缃�",
+ //TextSize = 16,
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ X = Application.GetRealWidth(40),
+ //Gravity = Gravity.CenterVertical,
+ TextID = MyInternationalizationString.pushset,
+ TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+ Y = Application.GetRealHeight(90),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
- Gravity = Gravity.CenterVertical,
+ TextSize = 16,
+ //TextID = MyInternationalizationString.execute,
};
- weekRowLayout.AddChidren(settxet);
- var btnweektext = new Button
- {
- Width = Application.GetRealWidth(595),
- Height = Application.GetRealHeight(60),
- TextAlignment = TextAlignment.CenterRight,
- //Text = "姣忓ぉ",
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- TextID = MyInternationalizationString.everyday,
- Y = Application.GetRealHeight(35),
- X = settxet.Right,
- };
- weekRowLayout.AddChidren(btnweektext);
-
- var nextBtn = new Button
- {
-
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- X = Application.GetRealWidth(965 - 58),
- Gravity = Gravity.CenterVertical,
-
- };
- weekRowLayout.AddChidren(nextBtn);
-
- UpdateWeek(btnweektext);
- EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
- {
- /*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
- var cycle = new Cycle(() => { UpdateWeek(btnweektext); });
- UserView.HomePage.Instance.AddChidren(cycle);
- UserView.HomePage.Instance.PageIndex += 1;
- cycle.Show();
-
- //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
- //UserView.HomePage.Instance.AddChidren(cyclicCycle);
- //UserView.HomePage.Instance.PageIndex += 1;
- //cyclicCycle.Show();
- };
- btnweektext.MouseUpEventHandler += cycleclick;
- nextBtn.MouseUpEventHandler += cycleclick;
- #endregion
-
- #region ----鎺ㄩ�佽缃�----
-
- var pushFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(pushFrameLayout);
-
+ pushRowLayout.AddChidren(btnpushtitle);
+
var pushswitchRowlayout = new RowLayout
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ Height = Application.GetRealHeight(160),
+ LineColor = ZigbeeColor.Current.LogicLineColor,
};
- pushFrameLayout.AddChidren(pushswitchRowlayout);
-
+ middle.AddChidren(pushswitchRowlayout);
+
var btnswitchtxet = new Button
{
+ //Text = "鎺ㄩ�佸紑鍏�",
+ X = Application.GetRealWidth(40),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterVertical,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextID = MyInternationalizationString.pushswitch,
};
pushswitchRowlayout.AddChidren(btnswitchtxet);
-
+
var btnswitch = new Button
{
- Width = Application.GetMinRealAverage(104),
- Height = Application.GetMinRealAverage(63),
- UnSelectedImagePath = "ZigeeLogic/logicclose.png",
- SelectedImagePath = "ZigeeLogic/logicopen.png",
- X = Application.GetRealWidth(965 - 104),
+ Width = Application.GetMinRealAverage(183),
+ Height = Application.GetMinRealAverage(123),
+ UnSelectedImagePath = "ZigeeLogic/Switch.png",
+ SelectedImagePath = "ZigeeLogic/SwitchSelected.png",
+ X = Application.GetRealWidth(1080 - 200),
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),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(custompushFrameLayout);
-
+
var custompushRowLayout = new RowLayout
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(965),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Height = Application.GetRealHeight(160),
};
- custompushFrameLayout.AddChidren(custompushRowLayout);
-
+ middle.AddChidren(custompushRowLayout);
+
var btncustompush = new Button
{
TextID = MyInternationalizationString.custompush,
+ //Text = "鑷畾涔夋帹閫�",
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(60),
- Gravity = Gravity.CenterVertical,
+ X = Application.GetRealWidth(40),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
custompushRowLayout.AddChidren(btncustompush);
-
-
+
+
var custompushback = new Button
{
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(110),
+ Height = Application.GetRealHeight(110),
UnSelectedImagePath = "ZigeeLogic/next.png",
- X = Application.GetRealWidth(965 - 58),
+ SelectedImagePath = "ZigeeLogic/NextSelecte.png",
+ X = Application.GetRealWidth(1080 - 140),
Gravity = Gravity.CenterVertical,
};
custompushRowLayout.AddChidren(custompushback);
@@ -1876,41 +1478,34 @@
UserView.HomePage.Instance.AddChidren(CustomText);
UserView.HomePage.Instance.PageIndex += 1;
CustomText.Show();
-
+
};
btncustompush.MouseUpEventHandler += customclick;
custompushback.MouseUpEventHandler += customclick;
custompushRowLayout.MouseUpEventHandler += customclick;
-
+ */
#endregion
- var saveFrameLayout = new FrameLayout
- {
- Y = middle.Bottom,
- Height = Application.GetRealHeight(180),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
- this.AddChidren(saveFrameLayout);
-
var btnsave = new Button
{
- X = Application.GetRealWidth(85),
- Height = Application.GetRealHeight(130),//194
- Width = Application.GetRealWidth(910),
- Radius = (uint)Application.GetRealHeight(60),
- BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+ Height = Application.GetRealHeight(150),//194
+ Y = middle.Bottom + Application.GetRealHeight(15),
+ //Text = "淇濆瓨",
+ Width = Application.GetRealWidth(500),
+ Radius = (uint)Application.GetRealHeight(50),
+ BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
+ X = Application.GetRealWidth(290),
TextID = MyInternationalizationString.Save,
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
- saveFrameLayout.AddChidren(btnsave);
+ if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
+ {
+ AddChidren(btnsave);
+ }
btnsave.MouseUpEventHandler += async (sender, e) =>
{
var name = logicTextBox.Text.Trim();
- //if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
- //{
- // AddChidren(btnsave);
- //}
+
if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
{
new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
@@ -1977,23 +1572,41 @@
case 3:
{
- string len = "", value = "";
+ string len = "";
+ int maxvalue = 0, minvalue = 0;
var stringvalue = Convert.ToString(Common.Logic.CurrentLogic.TimeAttribute.MonthDate, 2);
var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
for (int j = 31; j >= 0; j--)
{
len += str.Substring(j, 1);
}
+ //鎵惧嚭鏈�灏忓��
for (int j = 0; j < len.Length; j++)
{
var strvalue = len.Substring(j, 1);
if (strvalue == "1")
{
- value += (j + 1).ToString() + ",";
+ minvalue = j + 1;
+ break;
}
}
- btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
-
+ //鎵惧嚭鏈�澶у��
+ for (int j = 0; j < len.Length; j++)
+ {
+ var strvalue = len.Substring(j, 1);
+ if (strvalue == "1")
+ {
+ maxvalue = j + 1;
+ }
+ }
+ if (minvalue == maxvalue)
+ {
+ btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + minvalue.ToString() + Language.StringByID(MyInternationalizationString.day);
+ }
+ else
+ {
+ btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + minvalue.ToString() + Language.StringByID(MyInternationalizationString.day) + "-" + Language.StringByID(MyInternationalizationString.monthly) + maxvalue.ToString() + Language.StringByID(MyInternationalizationString.day);
+ }
}; break;
case 4:
{
@@ -2214,240 +1827,129 @@
}
- void ConditionView(bool edit)
+ void ConditionView()
{
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
-
- #region 缁勫悎鏉′欢View
- FrameLayout flMain = new FrameLayout { BackgroundColor = 0x50000000 };
- this.AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender2, e2) =>
+ if (Common.Logic.CurrentLogic.Conditions.Count == 1)
{
- flMain.RemoveFromParent();
- };
-
- var timetypeframelayout1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(timetypeframelayout1);
- var framelayout = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(530),
- Y = Application.GetRealHeight(1920 - 530),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
- };
- flMain.AddChidren(framelayout);
-
- #region -------鍙栨秷 瀹屾垚
- var timetype = new RowLayout
- {
- Height = Application.GetRealHeight(140),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- framelayout.AddChidren(timetype);
- var Btncancel = new Button
- {
- TextID = MyInternationalizationString.cancel,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- X = Application.GetRealWidth(80),
- TextAlignment = TextAlignment.CenterLeft,
- };
- timetype.AddChidren(Btncancel);
- Btncancel.MouseUpEventHandler += (sender16, e16) =>
- {
- flMain.RemoveFromParent();
- UserView.HomePage.Instance.ScrollEnabled = true;
- };
-
- var Btntitle = new Button
- {
- TextID = MyInternationalizationString.condition,
- TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(320),
- TextAlignment = TextAlignment.Center,
- X = Btncancel.Right + Application.GetRealWidth(100),
- TextSize = 16,
- };
- timetype.AddChidren(Btntitle);
- var Btncomplete = new Button
- {
- TextID = MyInternationalizationString.complete,
- TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterRight,
- X = Btntitle.Right + Application.GetRealWidth(100),
-
- };
- timetype.AddChidren(Btncomplete);
- #endregion
-
- #region -------婊¤冻鎵�鏈夋潯浠� 婊¤冻鍏朵腑涓�涓潯浠�
-
-
- #region -------婊¤冻鎵�鏈夋潯浠�
-
-
- var andFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- Y = timetype.Bottom + Application.GetRealHeight(20),
- };
- framelayout.AddChidren(andFrameLayout);
-
-
- var androw = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- andFrameLayout.AddChidren(androw);
- var andbtn = new Button
- {
-
- Width = Application.GetRealWidth(600),
- TextID = MyInternationalizationString.Allconditions,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
-
- };
- androw.AddChidren(andbtn);
-
- var andSelected = new SelectedButton();
- androw.AddChidren(andSelected);
- #endregion
- #region -------婊¤冻鍏朵腑涓�涓潯浠�
-
- var orFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- Y = andFrameLayout.Bottom,
-
- };
- framelayout.AddChidren(orFrameLayout);
-
-
-
- var orrow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- orFrameLayout.AddChidren(orrow);
- var orbtn = new Button
- {
-
- Width = Application.GetRealWidth(600),
- TextID = MyInternationalizationString.anycondition,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
- };
- orrow.AddChidren(orbtn);
-
- var orSelected = new SelectedButton();
- orrow.AddChidren(orSelected);
- #endregion
- ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
- EventHandler<MouseEventArgs> andclick = (sedner14, e14) =>
- {
- andSelected.Visible = true;
- orSelected.Visible = false;
- andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- };
- androw.MouseUpEventHandler += andclick;
- andbtn.MouseUpEventHandler += andclick;
- andSelected.MouseUpEventHandler += andclick;
- andFrameLayout.MouseUpEventHandler += andclick;
-
-
- ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
- EventHandler<MouseEventArgs> orclick = (sedner15, e15) =>
- {
- andSelected.Visible = false;
- orSelected.Visible = true;
- andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- };
- orrow.MouseUpEventHandler += orclick;
- orbtn.MouseUpEventHandler += orclick;
- orSelected.MouseUpEventHandler += orclick;
- orFrameLayout.MouseUpEventHandler += orclick;
-
- #endregion
- #endregion
-
- if (edit)
- {
- if (Common.Logic.CurrentLogic.Relationship == 0)
+ #region 缁勫悎鏉′欢View
+ FrameLayout flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+ this.AddChidren(flMain);
+ flMain.MouseUpEventHandler += (sender2, e2) =>
{
- andSelected.Visible = true;
- orSelected.Visible = false;
- andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- }
- else
- {
- andSelected.Visible = false;
- orSelected.Visible = true;
- andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- }
- }
- Btncomplete.MouseUpEventHandler += (sender, e) =>
- {
- if (!andSelected.Visible && !orSelected.Visible)
- {
- ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
- return;
- }
- flMain.RemoveFromParent();
+ flMain.RemoveFromParent();
+ };
- if (andSelected.Visible)
+ var frameLayout = new FrameLayout
{
+ Y = Application.GetRealHeight(1920 - 680 - 50),
+ Height = Application.GetRealHeight(680),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ Width = Application.GetRealWidth(1000),
+ X = Application.GetRealWidth(40),
+ Radius = (uint)Application.GetRealHeight(40),
+ };
+ flMain.AddChidren(frameLayout);
+
+ var titlerow = new FrameLayout
+ {
+ Height = Application.GetRealHeight(150),
+ };
+ frameLayout.AddChidren(titlerow);
+
+ var titlebtn = new Button
+ {
+ //Text = "璇烽�夋嫨澶氭潯浠剁粍鍚�",
+ TextID = MyInternationalizationString.multicondition,
+ TextSize = 16,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ };
+ titlerow.AddChidren(titlebtn);
+
+ var androw = new RowLayout
+ {
+ Height = Application.GetRealHeight(160),
+ Y = titlerow.Bottom,
+ };
+ frameLayout.AddChidren(androw);
+ var andbtn = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ TextID = MyInternationalizationString.Allconditions,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ //Text = "婊¤冻鍏ㄩ儴鏉′欢鏃�",
+ TextAlignment = TextAlignment.CenterLeft,
+ X = Application.GetRealHeight(50),
+ };
+ androw.AddChidren(andbtn);
+
+ var orrow = new RowLayout
+ {
+ Height = Application.GetRealHeight(160),
+ Y = androw.Bottom,
+ };
+ frameLayout.AddChidren(orrow);
+ var orbtn = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ TextID = MyInternationalizationString.anycondition,
+ //Text = "婊¤冻浠讳竴鏉′欢鏃�",
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ X = Application.GetRealHeight(50)
+ };
+ orrow.AddChidren(orbtn);
+
+ var cancelbtn = new Button
+ {
+ TextID = MyInternationalizationString.cancel,
+ TextSize = 16,
+ Y = orrow.Bottom + Application.GetRealHeight(30),
+ Height = Application.GetRealHeight(160),
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+ };
+ frameLayout.AddChidren(cancelbtn);
+ cancelbtn.MouseUpEventHandler += (sender4, e4) =>
+ {
+ flMain.RemoveFromParent();
+ };
+ #endregion
+
+ //婊¤冻鍏ㄩ儴鏉′欢鏃剁偣鍑讳簨浠� simulation;
+ EventHandler<MouseEventArgs> andclick = (sender6, e6) =>
+ {
+ flMain.RemoveFromParent();
Common.Logic.CurrentLogic.Relationship = 0;
-
- }
- if (orSelected.Visible)
- {
- Common.Logic.CurrentLogic.Relationship = 1;
-
- }
- if (edit)
- {
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- }
- else
- {
var addLogicPage = new AddLogicPage();
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- }
- };
+ };
+ androw.MouseUpEventHandler += andclick;
+ andbtn.MouseUpEventHandler += andclick;
+ //婊¤冻浠讳竴鏉′欢鏃剁偣鍑讳簨浠�
+ EventHandler<MouseEventArgs> orclick = (sender6, e6) =>
+ {
+ flMain.RemoveFromParent();
+ Common.Logic.CurrentLogic.Relationship = 1;
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ };
+ orrow.MouseUpEventHandler += orclick;
+ orbtn.MouseUpEventHandler += orclick;
+ }
+ else
+ {
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
}
+
}
}
--
Gitblit v1.8.0