From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 196 +++++++++++++++++++++++++-----------------------
1 files changed, 102 insertions(+), 94 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index a98fa44..12e3973 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -12,7 +12,7 @@
/// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠舵垨鑰呯洰鏍囩殑瑙嗗浘鏂规硶
/// </summary>
/// <param name="common">Common.</param>
- public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str)
+ public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str,int intValue)
{
#region -------鐣岄潰甯冨眬閮ㄥ垎
//涓嶈褰撳墠鐣岄潰婊戝姩
@@ -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;
}
@@ -69,8 +69,9 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
- SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉＄殑楂樺害10
+ SeekBarPadding = 30,
};
#endregion
#endregion
@@ -99,33 +100,28 @@
{
if (_if[0]== "condition")
{
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
+ var deviceinfo = Common.Logic.CurrentLogic.Conditions[intValue];
+ if (deviceinfo["Type"] == "1")
{
- if (deviceinfo["Type"] == "1")
+ if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
{
- if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
- {
- devices = deviceinfo;
- break;
+ devices = deviceinfo;
- }
}
}
}
else
{
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ var deviceinfo = Common.Logic.CurrentLogic.Actions[intValue];
+ if (deviceinfo["LinkType"].ToString() == "0")
{
- 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;
- }
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
+
}
}
#endregion
@@ -299,7 +295,6 @@
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
int timeValue = 0;
- int progressValue = 0;
///鐐瑰嚮纭浜嬩欢
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -308,12 +303,13 @@
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");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//鏀寔1鍜�2;1+2=3
};
///鐐瑰嚮鍙栨秷浜嬩欢
closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -323,8 +319,8 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
openView.selectedIconBtn.Visible = false;
closeView.selectedIconBtn.Visible = true;
- Send.dictionary(deviceConditionsInfo, "Range", "1");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+ Send.dictionary(deviceConditionsInfo, "Range", "8");//1
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
@@ -340,13 +336,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:
@@ -420,61 +477,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, progressValue, 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, progressValue, false);
-
- };
- }
- break;
default:
{
openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
@@ -488,13 +490,13 @@
{
if (devices["AttriButeId"] == "1281")
{
- if (devices.ContainsKey("IgnoreTime"))
+ if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
{
timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
- if (devices["AttriButeData1"] == "1")
+ if (devices["Range"]== "5")
{
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -513,10 +515,7 @@
}
- else if (devices["AttriButeId"] == "0")
- {
- progressValue = int.Parse(devices["AttriButeData1"]);
- }
+
}
}
@@ -531,7 +530,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) =>
{
@@ -1263,7 +1263,15 @@
var nightlight = new Nightlight();
UserView.HomePage.Instance.AddChidren(nightlight);
UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show(common, false, _if[1]);
+ if (edit)
+ {
+ nightlight.Show(common, edit, _if[1], Common.Logic.CurrentLogic.Actions[intValue]);
+ }
+ else
+ {
+ nightlight.Show(common, edit, _if[1]);
+ }
+
}
break;
}
--
Gitblit v1.8.0