2020-12-30-1

陈嘉乐

2020-12-30 81307af66465a6b5ba189b0fb9b347787f004a4e

 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);
                                                        }
@@ -373,8 +377,8 @@
                                                        s = "≤";
                                                    }
                                                    break;
                                            }

                                            ///转换温度值/100

                                            }
                                            ///转换温度值/100
                                            string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
                                            if (conditions["Cluster_ID"] == "1026")
                                            {
@@ -511,16 +515,14 @@
                                break;
                            case 6:
                                {
                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                    frameLayout.AddChidren(flMain);
                                    AddLogicPage.SecurityView(flMain, true);
                                   
                                    AddLogicPage.SecurityView(frameLayout, true);
                                }
                                break;
                            case 7:
                                {
                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                    frameLayout.AddChidren(flMain);
                                    AddLogicPage.LocationView(flMain, true);
                                 
                                    AddLogicPage.LocationView(frameLayout, true);
                                }
                                break;
                        }
@@ -529,7 +531,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();
@@ -538,21 +540,6 @@
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();

                            var exist = Common.Logic.CurrentLogic.Conditions.Find((obj) => obj["Type"] == "7");
                            if (exist == null)
                            {
                                //如果找不到地理位置作为条件的话,关闭GPS服务(减少耗电)
                                if (Send.It_Exist == "1")
                                {
                                    Application.StopGPSLocationService();
                                    Send.SaveLocalFile("GPS_File", "0");
                                }
                            }
                            //var logicCommunalPage = new LogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //logicCommunalPage.Show(() => { });
                        };

                    };
@@ -932,7 +919,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;
                                                }
@@ -1105,7 +1092,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();