From 587c36e27131f2d028fcabc13b296a8de7470034 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 08 一月 2020 08:59:19 +0800
Subject: [PATCH] 2019.1.8
---
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 2a86275..5464f85 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -139,7 +139,6 @@
{
dimmableLight = deviceUI.CommonDevice as DimmableLight;
dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
- //璁板綍銆佹洿鏂扮姸鎬�
if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
{
return;
@@ -151,16 +150,13 @@
if (switchBtn.IsSelected == true)
{
levelSeekBar.IsClickable = true;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarColor;
- //levelSeekBar.Progress = 100;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
}
else
{
levelSeekBar.IsClickable = false;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor;
- //levelSeekBar.Progress = 0;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
- //change color
dimmableLight.LastDateTime = DateTime.Now;
}
//浜害
@@ -181,7 +177,6 @@
dimmableLight.LastDateTime = DateTime.Now;
levelSeekBar.Progress = (int)(dimmableLight.Level*1.0/MaxLevel*100);
StatuBtn.Text = switchBtn.IsSelected ? $"{Language.StringByID(R.MyInternationalizationString.CurrentLightLevel)} { device.GetDeviceStatu()}" : $"{Language.StringByID(R.MyInternationalizationString.Current)} {Language.StringByID(R.MyInternationalizationString.Shut)}";
-
break;
}
}
@@ -405,7 +400,7 @@
WavePadding = Application.GetRealWidth(8),
MaxValue=100,
Progress = (int)(dimmableLight.Level*1.0/MaxLevel*100),
- WaveColor = ZigbeeColor.Current.GXCWaveSeekBarColor,
+
CornerRadius= Application.GetRealHeight(58)
};
@@ -414,12 +409,12 @@
if (dimmableLight.OnOffStatus == 1)
{
levelSeekBar.IsClickable = true;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarColor;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
}
else
{
levelSeekBar.IsClickable = false;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
levelSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
@@ -433,6 +428,7 @@
{
ProgressBtn.Visible = false;
levelSeekBar.IsProgressTextShow = true;
+ dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
};
levelSeekBar.OnProgressChangedEvent += (send2, e2) =>
@@ -441,13 +437,10 @@
OnProgressButtonMove(e2);
//鍒ゆ柇鏄惁300ms灞忚斀
- if (levelSeekBar.IsProgressChangeDelay()) return;
-
- dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
+ //if (levelSeekBar.IsProgressChangeDelay()) return;
+ //dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
};
- InitProgressBtn(itemView);
-
InitProgressBtn(itemView);
switchBtn = new Button()
@@ -562,13 +555,13 @@
{
dimmableLight.SwitchControl(1);
levelSeekBar.IsClickable = true;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarColor;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
}
else
{
dimmableLight.SwitchControl(0);
levelSeekBar.IsClickable = false;
- levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor;
+ levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
}
--
Gitblit v1.8.0