新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs

@@ -171,7 +171,9 @@
                                    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)
                                            {
@@ -183,7 +185,9 @@
                                                        }
                                                        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;
@@ -217,9 +221,9 @@
                                                case 21:
                                                case 22:
                                                    {
                                                        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;
                                                            if (minute != 0 && second != 0)
@@ -245,7 +249,7 @@
                                                        }
                                                        else
                                                        {
                                                            if (intvalue == "1")
                                                            if (intvalue == if_value)
                                                            {
                                                                state = Language.StringByID(MyInternationalizationString.logicopen);
                                                            }
@@ -260,7 +264,7 @@
                                                    break;
                                                case 40:
                                                    {
                                                        if (intvalue == "1")
                                                        if (intvalue == if_value)
                                                        {
                                                            state =Language.StringByID(MyInternationalizationString.smokescreen);
                                                        }
@@ -269,7 +273,7 @@
                                                    break;
                                                case 42:
                                                    {
                                                        if (intvalue == "1")
                                                        if (intvalue == if_value)
                                                        {
                                                            state =Language.StringByID( MyInternationalizationString.waterleakage);
                                                        }
@@ -281,7 +285,7 @@
                                                    break;
                                                case 43:
                                                    {
                                                        if (intvalue == "1")
                                                        if (intvalue == if_value)
                                                        {
                                                            state =Language.StringByID( MyInternationalizationString.gas);
                                                        }
@@ -290,7 +294,7 @@
                                                    break;
                                                case 277:
                                                    {
                                                        if (intvalue == "1")
                                                        if (intvalue == if_value)
                                                        {
                                                            state =Language.StringByID( MyInternationalizationString.callthepolice);
                                                        }
@@ -299,7 +303,7 @@
                                                    break;
                                                default:
                                                    {
                                                        if (intvalue == "1")
                                                        if (intvalue == if_value)
                                                        {
                                                            state =Language.StringByID(MyInternationalizationString.callthepolice);
                                                        }
@@ -529,7 +533,7 @@
                    selecteddevice.del.MouseUpEventHandler += (sender, e) =>
                    {

                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                        Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                        Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -917,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;
                                                }
@@ -1090,7 +1094,7 @@
                    actiondevice.del.MouseUpEventHandler += (sender, e) =>
                    {

                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                        Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                        Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();