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/Curtain/RollerShadeControl.cs | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index 5fcf1b2..fbeff98 100644
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -384,7 +384,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
@@ -840,37 +840,6 @@
{
ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);
ProgressBtn.Text = mProgress + "%";
- }
-
-
- /// <summary>
- /// 娣诲姞杩涘害鎸夐挳
- /// </summary>
- private void InitProgressBtnForCurtain(FrameLayout layout)
- {
- ProgressBtnX = curtainSeekBar.X - Application.GetMinReal(20);
- ProgressBtn = new Button()
- {
- X = ProgressBtnX,
- Y = curtainSeekBar.Y + curtainSeekBar.Height / 2 - Application.GetMinReal(180),
- Width = Application.GetMinReal(135),
- Height = Application.GetMinReal(104),
- UnSelectedImagePath = "Item/ProgressBubbles.png",
- Visible = false,
- TextSize = 14,
- IsBold = true,
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor
- };
- layout.AddChidren(ProgressBtn);
- }
-
- /// <summary>
- /// OnProgressButtonMove
- /// </summary>
- private void OnProgressButtonMoveForCurtain(int mProgress)
- {
- ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);
- ProgressBtn.Text = mProgress + "%";
}
#endregion
--
Gitblit v1.8.0