From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
index 30d7a5f..9a42055 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
@@ -112,9 +112,9 @@
             ((ViewGroup)nowForm).AddChidren(MsgControlFrameLayout);
             MsgControlFrameLayout.MouseDownEventHandler += (sender, e) =>
             {
-                if (msgType == DoorLockMsgType.InValid)
-                {
-                    return;
+                if (msgType == DoorLockMsgType.InValid)
+                {
+                    return;
                 }
 
                 //绉婚櫎鐣岄潰
@@ -236,7 +236,7 @@
         /// <param name="frameBack"></param>
         private void InitInValidTimeDialog(FrameLayout frameBack)
         {
-            //娑堟伅 
+            //娑堟伅
             string[] msgArray = msgText.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
             var btnMsg1 = new Button()
             {
@@ -343,16 +343,16 @@
                 this.InvalidClickEvent?.Invoke();
                 this.InvalidClickEvent = null;
             };
-        }
-
+        }
+
         /// <summary>
         /// 澶辨晥鏃堕棿鐨勫簳閮ㄦ寜閽�
         /// </summary>
         /// <param name="frameMain"></param>
         /// <param name="frameBack"></param>
         private void InitBottomInvalidTimeButton(FrameLayout frameMain, FrameLayout frameBack)
-        {
-            //纭畾鎸夐挳
+        {
+            //纭畾鎸夐挳
             var btnConfirm = new BottomRightClickButton(frameBack.Width, Application.GetRealHeight(127));
             frameBack.AddChidren(btnConfirm);
             btnConfirm.InitControl(buttonOkText);

--
Gitblit v1.8.0