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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
index da41e2c..aef9c47 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
@@ -30,9 +30,12 @@
/// </summary>
public static int TopFrameHeight = Application.GetRealHeight(110);
/// <summary>
- /// 鐢婚潰BodyFrameLayout鐨勯珮搴�(楂樺害锛�1736)
+ /// 鐢婚潰BodyFrameLayout鐨勯珮搴�(涓嶈兘鐩存帴鎸囧畾鏁板��,涓嶇劧鏈夊彲鑳戒細鍑虹幇璇樊,瀵艰嚧鏃犳硶閾烘弧)
/// </summary>
- public static int BodyFrameHeight = Application.GetRealHeight(1920 - 184);
+ public static int BodyFrameHeight
+ {
+ get { return UserView.HomePage.Instance.Height - TopMenuFrameHeight - TopFrameHeight; }
+ }
/// <summary>
/// 鐢婚潰BottomFrameLayout鐨勯珮搴�(楂樺害锛�141 娉細姝ゅ彉閲忓湪涓汉涓績涓嶄娇鐢�)
/// </summary>
@@ -61,5 +64,25 @@
/// 搴曠嚎楂樺害(鐩存帴鎸囧畾涓嶉渶瑕佸啀娆¤绠楃殑鐪熷疄鍊�)
/// </summary>
public static int BottomLineHeight = 1;
+ /// <summary>
+ /// 闂ㄩ攣鐣岄潰鏄惁鏄洿鏂扮姸鎬�
+ /// </summary>
+ 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