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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 8fc9f88..064fea3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -26,15 +26,7 @@
/// <summary>
/// 褰撳墠鎵撳紑鐨勫叏閮ㄧ敾闈D
/// </summary>
- public static List<string> listActionFormId = new List<string>();
- /// <summary>
- /// 鎺ュ彈缃戝叧鍦ㄧ嚎鐘舵�佹帹閫佺殑鐣岄潰
- /// </summary>
- public static List<CommonFormBase> listGatewayOnlinePushForm = new List<CommonFormBase>();
- /// <summary>
- /// 鎺ュ彈璁惧灞炴�у彉鏇存帹閫佺殑鐣岄潰
- /// </summary>
- public static List<CommonFormBase> listDeviceAttributePushForm = new List<CommonFormBase>();
+ public static List<string> listActionFormId = new List<string>();
/// <summary>
/// 鐢ㄦ埛鐧诲綍鐨勪俊鎭紦瀛橈紝鍒囨崲鍒颁釜浜轰腑蹇冧富鐣岄潰鏃讹紝灏变細鍒锋柊
/// </summary>
@@ -43,5 +35,13 @@
/// 璐﹀彿鐨勮缃俊鎭�
/// </summary>
public static AccountOption Option = new AccountOption();
+ /// <summary>
+ /// 闅愬尶閰嶇疆
+ /// </summary>
+ public static HideOptionInfo HideOption = new HideOptionInfo();
+ /// <summary>
+ /// 鏂囦欢鍔犲瘑绉橀挜
+ /// </summary>
+ public const string FileEncryptKey = "4^Olh_3f";
}
}
--
Gitblit v1.8.0