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/UserCenterResourse.cs | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 8fc9f88..38bb2ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -14,11 +14,7 @@
/// 鐢婚潰鎵撳紑鏃讹紝浼氳嚜鍔ㄨ拷鍑伙紝鐢婚潰鍏抽棴鏃讹紝鑷姩绉婚櫎銆�
/// Key:鐢婚潰鐨処D锛屽垪濡傦細UserMainForm
/// </summary>
- public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
- /// <summary>
- /// 鎴愬憳鍒楄〃鐨勪俊鎭�
- /// </summary>
- public static List<MemberInfoRes> ListMemberInfo = new List<MemberInfoRes>();
+ public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
/// <summary>
/// 褰撳墠姝ｅ湪鎿嶄綔鐨勭敾闈D(姝ゅ彉閲忓涓存椂鏂綉鏃�,闈炲父閲嶈,娌′汉浼氭噦瀹冧负浣曡瀛樺湪)
/// </summary>
@@ -26,15 +22,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>
@@ -42,6 +30,22 @@
/// <summary>
/// 璐﹀彿鐨勮缃俊鎭�
/// </summary>
- public static AccountOption Option = new AccountOption();
+ public static AccountOptionClass AccountOption = new AccountOptionClass();
+ /// <summary>
+ /// 浣忓畢鐨勮缃俊鎭�
+ /// </summary>
+ public static ResidenceOptionClass ResidenceOption = new ResidenceOptionClass();
+ /// <summary>
+ /// 闅愬尶閰嶇疆
+ /// </summary>
+ public static HideOptionInfo HideOption = new HideOptionInfo();
+ /// <summary>
+ /// 娴嬭瘯鑳藉惁骞挎挱寰楀埌缃戝叧,閫氬父鎯呭喌涓嬩负null
+ /// </summary>
+ public static Dictionary<string, ZbGateway> DicReceiveGatewayTest = null;
+ /// <summary>
+ /// 鏂囦欢鍔犲瘑绉橀挜
+ /// </summary>
+ public const string FileEncryptKey = "4^Olh_3f";
}
}
--
Gitblit v1.8.0