From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
old mode 100755
new mode 100644
index a4368dc..dfa00d7
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -288,6 +288,7 @@
Width = Application.GetRealHeight(757),
Visible = false,
UnSelectedImagePath = "DoorLock/UnLockBlankPic.png",
+ Gravity = Gravity.CenterHorizontal,
};
blankFrameLayout.AddChidren(entryStatusPic);
@@ -316,7 +317,7 @@
blankFrameLayout.AddChidren(btnPicTip1);
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- btnPicTip1.Width = 0;
+ btnPicTip1.Width = 0;
}
}
@@ -806,17 +807,6 @@
UserView.HomePage.Instance.ScrollEnabled = true;
ZbGateway.StatusList.Remove(this);
base.RemoveFromParent();
- }
-
- public void Changed(CommonDevice common)
- {
- }
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
-
- public void ChangedISceneStatus(Scene scene)
- {
}
}
}
--
Gitblit v1.8.0