From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 8383026..5ce1f29 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -22,7 +22,7 @@
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
- view.toptitleNameBtn.Text = Name;
+ view.toptitleNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -270,10 +270,10 @@
Send.dictionary(brightnessDictionary, "Data2", "0");
var horizontalSeekBarVol = new DiyImageSeekBar
{
- Y = Application.GetRealHeight(140),
- X = Application.GetRealWidth(78),
- Width = Application.GetRealWidth(918),
- Height = Application.GetRealHeight(320),//婊戝姩鏉＄埗鎺т欢楂樺害
+ Y = Application.GetRealHeight(140),//杩涘害鏉＄埗鎺т欢Y鍧愭爣
+ X = Application.GetRealWidth(78),//杩涘害鏉鍧愭爣
+ Width = Application.GetRealWidth(918),//杩涘害鏉＄殑闀垮害
+ Height = Application.GetRealHeight(320),//杩涘害鏉＄埗鎺ф帶浠堕珮搴�
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
--
Gitblit v1.8.0