From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 163 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 116 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 6f80b9b..cb02f21 100755
--- 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 -------鐣岄潰甯冨眬閮ㄥ垎
//涓嶈褰撳墠鐣岄潰婊戝姩
@@ -59,10 +59,10 @@
};
var horizontalSeekBarVol = new DiyImageSeekBar
{
- //Y = openView.frameLayout.Bottom,
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(915),
- Height = Application.GetRealHeight(160),//婊戝姩鏉＄埗鎺т欢楂樺害
+ //Y = openView.frameLayout.Bottom,//杩涘害鏉＄埗鎺т欢Y鍧愭爣
+ X = Application.GetRealWidth(80),//杩涘害鏉鍧愭爣
+ Width = Application.GetRealWidth(915),//杩涘害鏉＄殑闀垮害
+ Height = Application.GetRealHeight(160),//杩涘害鏉＄埗鎺т欢楂樺害
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
@@ -99,33 +99,49 @@
{
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;
- }
}
}
+ //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
{
- 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>>;
}
}
+ //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
@@ -298,7 +314,7 @@
Send.dictionary(deviceConditionsInfo, "AttriButeId", "1281");
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
- int timevalue = 0;
+ int timeValue = 0;
///鐐瑰嚮纭浜嬩欢
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -307,7 +323,7 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openView.selectedIconBtn.Visible = true;
closeView.selectedIconBtn.Visible = false;
- if (iASZonedevice.IasDeviceType == 13)
+ if (iASZonedevice.IasDeviceType == 13||iASZonedevice.IasDeviceType == 541)
{
closeView.selectedIconBtn.Visible = true;
}
@@ -324,20 +340,15 @@
closeView.selectedIconBtn.Visible = true;
Send.dictionary(deviceConditionsInfo, "Range", "1");
Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
- if (iASZonedevice.IasDeviceType == 13)
+ if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- openView.selectedIconBtn.Visible = false;
- closeView.selectedIconBtn.Visible = true;
var ignoreTime = new IgnoreTime();
UserView.HomePage.Instance.AddChidren(ignoreTime);
UserView.HomePage.Instance.PageIndex += 1;
- ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue, _if[1]);
+ ignoreTime.Show(common, closeView.titleBtn.Text, edit, timeValue, _if[1]);
}
-
-
};
switch (iASZonedevice.IasDeviceType)
@@ -357,18 +368,18 @@
case 22:
{
#region
+ var view = completeView.Show(3);
openView.titleBtn.TextID = MyInternationalizationString.logicopen;
closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
- completeView.Show(3).AddChidren(openView.Show());
- completeView.Show(3).AddChidren(closeView.Show());
+ view.AddChidren(openView.Show());
+ view.AddChidren(closeView.Show());
- mFunView timeoutView = new mFunView();
- timeoutView.frameLayout.Y = closeView.frameLayout.Bottom;
- timeoutView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- completeView.Show(3).AddChidren(timeoutView.Show());
- timeoutView.titleBtn.TextID = MyInternationalizationString.closetimeout;
- timeoutView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- timeoutView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ takebackView.selectedIconBtn.Visible = true;
+ takebackView.titleBtn.TextID = MyInternationalizationString.closetimeout;
+ takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ view.AddChidren(takebackView.Show());
+ takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
SelectedDeviceStatus = "";
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -378,7 +389,7 @@
var ignoreTime = new IgnoreTime();
UserView.HomePage.Instance.AddChidren(ignoreTime);
UserView.HomePage.Instance.PageIndex += 1;
- ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue, _if[1]);
+ ignoreTime.Show(common, takebackView.titleBtn.Text, edit, timeValue, _if[1]);
};
@@ -424,6 +435,61 @@
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;
@@ -439,7 +505,7 @@
{
if (devices.ContainsKey("IgnoreTime"))
{
- timevalue = int.Parse(devices["IgnoreTime"]);
+ timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
@@ -462,8 +528,7 @@
}
-
-
+
}
}
@@ -1206,15 +1271,19 @@
}
break;
case DeviceType.ColorTemperatureLight: {
-
-
-
-
flMain.RemoveFromParent();
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