From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs |  316 ++++++++++++++++++++++++++++------------------------
 1 files changed, 170 insertions(+), 146 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index bb77abd..b2814b2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -2,17 +2,17 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using ZigBee.Device;
-namespace Shared.Phone.UserCenter.DevicePanel
-{
-    public class PanelBackLighWithSensorForm : EditorCommonForm
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________ 
+using ZigBee.Device;
+namespace Shared.Phone.UserCenter.DevicePanel
+{
+    public class PanelBackLighWithSensorForm : EditorCommonForm
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________ 
         /// <summary>
         /// 鍒楄〃鎺т欢
         /// </summary>
-        private VerticalScrolViewLayout listview = null;
-
+        private VerticalScrolViewLayout listview = null;
+
         /// <summary>
         /// 闈㈡澘鐨勫洖璺�
         /// </summary>
@@ -68,35 +68,35 @@
             if (result == false)
             {
                 return;
-            }
-
-            //娓呯┖bodyFrame
-            this.ClearBodyFrame();
-
+            }
+
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
             HdlThreadLogic.Current.RunMain(() =>
             {
-                listview = new VerticalScrolViewLayout();
-                listview.Height = Application.GetRealHeight(1981 - 184);
-                bodyFrameLayout.AddChidren(listview);
-
-                //娣诲姞鑺傝兘妯″紡
-                this.AddEnergyConservationRow();
-                //娣诲姞鐐瑰嚮鍓嶏紝浜害杩涘害鏉�
+                listview = new VerticalScrolViewLayout();
+                listview.Height = Application.GetRealHeight(1981 - 184);
+                bodyFrameLayout.AddChidren(listview);
+
+                //娣诲姞鑺傝兘妯″紡
+                this.AddEnergyConservationRow();
+                //娣诲姞鐐瑰嚮鍓嶏紝浜害杩涘害鏉�
                 this.AddBeforeClickProgress();
                 //娣诲姞鐐瑰嚮鍚庯紝浜害杩涘害鏉�
-                this.AddAfterClickProgress();
-
-                this.FinishInitControl(listview, energyModeInfo.enable);
+                this.AddAfterClickProgress();
 
-                //淇濆瓨
-                var btnSave = new BottomClickButton();
-                btnSave.TextID = R.MyInternationalizationString.uSave;
-                bodyFrameLayout.AddChidren(btnSave);
-                btnSave.ButtonClickEvent += (sender, e) =>
-                {
-                    //淇濆瓨闈㈡澘鏁版嵁
-                    this.SavePanelData();
-                };
+                this.FinishInitControl(listview, energyModeInfo.enable);
+
+                //淇濆瓨
+                var btnSave = new BottomClickButton();
+                btnSave.TextID = R.MyInternationalizationString.uSave;
+                bodyFrameLayout.AddChidren(btnSave);
+                btnSave.ButtonClickEvent += (sender, e) =>
+                {
+                    //淇濆瓨闈㈡澘鏁版嵁
+                    this.SavePanelData();
+                };
             });
         }
 
@@ -123,18 +123,18 @@
             btnSwitch.ButtonClickEvent += (sender, e) =>
             {
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
-                energyModeInfo.enable = btnSwitch.IsSelected;
-                //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+                energyModeInfo.enable = btnSwitch.IsSelected;
+                //灞曞紑鎴栬�呯缉灏忕殑楂樺害
                 var value = Application.GetRealHeight(443);
                 if (btnSwitch.IsSelected == true)
                 {
-                    frameBack.Height += value;
+                    frameBack.Height += value;
                 }
                 else
                 {
-                    frameBack.Height -= value;
-                }
-                //瀹瑰櫒琛ュ厖
+                    frameBack.Height -= value;
+                }
+                //瀹瑰櫒琛ュ厖
                 this.FinishInitControl(listview, energyModeInfo.enable);
             };
             if (energyModeInfo.enable == true)
@@ -195,20 +195,20 @@
                 frameBack.Height += value;
             }
 
-            //娣诲姞鎺ヨ繎鎰熷簲
-            this.AddProximitySensorsRow(frameBack);
-        }
-
+            //娣诲姞鎺ヨ繎鎰熷簲
+            this.AddProximitySensorsRow(frameBack);
+        }
+
         #endregion
-
+
         #region 鈻� 鎺ヨ繎鎰熷簲___________________________
-
+
         /// <summary>
         /// 鎺ヨ繎鎰熷簲琛�
         /// </summary>
         private void AddProximitySensorsRow(FrameRowControl frameRowControl)
-        {
-            //鎺ヨ繎鎰熷簲琛�
+        {
+            //鎺ヨ繎鎰熷簲琛�
             var frameBack = new FrameRowControl();
             frameBack.BackgroundColor = UserCenterColor.Current.White;
             frameBack.UseClickStatu = false;
@@ -219,22 +219,22 @@
             //鎺ヨ繎鎰熷簲
             frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
             //寮�鍏虫帶浠�
-            var btnSwitch = frameBack.AddMostRightSwitchIcon();
-
-            btnSwitch.ButtonClickEvent += (sender, e) =>
-            {
-                btnSwitch.IsSelected = !btnSwitch.IsSelected;
-                proximitySensorsInfo.enable = btnSwitch.IsSelected;
-            };
+            var btnSwitch = frameBack.AddMostRightSwitchIcon();
+
+            btnSwitch.ButtonClickEvent += (sender, e) =>
+            {
+                btnSwitch.IsSelected = !btnSwitch.IsSelected;
+                proximitySensorsInfo.enable = btnSwitch.IsSelected;
+            };
             if (proximitySensorsInfo.enable == true)
             {
                 btnSwitch.IsSelected = true;
-            }
-        }
+            }
+        }
         #endregion
-
+
         #region 鈻� 鐐瑰嚮鍓峗____________________________
-
+
         /// <summary>
         ///  娣诲姞鐐瑰嚮鍓嶇殑鑳屽厜鐏繘搴︽潯
         /// </summary>
@@ -243,7 +243,7 @@
         {
             //鐐瑰嚮鍓�
             var btnClick = new NormalViewControl(600, 107, true);
-            btnClick.X = ControlCommonResourse.XXLeft;
+            btnClick.X = ControlCommonResourse.XXLeft;
             btnClick.TextSize = 12;
             btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnClick.TextID = R.MyInternationalizationString.uBeforeClick;
@@ -299,73 +299,97 @@
             btnTemp2.Text = "100%";
             frameBack.AddChidren(btnTemp2);
 
-            var frameColor = new FrameLayoutControl();
+            var frameColor = new FrameLayoutStatuControl();
             frameColor.UseClickStatu = false;
             frameColor.Width = Application.GetRealHeight(262);
-            frameColor.Height = Application.GetMinRealAverage(79);
+            frameColor.Height = this.GetPictrueRealSize(79);
             frameColor.Y = Application.GetRealHeight(26);
             frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
             frameBack.AddChidren(frameColor);
 
             //棰滆壊
-            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
+            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
             btnColorView.Gravity = Gravity.CenterVertical;
             btnColorView.TextAlignment = TextAlignment.CenterRight;
             btnColorView.TextSize = 12;
             btnColorView.Y = Application.GetRealHeight(5);
             btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnColorView.TextID = R.MyInternationalizationString.uColor;
-            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
+            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);
 
             int R1 = Convert.ToInt32(this.keyColorData.CloseColorR, 16);
             int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);
             int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);
-            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
-
-            //棰滆壊澶栨 
-            var btnColorLine = new FrameLayoutControl();
-            btnColorLine.Width = Application.GetRealHeight(79);
-            btnColorLine.Height = Application.GetMinRealAverage(79);
-            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
-            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
-            btnColorLine.BorderWidth = 1;
-            btnColorLine.BorderColor = 0xffcccccc;
-            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
 
-            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
+            //棰滆壊澶栨 
+            var btnColorLine = new FrameLayoutStatuControl();
+            btnColorLine.Width = Application.GetRealHeight(79);
+            btnColorLine.Height = this.GetPictrueRealSize(79);
+            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+            btnColorLine.BorderWidth = 1;
+            btnColorLine.BorderColor = 0xffcccccc;
+            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+
+            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
             btnColor.Gravity = Gravity.Center;
-            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
             btnColor.BackgroundColor = backColor;
-            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
 
             //鍙樻洿婊戝姩鏉$殑棰滆壊
             seekBar1.ProgressBarColor = backColor;
 
-            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
+            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
             btnRight.UnSelectedImagePath = "Item/RightNext.png";
             btnRight.Y = Application.GetRealHeight(5);
-            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
-            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
-            btnRight.Y += Application.GetMinRealAverage(8);
+            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
+            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
+            btnRight.Y += this.GetPictrueRealSize(8);
 
             frameColor.ButtonClickEvent += (sender, e) =>
             {
-                var form = new PanelColorSelectForm();
-                form.AddForm(R1, G1, B1);
-                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
-                {
-                    R1 = Rcolor;
-                    G1 = Gcolor;
-                    B1 = Bcolor;
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColorView.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColor.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColorLine.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnRight.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+        }
 
-                    this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
-                    this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
-                    this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
+        /// <summary>
+        /// PanelColorBefore
+        /// </summary>
+        private void PanelColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
+        {
+            var form = new PanelColorSelectForm();
+            form.AddForm(R1, G1, B1);
+            form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+            {
+                R1 = Rcolor;
+                G1 = Gcolor;
+                B1 = Bcolor;
 
-                    btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
-                    //鍙樻洿婊戝姩鏉$殑棰滆壊
-                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;
-                };
+                this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
+                this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
+                this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
+
+                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+                //鍙樻洿婊戝姩鏉$殑棰滆壊
+                seekBar1.ProgressBarColor = btnColor.BackgroundColor;
             };
         }
 
@@ -437,76 +461,76 @@
             btnTemp2.Text = "100%";
             frameBack.AddChidren(btnTemp2);
 
-            var frameColor = new FrameLayoutControl();
+            var frameColor = new FrameLayoutStatuControl();
             frameColor.UseClickStatu = false;
             frameColor.Width = Application.GetRealHeight(262);
-            frameColor.Height = Application.GetMinRealAverage(79);
+            frameColor.Height = this.GetPictrueRealSize(79);
             frameColor.Y = Application.GetRealHeight(26);
             frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
-            frameBack.AddChidren(frameColor);
-
-            //棰滆壊
-            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
+            frameBack.AddChidren(frameColor);
+
+            //棰滆壊
+            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
             btnColorView.Gravity = Gravity.CenterVertical;
             btnColorView.TextAlignment = TextAlignment.CenterRight;
             btnColorView.TextSize = 12;
             btnColorView.Y = Application.GetRealHeight(5);
             btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnColorView.TextID = R.MyInternationalizationString.uColor;
-            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
+            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);
 
             int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);
             int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);
             int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
-            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
-
-            //棰滆壊澶栨
-            var btnColorLine = new FrameLayoutControl();
+            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
+
+            //棰滆壊澶栨
+            var btnColorLine = new FrameLayoutStatuControl();
             btnColorLine.Width = Application.GetRealHeight(79);
-            btnColorLine.Height = Application.GetMinRealAverage(79);
+            btnColorLine.Height = this.GetPictrueRealSize(79);
             btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
-            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
             btnColorLine.BorderWidth = 1;
-            btnColorLine.BorderColor = 0xffcccccc;
-            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
-
-            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
+            btnColorLine.BorderColor = 0xffcccccc;
+            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+
+            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
             btnColor.Gravity = Gravity.Center;
-            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
             btnColor.BackgroundColor = backColor;
-            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
 
             //鍙樻洿婊戝姩鏉$殑棰滆壊
             seekBar1.ProgressBarColor = backColor;
 
-            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
+            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
             btnRight.UnSelectedImagePath = "Item/RightNext.png";
             btnRight.Y = Application.GetRealHeight(5);
-            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
-            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
-            btnRight.Y += Application.GetMinRealAverage(8);
+            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
+            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
+            btnRight.Y += this.GetPictrueRealSize(8);
 
             frameColor.ButtonClickEvent += (sender, e) =>
             {
-                var form = new PanelColorSelectForm();
-                form.AddForm(R1, G1, B1);
-                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
-                {
-                    R1 = Rcolor;
-                    G1 = Gcolor;
-                    B1 = Bcolor;
-
-                    this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
-                    this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
-                    this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
-
-                    btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
-                    //鍙樻洿婊戝姩鏉$殑棰滆壊
-                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;
-                };
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColorView.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColor.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnColorLine.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+            btnRight.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, seekBar1, R1, G1, B1);
             };
         }
-
         #endregion
 
         #region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
@@ -520,7 +544,7 @@
             //寮�鍚繘搴︽潯
             this.ShowProgressBar();
             //浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
-            linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
+            linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
             if (linghtLevelInfo == null)
             {
                 //鍏抽棴杩涘害鏉�
@@ -536,14 +560,14 @@
                 return false;
             }
             //鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
-            energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
+            energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
             if (energyModeInfo == null)
             {
                 //鍏抽棴杩涘害鏉�
                 this.CloseProgressBar(ShowReLoadMode.YES);
                 return false;
             }
-            keyColorData = await HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
+            keyColorData = HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);
             if (this.keyColorData == null)
             {
                 //鍏抽棴杩涘害鏉�
@@ -567,7 +591,7 @@
         {
             this.ShowProgressBar();
             //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
-            var result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+            var result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
             if (result == false)
             {
                 this.CloseProgressBar();
@@ -575,15 +599,15 @@
             }
 
             //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
-            //璁惧鍚屼簨璇撮粯璁ゅ幓绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
-            energyModeInfo.time = 1;
-            result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+            //鑲栧織璞粰鎸夐敭鎺у埗闈㈡澘锛堝洓寮�鍏帶锛夎澶囷紝璇撮粯璁�15绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
+            energyModeInfo.time = 15;
+            result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
             if (result == false)
             {
                 this.CloseProgressBar();
                 return;
             }
-            //鎺ヨ繎淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+            //鎺ヨ繎浼犳劅璁剧疆  (鑲栧織璞粰鎸夐敭鎺у埗闈㈡澘锛堝洓寮�鍏帶锛夎澶囷紝浼犳劅璺濈鍜岃Е鍙戝欢杩熸椂闂撮粯璁ょ敤鏈�澶у��)
             result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(panelDevice, proximitySensorsInfo.enable);
             if (result == false)
             {
@@ -591,7 +615,7 @@
                 return;
             }
             //璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
-            result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
+            result = HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
             this.CloseProgressBar();
             if (result == false)
             {
@@ -640,8 +664,8 @@
         private uint GetColorByRGB(byte R, byte G, byte B)
         {
             return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
-        }
-
+        }
+
         #endregion 
     }
-}
+}

--
Gitblit v1.8.0