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/CommonBase/Resourse/ControlCommonResourse.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
index 6959990..97a3d37 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 娉細姝ゅ彉閲忓湪涓汉涓績涓嶄娇鐢�)
@@ -68,5 +68,17 @@
/// 寰愭鐨勯棬閿佺晫闈㈡槸鍚︽槸鎵撳紑鐨勭姸鎬�
/// </summary>
public static bool IsDoorLockPageOpen = 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