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/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
index ce40ff6..052c20c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
@@ -54,7 +54,7 @@
set { btnSleepTime.Text = value; }
}
/// <summary>
- ///鐫＄湢鏃堕棿
+ ///鐫＄湢鏃堕棿
/// </summary>
public NormalViewControl btnSleepTime = null;
#endregion
@@ -133,7 +133,7 @@
#endregion
- #region 鈻� 灞忓箷浜害绾у埆_______________________
+ #region 鈻� 灞忓箷浜害绾у埆_______________________
/// <summary>
/// 娣诲姞灞忓箷浜害绾у埆鎺т欢
/// </summary>
@@ -346,7 +346,7 @@
int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
+ //棰滆壊澶栨
var btnColorLine = new FrameLayoutStatuControl();
btnColorLine.Width = Application.GetRealHeight(79);
btnColorLine.Height = this.GetPictrueRealSize(79);
@@ -414,7 +414,7 @@
#endregion
- #region 鈻� 鑺傝兘妯″紡琛宊________________________
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
/// </summary>
@@ -513,7 +513,7 @@
}
//娣诲姞鎺ヨ繎鎰熷簲
this.AddProximitySensorsRow(frameBack);
- //搴曠嚎
+ //搴曠嚎
var btnLine = new NormalViewControl(965, 5, true);
btnLine.Height = 1;
btnLine.X = Application.GetRealWidth(52);
@@ -619,7 +619,7 @@
};
}
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
+ #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
/// <summary>
/// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
/// </summary>
@@ -635,7 +635,7 @@
var form = new BottomItemSelectForm();
form.CancelCallEvent = false;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
+ form.AddForm(title, listText, null, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo)
@@ -747,7 +747,7 @@
}
#endregion
- #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+ #region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
--
Gitblit v1.8.0