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/CommonBase/Resourse/ControlCommonResourse.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
index 2d09b24..6959990 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
@@ -10,6 +10,18 @@
public class ControlCommonResourse
{
/// <summary>
+ /// 娑堟伅绠＄悊鎸夐敭(姝ゅ彉閲忎氦鐢卞簳灞傚鐞�,鍚勭晫闈笉闇�瑕佸鐞�)
+ /// </summary>
+ public static List<MessageManagementControl> listMessageManaContr = new List<MessageManagementControl>();
+ /// <summary>
+ /// 娑堟伅绠＄悊鏄惁鏉ヤ簡鏂版秷鎭�(姝ゅ彉閲忎氦鐢卞簳灞傚鐞�,鍚勭晫闈笉闇�瑕佸鐞�)
+ /// </summary>
+ public static bool HadNewMessage = false;
+ /// <summary>
+ /// 鏄惁閲嶆柊璇诲彇娑堟伅璁板綍(姝ゅ彉閲忎氦鐢卞簳灞傚鐞�,鍚勭晫闈笉闇�瑕佸鐞�)
+ /// </summary>
+ public static bool ReadMessageAgain = true;
+ /// <summary>
/// 鐢婚潰TopFrameLayout鏈�涓婇潰鑿滃崟鐨勯珮搴�(楂樺害锛�74)
/// </summary>
public static int TopMenuFrameHeight = Application.GetRealHeight(74);
@@ -18,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 - Application.GetRealHeight(184); }
+ }
/// <summary>
/// 鐢婚潰BottomFrameLayout鐨勯珮搴�(楂樺害锛�141 娉細姝ゅ彉閲忓湪涓汉涓績涓嶄娇鐢�)
/// </summary>
@@ -49,5 +64,9 @@
/// 搴曠嚎楂樺害(鐩存帴鎸囧畾涓嶉渶瑕佸啀娆¤绠楃殑鐪熷疄鍊�)
/// </summary>
public static int BottomLineHeight = 1;
+ /// <summary>
+ /// 寰愭鐨勯棬閿佺晫闈㈡槸鍚︽槸鎵撳紑鐨勭姸鎬�
+ /// </summary>
+ public static bool IsDoorLockPageOpen = false;
}
}
--
Gitblit v1.8.0