From 627093aca723d4bfb971b97c828e8b3a22dbda78 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 17 七月 2020 17:26:19 +0800
Subject: [PATCH] 2020-07-17-1

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 8e4e596..3b8d198 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -58,10 +58,10 @@
         /// <summary>
         /// 鍒濆鍖栦腑閮ㄤ俊鎭�
         /// </summary>
-        private async void InitMiddleFrame()
+        private void InitMiddleFrame()
         {
             //鑾峰彇璁惧鍒濆鏁版嵁
-            var result = await this.GetDeviceDefultData();
+            var result = this.GetDeviceDefultData();
             if (result == false)
             {
                 return;
@@ -96,20 +96,20 @@
             var btnSave = new BottomClickButton();
             btnSave.TextID = R.MyInternationalizationString.uSave;
             bodyFrameLayout.AddChidren(btnSave);
-            btnSave.ButtonClickEvent += async (sender, e) =>
+            btnSave.ButtonClickEvent += (sender, e) =>
             {
                 if (valueChanged == true)
                 {
                     this.ShowProgressBar();
                     //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
-                    result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+                    result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
                     if (result == false)
                     {
                         this.CloseProgressBar();
                         return;
                     }
                     //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
-                    result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+                    result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
                     this.CloseProgressBar();
                     if (result == false)
                     {
@@ -139,6 +139,10 @@
             frameBack.Height = Application.GetRealHeight(170);
             bodyFrameLayout.AddChidren(frameBack);
 
+            //褰撳墠浜害(鍏堝０鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+            var btnProgressView1 = new NormalViewControl(200, 49, true);
+            var btnProgress1 = new NormalViewControl(200, 49, true);
+
             //鑺傝兘妯″紡
             frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
             //寮�鍏虫帶浠�
@@ -154,12 +158,16 @@
                     frameBack.Height += value;
                     btnClickStatu.Y += value;
                     frameLinght.Y += value;
+                    btnProgressView1.Visible = true;
+                    btnProgress1.Visible = true;
                 }
                 else
                 {
                     frameBack.Height -= value;
                     btnClickStatu.Y -= value;
                     frameLinght.Y -= value;
+                    btnProgressView1.Visible = false;
+                    btnProgress1.Visible = false;
                 }
                 //鏁版嵁鍙樻洿
                 valueChanged = true;
@@ -170,20 +178,20 @@
             }
 
             //褰撳墠浜害
-            var btnProgressView1 = new NormalViewControl(200, 49, true);
             btnProgressView1.X = ControlCommonResourse.XXLeft;
             btnProgressView1.Y = Application.GetRealHeight(161);
             btnProgressView1.TextSize = 12;
             btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
             frameBack.AddChidren(btnProgressView1);
-            var btnProgress1 = new NormalViewControl(200, 49, true);
+            btnProgressView1.Visible = false;
             btnProgress1.X = Application.GetRealWidth(222);
             btnProgress1.Y = Application.GetRealHeight(158);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnProgress1.Text = energyModeInfo.level + "%";
             frameBack.AddChidren(btnProgress1);
+            btnProgress1.Visible = false;
 
             //杩涘害鏉�
             var seekBar1 = new SeekBarControl();
@@ -223,6 +231,9 @@
                 frameBack.Height += value;
                 btnClickStatu.Y += value;
                 frameLinght.Y += value;
+
+                btnProgressView1.Visible = true;
+                btnProgress1.Visible = true;
             }
         }
 
@@ -362,12 +373,12 @@
         /// 鑾峰彇璁惧鍒濆鏁版嵁
         /// </summary>
         /// <returns></returns>
-        private async Task<bool> GetDeviceDefultData()
+        private bool GetDeviceDefultData()
         {
             //寮�鍚繘搴︽潯
             this.ShowProgressBar();
             //浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
-            linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
+            linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);
             if (linghtLevelInfo == null)
             {
                 //鍏抽棴杩涘害鏉�
@@ -375,7 +386,7 @@
                 return false;
             }
             //鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
-            energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
+            energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);
             if (energyModeInfo == null)
             {
                 //鍏抽棴杩涘害鏉�

--
Gitblit v1.8.0