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/Panel/PanelBackLightSettionForm.cs | 290 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 155 insertions(+), 135 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index 220071e..085aae4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -40,7 +40,7 @@
/// <param name="i_listdevice">闈㈡澘璁惧鐨勫叏閮ㄥ洖璺�</param>
public void ShowForm(Panel i_panel)
{
- UserView.HomePage.Instance.ScrollEnabled = false;
+ this.ScrollEnabled = false;
this.panelDevice = i_panel;
@@ -54,10 +54,10 @@
});
}
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private async void InitMiddleFrame()
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private async void InitMiddleFrame()
{
//鑾峰彇璁惧鍒濆鏁版嵁
var result = await this.GetDeviceDefultData();
@@ -112,6 +112,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);
//寮�鍏虫帶浠�
@@ -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,55 +147,49 @@
}
//褰撳墠浜害
- 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;
+ 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);
- btnProgress1.X = Application.GetRealWidth(222);
- btnProgress1.Y = Application.GetRealHeight(158);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = energyModeInfo.level + "%";
+ 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 HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(253);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xff3e99f4;
- seekBar1.Progress = energyModeInfo.level;
+ seekBar1.ProgressBarColor = 0xff3e99f4;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
energyModeInfo.level = value;
};
+ seekBar1.Progress = energyModeInfo.level;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(325);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(325);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
if (energyModeInfo.enable == true)
@@ -196,6 +198,9 @@
var value = Application.GetRealHeight(259);
frameBack.Height += value;
frameLinght.Y += value;
+
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
}
@@ -210,12 +215,12 @@
private void AddBeforeClickProgress(FrameLayout frameLinght)
{
//鐐瑰嚮鍓�
- var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
- btnClick.Y = Application.GetRealHeight(35);
- btnClick.TextSize = 12;
- btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnClick.TextID = R.MyInternationalizationString.uBeforeClick;
+ var btnClick = new NormalViewControl(600, 49, true);
+ btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.Y = Application.GetRealHeight(35);
+ btnClick.TextSize = 12;
+ btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClick.TextID = R.MyInternationalizationString.uBeforeClick;
frameLinght.AddChidren(btnClick);
//鑳屾櫙
var frameBack = new FrameLayout();
@@ -225,68 +230,62 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(52);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(147);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xfffdb500;
- seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelDirectionsLevel = value;
+ linghtLevelInfo.panelBacklightLevel = value;
};
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(216);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
var frameColor = new FrameLayoutControl();
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
- frameColor.Height = Application.GetMinRealAverage(69);
- frameColor.Y = Application.GetRealHeight(41);
+ frameColor.Height = Application.GetMinRealAverage(79);
+ frameColor.Y = Application.GetRealHeight(26);
frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
- btnColorView.TextSize = 12;
+ btnColorView.TextSize = 12;
+ btnColorView.Y = Application.GetRealHeight(5);
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
@@ -295,15 +294,33 @@
int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);
int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69);
+
+ //棰滆壊澶栨
+ 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);
+
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ 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;
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
- btnRight.UnSelectedImagePath = "Item/Next.png";
- btnRight.BackgroundColor = UserCenterColor.Current.Green;
+ btnRight.UnSelectedImagePath = "Item/RightNext.png";
+ btnRight.Y = Application.GetRealHeight(5);
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
btnRight.Y += Application.GetMinRealAverage(8);
@@ -323,6 +340,8 @@
this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
}
@@ -338,12 +357,12 @@
private void AddAfterClickProgress(FrameLayout frameLinght)
{
//鐐瑰嚮鍚�
- var btnClick = new NormalViewControl(600, 49, true);
- btnClick.X = ControlCommonResourse.XXLeft;
- btnClick.Y = Application.GetRealHeight(536);
- btnClick.TextSize = 12;
- btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnClick.TextID = R.MyInternationalizationString.uAfterClick;
+ var btnClick = new NormalViewControl(600, 49, true);
+ btnClick.X = ControlCommonResourse.XXLeft;
+ btnClick.Y = Application.GetRealHeight(536);
+ btnClick.TextSize = 12;
+ btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnClick.TextID = R.MyInternationalizationString.uAfterClick;
frameLinght.AddChidren(btnClick);
//鑳屾櫙
var frameBack = new FrameLayout();
@@ -353,68 +372,62 @@
frameLinght.AddChidren(frameBack);
//褰撳墠浜害
var btnProgressView1 = new NormalViewControl(200, 49, true);
- btnProgressView1.X = ControlCommonResourse.XXLeft;
+ btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(52);
- btnProgressView1.TextSize = 12;
- btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+ btnProgressView1.TextSize = 12;
+ btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
var btnProgress1 = new NormalViewControl(200, 49, true);
- btnProgress1.X = Application.GetRealWidth(222);
+ btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(52);
- btnProgress1.TextSize = 12;
- btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ btnProgress1.TextSize = 12;
+ btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- var seekBar1 = new HorizontalSeekBar();
+ var seekBar1 = new SeekBarControl();
seekBar1.Y = Application.GetRealHeight(147);
- seekBar1.Gravity = Gravity.CenterHorizontal;
- seekBar1.Width = Application.GetRealWidth(962);
- seekBar1.Height = Application.GetRealHeight(81);
- seekBar1.Max = 100;
- seekBar1.BackgroundColor = 0xfff5f5f5;
- seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar1.ProgressColor = 0xff2b62fd;
- seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
frameBack.AddChidren(seekBar1);
- seekBar1.ProgressChanged += (sender, value) =>
+ seekBar1.ProgressChangedEvent += (div, value) =>
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelBacklightLevel = value;
+ linghtLevelInfo.panelDirectionsLevel = value;
};
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
- btnTemp1.X = ControlCommonResourse.XXLeft;
+ btnTemp1.X = ControlCommonResourse.XXLeft;
btnTemp1.Y = Application.GetRealHeight(216);
- btnTemp1.TextSize = 12;
- btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp1.Text = "0%";
+ btnTemp1.TextSize = 12;
+ btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp1.Text = "0%";
frameBack.AddChidren(btnTemp1);
var btnTemp2 = new NormalViewControl(200, 49, true);
- btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
+ btnTemp2.X = frameLinght.Width - Application.GetRealWidth(200 + 49);
btnTemp2.Y = Application.GetRealHeight(216);
btnTemp2.TextAlignment = TextAlignment.CenterRight;
- btnTemp2.TextSize = 12;
- btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnTemp2.Text = "100%";
+ btnTemp2.TextSize = 12;
+ btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnTemp2.Text = "100%";
frameBack.AddChidren(btnTemp2);
var frameColor = new FrameLayoutControl();
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
- frameColor.Height = Application.GetMinRealAverage(69);
- frameColor.Y = Application.GetRealHeight(41);
+ frameColor.Height = Application.GetMinRealAverage(79);
+ frameColor.Y = Application.GetRealHeight(26);
frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), Application.GetMinRealAverage(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
- btnColorView.TextSize = 12;
+ btnColorView.TextSize = 12;
+ btnColorView.Y = Application.GetRealHeight(5);
btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
btnColorView.TextID = R.MyInternationalizationString.uColor;
frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);
@@ -423,15 +436,33 @@
int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);
int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69);
+
+ //棰滆壊澶栨
+ 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);
+
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ 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;
var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);
- btnRight.UnSelectedImagePath = "Item/Next.png";
- btnRight.BackgroundColor = UserCenterColor.Current.Green;
+ btnRight.UnSelectedImagePath = "Item/RightNext.png";
+ btnRight.Y = Application.GetRealHeight(5);
btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
btnRight.Y += Application.GetMinRealAverage(8);
@@ -450,7 +481,9 @@
this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
- btnColor.BackgroundColor= this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
};
};
}
@@ -515,13 +548,14 @@
}
//鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
- this.CloseProgressBar();
if (result == false)
{
+ this.CloseProgressBar();
return;
}
//璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);
+ this.CloseProgressBar();
if (result == false)
{
return;
@@ -544,20 +578,6 @@
private uint GetColorByRGB(byte R, byte G, byte B)
{
return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
- }
-
- #endregion
-
- #region 鈻� 鐣岄潰鍏抽棴___________________________
-
- /// <summary>
- /// 鐣岄潰鍏抽棴
- /// </summary>
- public override void CloseForm()
- {
- UserView.HomePage.Instance.ScrollEnabled = true;
-
- base.CloseForm();
}
#endregion
--
Gitblit v1.8.0