From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs |   69 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index 21d70d7..085aae4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -112,6 +112,10 @@
             frameBack.Height = Application.GetRealHeight(170);
             bodyFrameLayout.AddChidren(frameBack);
 
+            //褰撳墠浜害(鍏堝0鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+            var btnProgressView1 = new NormalViewControl(200, 49, true);
+            var btnProgress1 = new NormalViewControl(200, 49, true);
+
             //鑺傝兘妯″紡
             frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
             //寮�鍏虫帶浠�
@@ -126,11 +130,15 @@
                 {
                     frameBack.Height += value;
                     frameLinght.Y += value;
+                    btnProgressView1.Visible = true;
+                    btnProgress1.Visible = true;
                 }
                 else
                 {
                     frameBack.Height -= value;
                     frameLinght.Y -= value;
+                    btnProgressView1.Visible = false;
+                    btnProgress1.Visible = false;
                 }
             };
             if (energyModeInfo.enable == true)
@@ -139,20 +147,20 @@
             }
 
             //褰撳墠浜害
-            var btnProgressView1 = new NormalViewControl(200, 49, true);
             btnProgressView1.X = ControlCommonResourse.XXLeft;
             btnProgressView1.Y = Application.GetRealHeight(164);
             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(164);
             btnProgress1.TextSize = 12;
             btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnProgress1.Text = energyModeInfo.level + "%";
             frameBack.AddChidren(btnProgress1);
+            btnProgress1.Visible = false;
 
             //杩涘害鏉�
             var seekBar1 = new SeekBarControl();
@@ -190,6 +198,9 @@
                 var value = Application.GetRealHeight(259);
                 frameBack.Height += value;
                 frameLinght.Y += value;
+
+                btnProgressView1.Visible = true;
+                btnProgress1.Visible = true;
             }
         }
 
@@ -285,19 +296,24 @@
             uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
 
             //棰滆壊澶栨
-            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
-            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
-            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
-            btnColorLine.BorderWidth = 1;
-            btnColorLine.BorderColor = 0xff666666;
-            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+            var frameColorLine = new FrameLayoutControl();
+            frameColorLine.UseClickStatu = false;
+            frameColorLine.Height = Application.GetMinRealAverage(79);
+            frameColorLine.Width = Application.GetMinRealAverage(79);
+            frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+            frameColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+            frameColorLine.BorderWidth = 1;
+            frameColorLine.BorderColor = 0xffcccccc;
+            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
 
-            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
-            btnColor.Y = Application.GetRealHeight(5);
-            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
-            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+            //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+            int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);
+            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+            btnColor.Gravity = Gravity.Center;
+            btnColor.Radius = (uint)btnColorWidth / 2;
             btnColor.BackgroundColor = backColor;
-            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
 
             //鍙樻洿婊戝姩鏉$殑棰滆壊
             seekBar1.ProgressBarColor = backColor;
@@ -422,19 +438,24 @@
             uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
 
             //棰滆壊澶栨
-            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
-            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
-            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
-            btnColorLine.BorderWidth = 1;
-            btnColorLine.BorderColor = 0xff666666;
-            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+            var frameColorLine = new FrameLayoutControl();
+            frameColorLine.UseClickStatu = false;
+            frameColorLine.Height = Application.GetMinRealAverage(79);
+            frameColorLine.Width = Application.GetMinRealAverage(79);
+            frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+            frameColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+            frameColorLine.BorderWidth = 1;
+            frameColorLine.BorderColor = 0xffcccccc;
+            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
 
-            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
-            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
-            btnColor.Y = Application.GetRealHeight(5);
-            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+            //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+            int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);
+            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+            btnColor.Gravity = Gravity.Center;
+            btnColor.Radius = (uint)btnColorWidth / 2;
             btnColor.BackgroundColor = backColor;
-            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
 
             //鍙樻洿婊戝姩鏉$殑棰滆壊
             seekBar1.ProgressBarColor = backColor;

--
Gitblit v1.8.0