From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 161 ++++++++++++++++++++++++-----------------------------
1 files changed, 74 insertions(+), 87 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index cb02f21..11d924f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -22,7 +22,7 @@
completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- if (!edit)
+ if (edit)
{
UserView.HomePage.Instance.ScrollEnabled = true;
}
@@ -108,17 +108,6 @@
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
- //{
- // if (deviceinfo["Type"] == "1")
- // {
- // if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
- // {
- // devices = deviceinfo;
- // break;
- // }
- // }
- //}
}
else
{
@@ -131,17 +120,7 @@
TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
- //foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
- //{
- // if (deviceinfo["LinkType"].ToString() == "0")
- // {
- // if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
- // {
- // TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
- // break;
- // }
- // }
- //}
+
}
}
#endregion
@@ -323,8 +302,9 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openView.selectedIconBtn.Visible = true;
closeView.selectedIconBtn.Visible = false;
- if (iASZonedevice.IasDeviceType == 13||iASZonedevice.IasDeviceType == 541)
+ if (iASZonedevice.IasDeviceType == 13)
{
+
closeView.selectedIconBtn.Visible = true;
}
Send.dictionary(deviceConditionsInfo, "Range", "5");
@@ -355,13 +335,74 @@
{
case 13:
{
- openView.titleBtn.TextID = MyInternationalizationString.someone;
- closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
- closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- closeView.selectedIconBtn.Visible = true;
- completeView.Show(2).AddChidren(openView.Show());
- completeView.Show(2).AddChidren(closeView.Show());
+
+ if (common.ModelIdentifier == "MSPIRB-ZB.10")
+ {
+ int _height = 3;
+ if (edit)
+ {
+ _height = 2;
+ }
+ var view = completeView.Show(_height);
+ openView.titleBtn.TextID = MyInternationalizationString.someone;
+ closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
+ closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ closeView.selectedIconBtn.Visible = true;
+ view.AddChidren(openView.Show());
+ view.AddChidren(closeView.Show());
+
+ takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ takebackView.selectedIconBtn.Visible = true;
+ takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
+ takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ if (edit)
+ {
+
+ if (devices["Cluster_ID"] == "1024")
+ {
+ flMain.RemoveFromParent();
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
+ }
+ else
+ {
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ }
+ }
+ else
+ {
+ view.AddChidren(takebackView.Show());
+
+ }
+
+
+ takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ SelectedDeviceStatus = "";
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ openView.selectedIconBtn.Visible = false;
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common, takebackView.titleBtn.Text, 0, false);
+
+ };
+
+ }
+ else
+ {
+
+ openView.titleBtn.TextID = MyInternationalizationString.someone;
+ closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ closeView.selectedIconBtn.Visible = true;
+ completeView.Show(2).AddChidren(openView.Show());
+ completeView.Show(2).AddChidren(closeView.Show());
+
+ }
}
break;
case 21:
@@ -435,61 +476,6 @@
completeView.Show(1).AddChidren(openView.Show());
}
break;
- case 541:
- {
- int _height = 3;
- if (edit)
- {
- _height = 2;
- }
- var view = completeView.Show(_height);
- openView.titleBtn.TextID = MyInternationalizationString.someone;
- closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
- closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- closeView.selectedIconBtn.Visible = true;
- view.AddChidren(openView.Show());
- view.AddChidren(closeView.Show());
-
- takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- takebackView.selectedIconBtn.Visible = true;
- takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
- takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- if (edit)
- {
-
- if (devices["Cluster_ID"] == "1024")
- {
- flMain.RemoveFromParent();
- var illumination = new Illumination();
- UserView.HomePage.Instance.AddChidren(illumination);
- UserView.HomePage.Instance.PageIndex += 1;
- illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
- }
- else
- {
- closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- }
- }
- else
- {
- view.AddChidren(takebackView.Show());
-
- }
-
-
- takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- SelectedDeviceStatus = "";
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- openView.selectedIconBtn.Visible = false;
- var illumination = new Illumination();
- UserView.HomePage.Instance.AddChidren(illumination);
- UserView.HomePage.Instance.PageIndex += 1;
- illumination.Show(common,takebackView.titleBtn.Text, 0, false);
-
- };
- }
- break;
default:
{
openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
@@ -543,7 +529,8 @@
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
completeView.Show(l).AddChidren(openView.Show());
- openView.titleBtn.Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
+ openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
+ //openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0