From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
index 6959990..aef9c47 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
@@ -34,7 +34,7 @@
/// </summary>
public static int BodyFrameHeight
{
- get { return UserView.HomePage.Instance.Height - Application.GetRealHeight(184); }
+ get { return UserView.HomePage.Instance.Height - TopMenuFrameHeight - TopFrameHeight; }
}
/// <summary>
/// 鐢婚潰BottomFrameLayout鐨勯珮搴�(楂樺害锛�141 娉細姝ゅ彉閲忓湪涓汉涓績涓嶄娇鐢�)
@@ -65,8 +65,24 @@
/// </summary>
public static int BottomLineHeight = 1;
/// <summary>
- /// 寰愭鐨勯棬閿佺晫闈㈡槸鍚︽槸鎵撳紑鐨勭姸鎬�
+ /// 闂ㄩ攣鐣岄潰鏄惁鏄洿鏂扮姸鎬�
/// </summary>
- public static bool IsDoorLockPageOpen = false;
+ public static Action<bool> UpdateDoorLockStatusAction = null;
+ /// <summary>
+ /// 鏄惁鏄晫闈㈡鍦ㄥ姞杞戒腑(搴曞眰涓撶敤,涓嶉渶瑕佺悊)
+ /// </summary>
+ public static bool IsFormAdding = false;
+#if Android
+ /// <summary>
+ /// 涓や釜鏂囨湰鎷兼帴鏃�,涓轰簡鐪嬭捣鏉ユ槸姝ｅ父鐨勶紝闇�瑕佸噺鍘诲畠浠箣闂寸殑闂撮殧璇樊
+ /// </summary>
+ public static int TwoTextSpace = Application.GetRealWidth(20);
+#endif
+#if iOS
+ /// <summary>
+ /// 涓や釜鏂囨湰鎷兼帴鏃�,涓轰簡鐪嬭捣鏉ユ槸姝ｅ父鐨勶紝闇�瑕佸噺鍘诲畠浠箣闂寸殑闂撮殧璇樊
+ /// </summary>
+ public static int TwoTextSpace = Application.GetRealWidth(10);
+#endif
}
}
--
Gitblit v1.8.0