From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs | 322 ++++++++++++++++++++++++++++-------------------------
1 files changed, 170 insertions(+), 152 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
index 35dea98..7e3c14c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -1,15 +1,15 @@
-锘縰sing System;
-using System.Threading.Tasks;
-using ZigBee.Device;
-namespace Shared.Phone.UserCenter.DevicePanel
-{
- public class PanelFangyueFreshAirBackLightSettionForm : EditorCommonForm
- {
+锘縰sing System;
+using System.Threading.Tasks;
+using ZigBee.Device;
+namespace Shared.Phone.UserCenter.DevicePanel
+{
+ public class PanelFangyueFreshAirBackLightSettionForm : EditorCommonForm
+ {
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
- private VerticalScrolViewLayout listview = null;
+ private VerticalScrolViewLayout listview = null;
/// <summary>
/// 闈㈡澘鐨勫洖璺�
/// </summary>
@@ -42,7 +42,7 @@
public void ShowForm(Panel i_panel)
{
//宸︽粦浣胯兘涓嶅彲
- this.ScrollEnabled = false;
+ this.ScrollEnabled = false;
this.panelDevice = i_panel;
//璁剧疆澶撮儴淇℃伅
@@ -56,8 +56,8 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private async void InitMiddleFrame()
- {
- //鑾峰彇璁惧鍒濆鏁版嵁
+ {
+ //鑾峰彇璁惧鍒濆鏁版嵁
var result = await this.GetDeviceDefultData();
if (result == false)
{
@@ -65,34 +65,34 @@
}
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- listview = new VerticalScrolViewLayout();
- listview.Height = Application.GetRealHeight(1981 - 184);
- bodyFrameLayout.AddChidren(listview);
-
+ this.ClearBodyFrame();
+
+ listview = new VerticalScrolViewLayout();
+ listview.Height = Application.GetRealHeight(1981 - 184);
+ bodyFrameLayout.AddChidren(listview);
+
HdlThreadLogic.Current.RunMain(() =>
- {
- //娣诲姞鑺傝兘妯″紡鎺т欢
- this.AddEnergyConservationRow();
-
- //娣诲姞灞忓箷浜害绾у埆鎺т欢
- this.AddScreenBrightnesLevelControl();
- //娣诲姞鑳屽厜鐏寒搴︽帶浠躲�愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
- //this.AddBackLightControl();
- //銆愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
+ {
+ //娣诲姞鑺傝兘妯″紡鎺т欢
+ this.AddEnergyConservationRow();
+
+ //娣诲姞灞忓箷浜害绾у埆鎺т欢
+ this.AddScreenBrightnesLevelControl();
+ //娣诲姞鑳屽厜鐏寒搴︽帶浠躲�愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
+ //this.AddBackLightControl();
+ //銆愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
//this.FinishInitControl(listview, energyModeInfo.enable);
- //淇濆瓨
+ //淇濆瓨
var btnSave = new BottomClickButton();
btnSave.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnSave);
btnSave.ButtonClickEvent += (sender, e) =>
{
- //淇濆瓨闈㈡澘鏁版嵁
+ //淇濆瓨闈㈡澘鏁版嵁
this.SavePanelData();
};
- });
+ });
}
#endregion
@@ -103,13 +103,13 @@
/// </summary>
private void AddScreenBrightnesLevelControl()
{
- var btnEspace = new NormalViewControl(600, 58, true);
- btnEspace.X = ControlCommonResourse.XXLeft;
- listview.AddChidren(btnEspace);
-
+ var btnEspace = new NormalViewControl(600, 58, true);
+ btnEspace.X = ControlCommonResourse.XXLeft;
+ listview.AddChidren(btnEspace);
+
var frameBack = new FrameLayout();
frameBack.Height = Application.GetRealHeight(429);
- frameBack.Y = Application.GetRealHeight(58);
+ frameBack.Y = Application.GetRealHeight(58);
frameBack.BackgroundColor = UserCenterColor.Current.White;
listview.AddChidren(frameBack);
@@ -152,79 +152,97 @@
frameBack.AddChidren(seekBar1);
seekBar1.ProgressChangedEvent += (div, value) =>
{
- btnProgress1.Text = value.ToString();
- switch (value)
- {
- case 1:
- linghtLevelInfo.panelDirectionsLevel = 20;
- btnLevel.Text = "1" + strRank;
- break;
- case 2:
- linghtLevelInfo.panelDirectionsLevel = 40;
- btnLevel.Text = "2" + strRank;
- break;
- case 3:
- linghtLevelInfo.panelDirectionsLevel = 60;
- btnLevel.Text = "3" + strRank;
- break;
- case 4:
- linghtLevelInfo.panelDirectionsLevel = 80;
- btnLevel.Text = "4" + strRank;
- break;
- case 5:
- linghtLevelInfo.panelDirectionsLevel = 100;
- btnLevel.Text = "5" + strRank;
- break;
- default:
- linghtLevelInfo.panelDirectionsLevel = 0;
- btnLevel.Text = "0" + strRank;
- break;
- }
+ 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;
+ btnLevel.Text = "2" + strRank;
+ break;
+ case 3:
+ linghtLevelInfo.panelDirectionsLevel = 60;
+ btnLevel.Text = "3" + strRank;
+ break;
+ case 4:
+ linghtLevelInfo.panelDirectionsLevel = 80;
+ btnLevel.Text = "4" + strRank;
+ break;
+ case 5:
+ linghtLevelInfo.panelDirectionsLevel = 100;
+ btnLevel.Text = "5" + strRank;
+ break;
+ }
};
- if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel > 0)
- {
- btnLevel.Text = "1" + strRank;
- btnProgress1.Text = "1";
- seekBar1.Progress = 1;
- }
- else if (linghtLevelInfo.panelDirectionsLevel <= 40 && linghtLevelInfo.panelDirectionsLevel > 20)
- {
- btnLevel.Text = "2" + strRank;
- btnProgress1.Text = "2";
- seekBar1.Progress = 2;
- }
- else if (linghtLevelInfo.panelDirectionsLevel <= 60 && linghtLevelInfo.panelDirectionsLevel > 40)
- {
- btnLevel.Text = "3" + strRank;
- btnProgress1.Text = "3";
- seekBar1.Progress = 3;
- }
- else if (linghtLevelInfo.panelDirectionsLevel <= 80 && linghtLevelInfo.panelDirectionsLevel > 60)
- {
- btnLevel.Text = "4" + strRank;
- btnProgress1.Text = "4";
- seekBar1.Progress = 4;
- }
- else if (linghtLevelInfo.panelDirectionsLevel <= 100 && linghtLevelInfo.panelDirectionsLevel > 80)
- {
- btnLevel.Text = "5" + strRank;
- btnProgress1.Text = "5";
- seekBar1.Progress = 5;
- }
- else
- {
- btnLevel.Text = "0" + strRank;
- btnProgress1.Text = "0";
- seekBar1.Progress = 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";
+ seekBar1.Progress = 1;
+ }
+ else if (linghtLevelInfo.panelDirectionsLevel <= 40 && linghtLevelInfo.panelDirectionsLevel > 20)
+ {
+ btnLevel.Text = "2" + strRank;
+ btnProgress1.Text = "2";
+ seekBar1.Progress = 2;
+ }
+ else if (linghtLevelInfo.panelDirectionsLevel <= 60 && linghtLevelInfo.panelDirectionsLevel > 40)
+ {
+ btnLevel.Text = "3" + strRank;
+ btnProgress1.Text = "3";
+ seekBar1.Progress = 3;
+ }
+ else if (linghtLevelInfo.panelDirectionsLevel <= 80 && linghtLevelInfo.panelDirectionsLevel > 60)
+ {
+ btnLevel.Text = "4" + strRank;
+ btnProgress1.Text = "4";
+ seekBar1.Progress = 4;
+ }
+ else if (linghtLevelInfo.panelDirectionsLevel <= 100 && linghtLevelInfo.panelDirectionsLevel > 80)
+ {
+ btnLevel.Text = "5" + strRank;
+ btnProgress1.Text = "5";
+ seekBar1.Progress = 5;
+ }
+ else
+ {
+ 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);
@@ -245,10 +263,10 @@
/// </summary>
private void AddBackLightControl()
{
- var btnEspace = new NormalViewControl(600, 58, true);
- btnEspace.X = ControlCommonResourse.XXLeft;
- listview.AddChidren(btnEspace);
-
+ var btnEspace = new NormalViewControl(600, 58, true);
+ btnEspace.X = ControlCommonResourse.XXLeft;
+ listview.AddChidren(btnEspace);
+
//鑳屾櫙
var frameBack = new FrameLayout();
frameBack.Y = Application.GetRealHeight(490);
@@ -306,15 +324,15 @@
btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
- var frameColor = new FrameLayoutControl();
+ var frameColor = new FrameLayoutStatuControl();
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
- frameColor.Height = Application.GetMinRealAverage(79);
+ frameColor.Height = this.GetPictrueRealSize(79);
frameColor.Y = Application.GetRealHeight(26);
frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
- var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(50), false);
+ var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(50), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
btnColorView.TextSize = 12;
@@ -329,29 +347,29 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
+ var btnColorLine = new NormalViewControl(this.GetPictrueRealSize(79), this.GetPictrueRealSize(79), false);
btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+ btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
btnColorLine.BorderWidth = 1;
btnColorLine.BorderColor = 0xff666666;
frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
+ var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
btnColor.Y = Application.GetRealHeight(5);
btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
btnColor.BackgroundColor = UserCenterColor.Current.ErrorColor;
frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
- var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
+ var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
btnRight.UnSelectedImagePath = "Item/RightNext.png";
btnRight.Y = Application.GetRealHeight(5);
- btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
+ btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
- btnRight.Y += Application.GetMinRealAverage(8);
+ btnRight.Y += this.GetPictrueRealSize(8);
frameColor.ButtonClickEvent += (sender, e) =>
{
@@ -372,10 +390,10 @@
seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
- }
-
+ }
+
#endregion
-
+
#region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
@@ -397,18 +415,18 @@
btnSwitch.ButtonClickEvent += (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- energyModeInfo.enable = btnSwitch.IsSelected;
- //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+ energyModeInfo.enable = btnSwitch.IsSelected;
+ //灞曞紑鎴栬�呯缉灏忕殑楂樺害
var value = Application.GetRealHeight(443);
if (btnSwitch.IsSelected == true)
{
- frameBack.Height += value;
+ frameBack.Height += value;
}
else
{
- frameBack.Height -= value;
+ frameBack.Height -= value;
}
- //瀹瑰櫒琛ュ厖
+ //瀹瑰櫒琛ュ厖
this.FinishInitControl(listview, energyModeInfo.enable);
};
if (energyModeInfo.enable == true)
@@ -467,21 +485,21 @@
//灞曞紑鎴栬�呯缉灏忕殑楂樺害
var value = Application.GetRealHeight(443);
frameBack.Height += value;
- }
- //娣诲姞鎺ヨ繎鎰熷簲
- this.AddProximitySensorsRow(frameBack);
- }
-
+ }
+ //娣诲姞鎺ヨ繎鎰熷簲
+ this.AddProximitySensorsRow(frameBack);
+ }
+
#endregion
-
+
#region 鈻� 鎺ヨ繎鎰熷簲___________________________
-
+
/// <summary>
/// 鎺ヨ繎鎰熷簲琛�
/// </summary>
private void AddProximitySensorsRow(FrameRowControl frameRowControl)
- {
- //鎺ヨ繎鎰熷簲琛�
+ {
+ //鎺ヨ繎鎰熷簲琛�
var frameBack = new FrameRowControl();
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.UseClickStatu = false;
@@ -492,18 +510,18 @@
//鎺ヨ繎鎰熷簲
frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
//寮�鍏虫帶浠�
- var btnSwitch = frameBack.AddMostRightSwitchIcon();
-
- btnSwitch.ButtonClickEvent += (sender, e) =>
- {
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
- proximitySensorsInfo.enable = btnSwitch.IsSelected;
- };
+ var btnSwitch = frameBack.AddMostRightSwitchIcon();
+
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ proximitySensorsInfo.enable = btnSwitch.IsSelected;
+ };
if (proximitySensorsInfo.enable == true)
{
btnSwitch.IsSelected = true;
- }
- }
+ }
+ }
#endregion
#region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
@@ -565,30 +583,30 @@
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)
{
this.CloseProgressBar();
return;
}
-
- //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
- result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
- if (result == false)
- {
- this.CloseProgressBar();
- return;
- }
-
+
+ //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+ result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+ if (result == false)
+ {
+ this.CloseProgressBar();
+ return;
+ }
+
//璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
//result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
//this.CloseProgressBar();
@@ -643,4 +661,4 @@
#endregion
}
-}
+}
--
Gitblit v1.8.0