From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
old mode 100644
new mode 100755
index 38b3a4a..35dea98
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -81,8 +81,8 @@
//娣诲姞鑳屽厜鐏寒搴︽帶浠躲�愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
//this.AddBackLightControl();
//銆愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
- //this.FinishInitControl(listview, energyModeInfo.enable);
-
+ //this.FinishInitControl(listview, energyModeInfo.enable);
+
//淇濆瓨
var btnSave = new BottomClickButton();
btnSave.TextID = R.MyInternationalizationString.uSave;
@@ -126,7 +126,7 @@
btnLevel.X = Application.GetRealWidth(855);
btnLevel.Y = Application.GetRealHeight(54);
btnLevel.TextAlignment = TextAlignment.CenterRight;
- btnLevel.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnLevel.TextColor = UserCenterColor.Current.TextGrayColor1;
frameBack.AddChidren(btnLevel);
//褰撳墠浜害
@@ -152,8 +152,8 @@
frameBack.AddChidren(seekBar1);
seekBar1.ProgressChangedEvent += (div, value) =>
{
- btnProgress1.Text = value.ToString();
- switch (value)
+ btnProgress1.Text = value.ToString();
+ switch (value)
{
case 1:
linghtLevelInfo.panelDirectionsLevel = 20;
@@ -180,8 +180,8 @@
btnLevel.Text = "0" + strRank;
break;
}
- };
-
+ };
+
if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel > 0)
{
btnLevel.Text = "1" + strRank;
@@ -218,7 +218,7 @@
btnProgress1.Text = "0";
seekBar1.Progress = 0;
}
-
+
var btnTemp1 = new NormalViewControl(200, 50, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(322);
@@ -285,7 +285,7 @@
frameBack.AddChidren(seekBar1);
seekBar1.ProgressChangedEvent += (div, value) =>
{
- btnProgress1.Text = value + "%";
+ btnProgress1.Text = value + "%";
};
//seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
@@ -598,10 +598,10 @@
//}
//鍏抽棴鑷韩
this.CloseForm();
- }
-
+ }
+
#endregion
-
+
#region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
--
Gitblit v1.8.0