From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 8f382b3..f81d8a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -43,7 +43,7 @@
         /// </summary>
         public void ShowForm(string i_deviceMac)
         {
-            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.ScrollEnabled = false;
 
             this.deviceMac = i_deviceMac;
             this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
@@ -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;
             }
         }
 
@@ -248,7 +259,7 @@
             btnProgress1.Y = Application.GetRealHeight(29);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
             frameLinght.AddChidren(btnProgress1);
 
             //杩涘害鏉�
@@ -260,10 +271,10 @@
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
-                linghtLevelInfo.panelDirectionsLevel = value;
+                linghtLevelInfo.panelBacklightLevel = value;
                 valueChanged = true;
             };
-            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
 
             var btnTemp1 = new NormalViewControl(200, 49, true);
             btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -312,7 +323,7 @@
             btnProgress1.Y = Application.GetRealHeight(369);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
             frameLinght.AddChidren(btnProgress1);
 
             //杩涘害鏉�
@@ -324,10 +335,10 @@
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
-                linghtLevelInfo.panelBacklightLevel = value;
+                linghtLevelInfo.panelDirectionsLevel = value;
                 valueChanged = true;
             };
-            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
 
             var btnTemp1 = new NormalViewControl(200, 49, true);
             btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -386,20 +397,6 @@
             this.CloseProgressBar();
 
             return true;
-        }
-
-        #endregion
-
-        #region 鈻� 鐣岄潰鍏抽棴___________________________
-
-        /// <summary>
-        /// 鐣岄潰鍏抽棴
-        /// </summary>
-        public override void CloseFormBefore()
-        {
-            UserView.HomePage.Instance.ScrollEnabled = true;
-
-            base.CloseFormBefore();
         }
 
         #endregion

--
Gitblit v1.8.0