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/PanelBackLighWithSensorForm.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index 37db0f1..0b347a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -7,7 +7,7 @@
{
public class PanelBackLighWithSensorForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
@@ -51,7 +51,7 @@
set { btnSleepTime.Text = value; }
}
/// <summary>
- ///鐫＄湢鏃堕棿
+ ///鐫＄湢鏃堕棿
/// </summary>
public NormalViewControl btnSleepTime = null;
@@ -123,7 +123,7 @@
#endregion
- #region 鈻� 鑺傝兘妯″紡琛宊________________________
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
/// </summary>
@@ -219,7 +219,7 @@
//娣诲姞鎺ヨ繎鎰熷簲
this.AddProximitySensorsRow(frameBack);
- //搴曠嚎
+ //搴曠嚎
var btnLine = new NormalViewControl(965, 5, true);
btnLine.Height = 1;
btnLine.X = Application.GetRealWidth(52);
@@ -326,7 +326,7 @@
}
#endregion
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
+ #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
/// <summary>
/// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
/// </summary>
@@ -342,7 +342,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)
@@ -448,7 +448,7 @@
int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 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);
@@ -775,7 +775,7 @@
#endregion
- #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+ #region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
@@ -814,6 +814,6 @@
return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
}
- #endregion
+ #endregion
}
}
--
Gitblit v1.8.0