From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
old mode 100755
new mode 100644
index 35dea98..572a224
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -152,12 +152,22 @@
frameBack.AddChidren(seekBar1);
seekBar1.ProgressChangedEvent += (div, value) =>
{
- btnProgress1.Text = value.ToString();
+ if (value == 0)
+ {
+ btnProgress1.Text = (value + 1).ToString();
+ }
+ else
+ {
+ btnProgress1.Text = value.ToString();
+ }
+
switch (value)
{
+ case 0:
case 1:
linghtLevelInfo.panelDirectionsLevel = 20;
btnLevel.Text = "1" + strRank;
+
break;
case 2:
linghtLevelInfo.panelDirectionsLevel = 40;
@@ -175,14 +185,22 @@
linghtLevelInfo.panelDirectionsLevel = 100;
btnLevel.Text = "5" + strRank;
break;
- default:
- linghtLevelInfo.panelDirectionsLevel = 0;
- btnLevel.Text = "0" + strRank;
- break;
}
};
- if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel > 0)
+ seekBar1.OnStopTrackingTouchEvent += (div, value) =>
+ {
+ if (value == 0)
+ {
+ seekBar1.Progress = 1;
+ }
+ else
+ {
+ seekBar1.Progress = value;
+ }
+ };
+
+ if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel >= 0)
{
btnLevel.Text = "1" + strRank;
btnProgress1.Text = "1";
@@ -214,17 +232,17 @@
}
else
{
- btnLevel.Text = "0" + strRank;
- btnProgress1.Text = "0";
- seekBar1.Progress = 0;
+ btnLevel.Text = "1" + strRank;
+ btnProgress1.Text = "1";
+ seekBar1.Progress = 1;
}
-
+
var btnTemp1 = new NormalViewControl(200, 50, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(322);
btnTemp1.TextSize = 12;
btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0";
+ btnTemp1.Text = "1";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(100, 50, true);
@@ -565,15 +583,15 @@
this.ShowProgressBar();
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- //璁惧鍚屼簨璇撮粯璁ゅ幓1绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
- energyModeInfo.time = 1;
+ //璁惧鍚屼簨璇存柊椋庨潰鏉块粯璁�60绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
+ energyModeInfo.time = 60;
var result = await 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)
{
--
Gitblit v1.8.0