From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 5c7d192..e8e8acc 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -38,7 +38,7 @@
/// 鏀惰棌鎸夐挳
/// </summary>
private Button collectionBtn;
-
+
/// <summary>
/// 寮�鍏�
/// </summary>
@@ -47,7 +47,7 @@
/// 婊戞潯
/// </summary>
private WaveSeekBar levelSeekBar;
-
+
private Button StatuBtn;
/// <summary>
@@ -185,7 +185,7 @@
break;
}
}
-
+
}
}
catch (Exception ex)
@@ -196,7 +196,7 @@
}
else if (typeTag == "OnlineStatusChange")
{
-
+
}
}
@@ -448,6 +448,8 @@
InitProgressBtn(itemView);
+ InitProgressBtn(itemView);
+
switchBtn = new Button()
{
Y = Application.GetRealHeight(1005),
--
Gitblit v1.8.0