2020-07-20-2

陈嘉乐

2020-07-20 da9905ebb2794d276f37d798f1624c8c59dc074e

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

@@ -22,7 +22,7 @@
            completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
            {
                if (!edit)
                if (edit)
                {
                    UserView.HomePage.Instance.ScrollEnabled = true;
                }
@@ -543,7 +543,8 @@
                        Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        completeView.Show(l).AddChidren(openView.Show());
                        openView.titleBtn.Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
                        openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
                        //openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
                        openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
                        {
@@ -1275,7 +1276,15 @@
                        var nightlight = new Nightlight();
                        UserView.HomePage.Instance.AddChidren(nightlight);
                        UserView.HomePage.Instance.PageIndex += 1;
                        nightlight.Show(common, false, _if[1]);
                        if (edit)
                        {
                            nightlight.Show(common, edit, _if[1], Common.Logic.CurrentLogic.Actions[intValue]);
                        }
                        else
                        {
                            nightlight.Show(common, edit, _if[1]);
                        }
                        
                    }
                    break;
            }