陈嘉乐
2020-07-01 c16f0f8fd1e5374164852a441751abb96a84d300
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -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),//进度条X坐标
                Width = Application.GetRealWidth(915),//进度条的长度
                Height = Application.GetRealHeight(160),//进度条父控件高度
                IsProgressTextShow = true,//显示百分比
                IsClickable = false,//进度条是否滑动
                ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
@@ -298,7 +298,8 @@
                        Send.dictionary(deviceConditionsInfo, "AttriButeId", "1281");
                        Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
                        int timevalue = 0;
                        int timeValue = 0;
                        int progressValue = 0;
                        ///点击确认事件
                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
                        {
@@ -307,7 +308,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 +325,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 +353,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 +374,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 +420,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, 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;
@@ -439,7 +490,7 @@
                            {
                                if (devices.ContainsKey("IgnoreTime"))
                                {
                                    timevalue = int.Parse(devices["IgnoreTime"]);
                                    timeValue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
@@ -462,8 +513,10 @@
                            }
                            else if (devices["AttriButeId"] == "0")
                            {
                                progressValue = int.Parse(devices["AttriButeData1"]);
                            }
                        }
                    }
@@ -1206,10 +1259,6 @@
                    }
                    break;
                case DeviceType.ColorTemperatureLight: {
                        flMain.RemoveFromParent();
                        var nightlight = new Nightlight();
                        UserView.HomePage.Instance.AddChidren(nightlight);