From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 87 +++++--------------------------------------
1 files changed, 10 insertions(+), 77 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 080da65..da3d02d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -891,17 +891,21 @@
public class MemberShardInfoData
{
/// <summary>
- /// 鎴愬憳鐨勫叏閮ㄥ垎浜暟鎹�,閲岄潰鍖呭惈鎵�鏈夌殑鏂囦欢(keys:鎴块棿鏂囦欢鍚� value:鏂囦欢鍚�)
- /// </summary>
- public Dictionary<string, HashSet<string>> dicAllMemberShard = new Dictionary<string, HashSet<string>>();
- /// <summary>
/// 鍏ㄩ儴鐨勫垎浜枃浠剁殑涓婚敭(keys:鏂囦欢鍚� value:涓婚敭)
/// </summary>
public Dictionary<string, string> dicAllShardKeys = new Dictionary<string, string>();
/// <summary>
- /// 鍒嗕韩鎴块棿鐨勫璞�(瀹冩槸浠庝簯绔潵鐨�)
+ /// 鍒嗕韩鎴块棿鐨勫璞�(瀹冩槸浠庝簯绔潵鐨�,keys:鏂囦欢鍚�)
/// </summary>
- public Dictionary<string, Common.Room> dicShardRoom = new Dictionary<string, Common.Room>();
+ public Dictionary<string, Room> dicShardRoom = new Dictionary<string, Common.Room>();
+ /// <summary>
+ /// 鍒嗕韩鐨勬ゼ灞�
+ /// </summary>
+ public Dictionary<string, string> dicShardFloor = new Dictionary<string, string>();
+ /// <summary>
+ /// 涓存椂鍙橀噺(杩欎釜涓滆タ涓簄ull,鍗充笉鏄柊鍒嗕韩鐨勬埧闂�,鍚﹀垯鏄柊鍒嗕韩鐨勬埧闂淬�傜敤瀹岃寰楃疆绌�)
+ /// </summary>
+ public Room TempRoom = null;
/// <summary>
/// 鏄惁闇�瑕佸埛鏂�
/// </summary>
@@ -983,77 +987,6 @@
/// 搴旇鍙繙绋嬭繛鎺ョ殑鍚嶅瓧鍚�
/// </summary>
public string ConnectZigbeeMqttBrokerName = string.Empty;
- }
-
- #endregion
-
- #region 鈻� 璐﹀彿璁剧疆绫籣_________________________
-
- /// <summary>
- /// 璐﹀彿璁剧疆淇℃伅
- /// </summary>
- public class AccountOption
- {
- /// <summary>
- /// 鏄惁浣跨敤鎸囩汗楠岃瘉
- /// </summary>
- public bool FingerprintAuthentication = false;
- /// <summary>
- /// 瀵嗙爜楠岃瘉
- /// </summary>
- public string PswAuthentication = string.Empty;
- /// <summary>
- /// 鎵嬪娍楠岃瘉
- /// </summary>
- public string GestureAuthentication = string.Empty;
- /// <summary>
- /// 鏄惁浣跨敤杩滅▼寮�閿�
- /// </summary>
- public bool DoorUnLockByRemote = false;
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- public void Save()
- {
- //鍔犲瘑瀵嗙爜
- string hdlKey = "hD1(La3o";
- string oldPswAuthentication = PswAuthentication;
- PswAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldPswAuthentication);
-
- string oldGestureAuthentication = GestureAuthentication;
- GestureAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldGestureAuthentication);
-
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(this);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- string fullName = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.AccountOptionFile);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
- //杩樺師鏄庣爜
- PswAuthentication = oldPswAuthentication;
- GestureAuthentication = oldGestureAuthentication;
- }
-
- /// <summary>
- /// 鍔犺浇鏁版嵁
- /// </summary>
- /// <returns></returns>
- public AccountOption Load()
- {
- string fileName = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.AccountOptionFile);
- if (System.IO.File.Exists(fileName) == false)
- {
- return new AccountOption();
- }
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
- string strValue = System.Text.Encoding.UTF8.GetString(varByte);
- var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOption>(strValue);
- //瑙ｅ瘑瀵嗙爜
- string hdlKey = "hD1(La3o";
- info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);
- info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);
-
- return info;
- }
}
#endregion
--
Gitblit v1.8.0