From b7591dba0127890e24eb1ae41e150a0ad8ee1a51 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 17 七月 2020 11:49:21 +0800 Subject: [PATCH] 2020-07-17 1.修复在大屏幕手机,部分界面图标会变形问题. --- Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs index e2b225e..4e53bb6 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs @@ -1099,18 +1099,24 @@ btnOpenCurtain.IsSelected = false; btnStopCurtain.IsSelected = false; curtainmodel.Status = (CurtainStatus)2; + Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, + new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status }); }; btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => { btnCloseCurtain.IsSelected = false; btnOpenCurtain.IsSelected = true; btnStopCurtain.IsSelected = false; curtainmodel.Status = (CurtainStatus)1; + Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, + new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status }); }; btnStopCurtain.MouseUpEventHandler += (sender3, e3) => { btnCloseCurtain.IsSelected = false; btnOpenCurtain.IsSelected = false; btnStopCurtain.IsSelected = true; curtainmodel.Status = (CurtainStatus)0; + Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainmodel.SubnetID, curtainmodel.DeviceID, + new byte [] { curtainmodel.LoopID, (byte)curtainmodel.Status }); }; if (curtainmodel.Status == 0) { btnStopCurtain.IsSelected = true; @@ -1327,11 +1333,11 @@ Y = tempSeekBarFrame.Bottom + Application.GetRealHeight (40), }; dialogBodyLayout.AddChidren (btnOpenCurtain); - btnOpenCurtain.MouseUpEventHandler += (sender, e) => { - Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 }); - horizontalSeekBar.Progress = 100; - btnMaxBrightness.Text = "100%"; - }; + //btnOpenCurtain.MouseUpEventHandler += (sender, e) => { + // Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 }); + // horizontalSeekBar.Progress = 100; + // btnMaxBrightness.Text = "100%"; + //}; Button btnOpenLbl = new Button () { Width = Application.GetRealWidth (124), Height = Application.GetRealHeight (30), @@ -1370,11 +1376,11 @@ SelectedImagePath = "Curtain/CurtainRollerDownOn.png", }; dialogBodyLayout.AddChidren (btnCloseCurtain); - btnCloseCurtain.MouseUpEventHandler += (sender, e) => { - Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 }); - horizontalSeekBar.Progress = 0; - btnMaxBrightness.Text = "0%"; - }; + //btnCloseCurtain.MouseUpEventHandler += (sender, e) => { + // Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 }); + // horizontalSeekBar.Progress = 0; + // btnMaxBrightness.Text = "0%"; + //}; Button btnCloseLbl = new Button () { Width = Application.GetRealWidth (124), Height = Application.GetRealHeight (30), @@ -1386,16 +1392,24 @@ }; dialogBodyLayout.AddChidren (btnCloseLbl); btnCloseCurtain.MouseUpEventHandler += (sender3, e3) => { + Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 0 }); + horizontalSeekBar.Progress = 0; + btnMaxBrightness.Text = "0%"; btnCloseCurtain.IsSelected = true; btnOpenCurtain.IsSelected = false; btnStopCurtain.IsSelected = false; curtainroller.Status = (CurtainStatus)2; + }; btnOpenCurtain.MouseUpEventHandler += (sender3, e3) => { + Control.ControlBytesSend (Command.UpdataCurtainModelStutas, curtainroller.SubnetID, curtainroller.DeviceID, new byte [] { 17, 100 }); + horizontalSeekBar.Progress = 100; + btnMaxBrightness.Text = "100%"; btnCloseCurtain.IsSelected = false; btnOpenCurtain.IsSelected = true; btnStopCurtain.IsSelected = false; curtainroller.Status = (CurtainStatus)1; + }; btnStopCurtain.MouseUpEventHandler += (sender3, e3) => { btnCloseCurtain.IsSelected = false; -- Gitblit v1.8.0