上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

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

@@ -334,7 +334,7 @@
                                var ignoreTime = new IgnoreTime();
                                UserView.HomePage.Instance.AddChidren(ignoreTime);
                                UserView.HomePage.Instance.PageIndex += 1;
                                ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue);
                                ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue, _if[1]);
                            }


@@ -378,7 +378,7 @@
                                        var ignoreTime = new IgnoreTime();
                                        UserView.HomePage.Instance.AddChidren(ignoreTime);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue);
                                        ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue, _if[1]);

                                    };

@@ -387,7 +387,7 @@
                                break;
                            case 40:
                                {
                                    

                                    openView.titleBtn.TextID = MyInternationalizationString.smokescreen;
                                    openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                                    completeView.Show(1).AddChidren(openView.Show());
@@ -437,27 +437,30 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices["AttriButeData1"] == "1")
                                if (devices.ContainsKey("IgnoreTime"))
                                {
                                    openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    openView.selectedIconBtn.Visible = true;
                                    closeView.selectedIconBtn.Visible = false;
                                    timevalue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices.ContainsKey("IgnoreTime"))
                                    if (devices["AttriButeData1"] == "1")
                                    {
                                        timevalue = int.Parse(devices["IgnoreTime"]);
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                        openView.selectedIconBtn.Visible = true;
                                        closeView.selectedIconBtn.Visible = false;
                                    }
                                    else
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        openView.selectedIconBtn.Visible = false;
                                        closeView.titleBtn.Visible = true;
                                        closeView.selectedIconBtn.Visible = true;
                                    }

                                }


                            }