From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 230 ++++++++++++++++++++++++--------------------------------
1 files changed, 99 insertions(+), 131 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index ebc0789..7531f97 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -145,7 +145,7 @@
case 1:
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
- name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ name = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
@@ -171,134 +171,23 @@
case DeviceType.IASZone:
{
var iASZonedevice = deviceinof as IASZone;
- var intvalue = conditions["AttriButeData1"];
+ //var intvalue = conditions["AttriButeData1"];
+ string if_value = "5";
+ var intvalue = conditions["Range"];
icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
switch (iASZonedevice.IasDeviceType)
{
case 13:
{
- if (conditions.ContainsKey("IgnoreTime"))
+ if (conditions["Cluster_ID"] == "1024")
{
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
-
- }
+ state = Language.StringByID(MyInternationalizationString.ambientLight) + "<" + conditions["AttriButeData1"] + "lux" + Language.StringByID(MyInternationalizationString.hour1);
}
else
{
- state = Language.StringByID(MyInternationalizationString.someone);
- }
- }
- break;
- case 21:
- case 22:
- {
- if (conditions.ContainsKey("IgnoreTime"))
- {
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
-
- }
-
- }
- else
- {
- if (intvalue == "1")
- {
- state = Language.StringByID(MyInternationalizationString.logicopen);
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.logicclose);
- }
-
- }
-
- }
- break;
- case 40:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID(MyInternationalizationString.smokescreen);
- }
-
- }
- break;
- case 42:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.waterleakage);
- }
- else
- {
- state =Language.StringByID( MyInternationalizationString.noleakage);
- }
- }
- break;
- case 43:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.gas);
- }
-
- }
- break;
- case 277:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.callthepolice);
- }
-
- }
- break;
- case 541:
- {
- if (conditions["Cluster_ID"] == "1024") {
- state = Language.StringByID(MyInternationalizationString.ambientLight)+"<"+conditions["AttriButeData1"]+"lux"+ Language.StringByID(MyInternationalizationString.hour1);
- }
- else
- {
- if (conditions.ContainsKey("IgnoreTime"))
+ if (conditions.ContainsKey("IgnoreTime")&& conditions["IgnoreTime"]!="0")
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -329,9 +218,92 @@
}
}
break;
+ case 21:
+ case 22:
+ {
+
+ if (conditions.ContainsKey("IgnoreTime")&&conditions["IgnoreTime"] != "0")
+ {
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ else
+ {
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
+ }
+
+ }
+ else
+ {
+ if (intvalue == if_value)
+ {
+ state = Language.StringByID(MyInternationalizationString.logicopen);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.logicclose);
+ }
+
+ }
+
+ }
+ break;
+ case 40:
+ {
+ if (intvalue == if_value)
+ {
+ state =Language.StringByID(MyInternationalizationString.smokescreen);
+ }
+
+ }
+ break;
+ case 42:
+ {
+ if (intvalue == if_value)
+ {
+ state =Language.StringByID( MyInternationalizationString.waterleakage);
+ }
+ else
+ {
+ state =Language.StringByID( MyInternationalizationString.noleakage);
+ }
+ }
+ break;
+ case 43:
+ {
+ if (intvalue == if_value)
+ {
+ state =Language.StringByID( MyInternationalizationString.gas);
+ }
+
+ }
+ break;
+ case 277:
+ {
+ if (intvalue == if_value)
+ {
+ state =Language.StringByID( MyInternationalizationString.callthepolice);
+ }
+
+ }
+ break;
default:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID(MyInternationalizationString.callthepolice);
}
@@ -405,8 +377,8 @@
s = "鈮�";
}
break;
- }
- ///杞崲娓╁害鍊�/100
+ }
+ ///杞崲娓╁害鍊�/100
string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
if (conditions["Cluster_ID"] == "1026")
{
@@ -561,7 +533,7 @@
selecteddevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -570,10 +542,6 @@
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
selecteddevice.selecetdFrameLayout.RemoveFromParent();
- //var logicCommunalPage = new LogicCommunalPage();
- //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //logicCommunalPage.Show(() => { });
};
};
@@ -625,7 +593,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ name = HdlDeviceCommonLogic.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
@@ -953,7 +921,7 @@
{
var intvalue = int.Parse(tasks["Data1"]);
var colorTemperatureValue = 1000000 / (intvalue * 100);
- state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+ state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "00K";
}
break;
}
@@ -969,7 +937,7 @@
case 2:
{
//鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
- var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
+ var sceneinof = HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
//鏈湴娌℃湁瀛樺湪;
if (sceneinof == null)
{
@@ -998,7 +966,7 @@
actiondevice.regionNameBtn.Visible = true;
/////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
Common.Room room = new Common.Room();
- actiondevice.regionNameBtn.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
+ actiondevice.regionNameBtn.Text = HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
}
break;
@@ -1126,7 +1094,7 @@
actiondevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0