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 | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
old mode 100755
new mode 100644
index 1f0f84f..0695856
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -371,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
@@ -400,7 +400,7 @@
WavePadding = Application.GetRealWidth(8),
MaxValue=100,
Progress = (int)(dimmableLight.Level*1.0/MaxLevel*100),
-
+
CornerRadius= Application.GetRealHeight(58)
};
@@ -417,30 +417,30 @@
levelSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
- levelSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
- {
- OnProgressButtonMove(levelSeekBar.Progress);
- levelSeekBar.IsProgressTextShow = false;
- ProgressBtn.Visible = true;
- };
-
- levelSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
- {
- ProgressBtn.Visible = false;
- levelSeekBar.IsProgressTextShow = true;
- dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
- };
-
- levelSeekBar.OnProgressChangedEvent += (send2, e2) =>
+ levelSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
+ {
+ OnProgressButtonMove(levelSeekBar.Progress);
+ levelSeekBar.IsProgressTextShow = false;
+ ProgressBtn.Visible = true;
+ };
+
+ levelSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
+ {
+ ProgressBtn.Visible = false;
+ levelSeekBar.IsProgressTextShow = true;
+ dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
+ };
+
+ levelSeekBar.OnProgressChangedEvent += (send2, e2) =>
{
- OnProgressButtonMove(e2);
-
- //鍒ゆ柇鏄惁300ms灞忚斀
- //if (levelSeekBar.IsProgressChangeDelay()) return;
- //dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
- };
-
+ OnProgressButtonMove(e2);
+
+ //鍒ゆ柇鏄惁300ms灞忚斀
+ //if (levelSeekBar.IsProgressChangeDelay()) return;
+ //dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
+ };
+
InitProgressBtn(itemView);
switchBtn = new Button()
@@ -496,34 +496,34 @@
itemView.AddChidren(roomName);
}
- /// <summary>
- /// OnProgressButtonMove
- /// </summary>
- private void OnProgressButtonMove(int mProgress)
- {
- ProgressBtn.Y = ProgressBtnY + levelSeekBar.NowProgressY;
- ProgressBtn.Text = mProgress + "%";
- }
-
- /// <summary>
- /// 娣诲姞杩涘害鎸夐挳
- /// </summary>
+ /// <summary>
+ /// OnProgressButtonMove
+ /// </summary>
+ private void OnProgressButtonMove(int mProgress)
+ {
+ ProgressBtn.Y = ProgressBtnY + levelSeekBar.NowProgressY;
+ ProgressBtn.Text = mProgress + "%";
+ }
+
+ /// <summary>
+ /// 娣诲姞杩涘害鎸夐挳
+ /// </summary>
private void InitProgressBtn(FrameLayout layout)
- {
- ProgressBtnY = levelSeekBar.Y - Application.GetMinReal(154);
- ProgressBtn = new Button()
- {
- Y = ProgressBtnY,
- Width = Application.GetMinReal(135),
- Height = Application.GetMinReal(104),
- UnSelectedImagePath = "Item/ProgressBubbles.png",
- Visible = false,
- Gravity = Gravity.CenterHorizontal,
+ {
+ ProgressBtnY = levelSeekBar.Y - Application.GetMinReal(154);
+ ProgressBtn = new Button()
+ {
+ Y = ProgressBtnY,
+ Width = Application.GetMinReal(135),
+ Height = Application.GetMinReal(104),
+ UnSelectedImagePath = "Item/ProgressBubbles.png",
+ Visible = false,
+ Gravity = Gravity.CenterHorizontal,
TextSize = 14,
IsBold = true,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor
- };
- layout.AddChidren(ProgressBtn);
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ layout.AddChidren(ProgressBtn);
}
#endregion
--
Gitblit v1.8.0