From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 5e32bbc..0695856 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -13,7 +13,7 @@
/// <summary>
/// The action.
/// </summary>
- public Action action;
+ public Action<DeviceUI, Common.Room> action;
///// <summary>
///// The top view.
///// </summary>
@@ -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;
}
}
@@ -211,8 +206,8 @@
{
ZbGateway.StatusList.Remove(this);
UserView.HomePage.Instance.ScrollEnabled = true;
- //action();
- //action = null;
+ action(device, room);
+ action = null;
if (IsDrawerLockMode)
{
CommonPage.Instance.IsDrawerLockMode = false;
@@ -314,9 +309,9 @@
UserView.HomePage.Instance.AddChidren(detailInfo);
UserView.HomePage.Instance.PageIndex += 1;
detailInfo.Show(device, room);
- detailInfo.EditAction = (d,r) =>
+ detailInfo.EditAction += (curDev, curRoom) =>
{
- Show(device, room);
+ Show(curDev, curRoom);
};
}
@@ -376,7 +371,7 @@
Width = Application.GetRealWidth(500),
Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterHorizontal,
- Text = device.CommonDevice.DeviceEpointName,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextSize = 15,
IsBold=true
@@ -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()
@@ -525,7 +518,10 @@
Height = Application.GetMinReal(104),
UnSelectedImagePath = "Item/ProgressBubbles.png",
Visible = false,
- Gravity = Gravity.CenterHorizontal
+ Gravity = Gravity.CenterHorizontal,
+ TextSize = 14,
+ IsBold = true,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor
};
layout.AddChidren(ProgressBtn);
}
@@ -559,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);
}
}
@@ -578,8 +574,7 @@
/// </summary>
private void InitCollection()
{
- var dev = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
- if (dev == null)
+ if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
{
collectionBtn.IsSelected = false;
}
--
Gitblit v1.8.0