From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 58 +++++++++++-----------------------------------------------
1 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index fd3af7f..064fea3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -14,15 +14,7 @@
/// 鐢婚潰鎵撳紑鏃讹紝浼氳嚜鍔ㄨ拷鍑伙紝鐢婚潰鍏抽棴鏃讹紝鑷姩绉婚櫎銆�
/// Key:鐢婚潰鐨処D锛屽垪濡傦細UserMainForm
/// </summary>
- public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
- /// <summary>
- /// 鐢ㄦ埛鐧诲綍鐨勪俊鎭紦瀛橈紝鍒囨崲鍒颁釜浜轰腑蹇冧富鐣岄潰鏃讹紝灏变細鍒锋柊
- /// </summary>
- public static UserInformation UserInfo = new UserInformation();
- /// <summary>
- /// 璐﹀彿鐨勮缃俊鎭�
- /// </summary>
- public static AccountOption Option = new AccountOption();
+ public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
/// <summary>
/// 鎴愬憳鍒楄〃鐨勪俊鎭�
/// </summary>
@@ -34,50 +26,22 @@
/// <summary>
/// 褰撳墠鎵撳紑鐨勫叏閮ㄧ敾闈D
/// </summary>
- public static List<string> listActionFormId = new List<string>();
+ public static List<string> listActionFormId = new List<string>();
/// <summary>
- /// 鎺ュ彈缃戝叧鍦ㄧ嚎鐘舵�佹帹閫佺殑鐣岄潰
+ /// 鐢ㄦ埛鐧诲綍鐨勪俊鎭紦瀛橈紝鍒囨崲鍒颁釜浜轰腑蹇冧富鐣岄潰鏃讹紝灏变細鍒锋柊
/// </summary>
- public static List<CommonFormBase> listGatewayOnlinePushForm = new List<CommonFormBase>();
+ public static UserInformation UserInfo = new UserInformation();
/// <summary>
- /// 鎺ュ彈璁惧灞炴�у彉鏇存帹閫佺殑鐣岄潰
- /// </summary>
- public static List<CommonFormBase> listDeviceAttributePushForm = new List<CommonFormBase>();
+ /// 璐﹀彿鐨勮缃俊鎭�
+ /// </summary>
+ public static AccountOption Option = new AccountOption();
/// <summary>
- /// 鍓嶄竴娆＄殑浣忓畢ID锛岃繖涓笢瑗挎槸缁橴serCenterLogic.InitUserCenterMenmoryAndThread()鐢ㄧ殑
+ /// 闅愬尶閰嶇疆
/// </summary>
- public static string oldHomeStringId = string.Empty;
+ public static HideOptionInfo HideOption = new HideOptionInfo();
/// <summary>
- /// 鍓嶄竴娆＄殑鐧诲綍璐﹀彿锛岃繖涓笢瑗挎槸缁橴serCenterLogic.InitUserCenterMenmoryAndThread()鐢ㄧ殑
+ /// 鏂囦欢鍔犲瘑绉橀挜
/// </summary>
- public static string oldAccountId = string.Empty;
- /// <summary>
- /// 妫�娴婣PP鏄惁鑳藉閫�鍑�
- /// </summary>
- public static bool AppCanSignout = false;
- /// <summary>
- /// 鏈湴鏍圭洰褰曡矾寰�
- /// </summary>
- public static string LocalRootPath = string.Empty;
- /// <summary>
- /// 鐢ㄦ埛鍥剧墖鐩綍璺緞
- /// </summary>
- public static string UserPictruePath = string.Empty;
- /// <summary>
- /// 瀹夐槻鎶ヨ淇℃伅璁板綍涓�澶╁唴鏈�澶х殑鎶ヨ鏁�
- /// </summary>
- public static int SafetyOnedayMaxAlarmMsgCount = 50;
- /// <summary>
- /// 瀹夐槻鎶ヨ淇℃伅璁板綍鏈�澶уぉ鏁�
- /// </summary>
- public static int SafetyMaxAlarmMsgDay = 5;
- /// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅璁板綍涓�澶╁唴鏈�澶х殑鎶ヨ鏁�
- /// </summary>
- public static int DoorLockOnedayMaxAlarmMsgCount = 200;
- /// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅璁板綍鏈�澶уぉ鏁�
- /// </summary>
- public static int DoorLockMaxAlarmMsgDay = 5;
+ public const string FileEncryptKey = "4^Olh_3f";
}
}
--
Gitblit v1.8.0