From f17bb6c60db1f24ce05df96aa27d4680e2df0ce6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 一月 2020 17:16:13 +0800
Subject: [PATCH] 请合并最新代码，（优化代码格式，完成开会后的细节测试）
---
ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index cebfb54..0db4aae 100644
--- a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -7,7 +7,7 @@
{
public class FunctionSetting : DoorLockCommonLayout, ZigBee.Common.IStatus
{
- #region 鈼� 鏋勯�犲嚱鏁癬_________________________
+ #region 鏋勯�犲嚱鏁�
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -22,7 +22,7 @@
}
#endregion
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
public ZigBee.Device.DoorLock doorLock = null;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
@@ -53,7 +53,7 @@
FrameLayout bottomFrameLayout;
#endregion
- #region 鈼� UI鏄剧ず __________________________
+ #region UI鏄剧ず
/// <summary>
/// UI鏄剧ず
/// </summary>
@@ -74,9 +74,9 @@
}
#endregion
- #region 鈼� 涓儴鏄剧ず __________________________
+ #region 涓儴鏄剧ず
public void MidFrameLayoutContent()
- {
+ {
//鍥剧墖
var btnPic = new DeviceInfoIconControl();
btnPic.Y = Application.GetRealHeight(92);
@@ -99,7 +99,7 @@
}
#endregion
- #region 鈼� 搴曢儴鏄剧ず __________________________
+ #region 搴曢儴鏄剧ず
public void BottomFrameLayout()
{
#region UI
@@ -136,7 +136,7 @@
}
#endregion
- #region 鈼� 鍔熻兘鏄剧ず __________________________
+ #region 鍔熻兘鏄剧ず
void FunctionDetail(ZigBee.Device.DoorLock doorLock)
{
listview.RemoveAll();
@@ -228,10 +228,10 @@
this.CloseForm();
}
};
- }
+ }
#endregion
-
- #region 娣诲姞鍏ㄩ儴鑿滃崟
+
+ #region 娣诲姞鍏ㄩ儴鑿滃崟
/// <summary>
/// 娣诲姞鍏ㄩ儴鑿滃崟
/// </summary>
@@ -244,7 +244,7 @@
//娣诲姞銆愯繙绋嬪紑閿併�戣
this.AddRemoteUnLocksRow();
//娣诲姞銆愰棬閿佹椂闂淬�戣
- this.AddDoorLocksTimeRow();
+ this.AddDoorLocksTimeRow();
}
else
{
@@ -404,7 +404,7 @@
#endregion
- #region 鈼� 璁惧閲嶅懡鍚峗_________________________
+ #region 璁惧閲嶅懡鍚�
/// <summary>
/// 璁惧閲嶅懡鍚�
/// </summary>
@@ -445,7 +445,7 @@
}
#endregion
- #region 鈼� 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout__________________________
+ #region 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
@@ -466,7 +466,7 @@
}
#endregion
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
+ #region 鎺ュ彛瀹炵幇
/// <summary>
/// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
/// </summary>
--
Gitblit v1.8.0