From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 138 ++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 3912540..22fb634 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Shared.Common;
+using System;
using System.Collections.Generic;
namespace Shared.Phone.UserCenter
@@ -59,7 +60,25 @@
/// <summary>
/// 鐢ㄦ埛鍥炬爣鏂囦欢
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string UserIconFile = string.Empty;
+ /// <summary>
+ /// 鐢ㄦ埛鍥炬爣鏂囦欢鏄惁鏀瑰彉
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool UserIconFileChanged = false;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public byte[] HeadImage = null;
+ /// <summary>
+ /// 鎵嬪娍瀵嗙爜(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public string GesturePwd = string.Empty;
+ /// <summary>
+ /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public string StringPwd = string.Empty;
}
/// <summary>
@@ -151,6 +170,10 @@
/// 鎵嬫満鍙�
/// </summary>
public string Phone = string.Empty;
+ /// <summary>
+ /// 澶村儚鏁版嵁
+ /// </summary>
+ public byte[] HeadImage = null;
}
#endregion
@@ -169,7 +192,7 @@
/// <summary>
/// 鎴块棿鍚嶇О
/// </summary>
- public List<string> listRoomName = new List<string>();
+ public string RoomName = string.Empty;
/// <summary>
/// 璁惧鐨勬墦寮�鐘舵��
/// </summary>
@@ -890,17 +913,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>
@@ -986,74 +1013,67 @@
#endregion
- #region 鈻� 璐﹀彿璁剧疆绫籣_________________________
+ #region 鈻� 浣忓畢淇℃伅绫籣_________________________
/// <summary>
- /// 璐﹀彿璁剧疆淇℃伅
+ /// 缂栬緫浣忓畢鐨勫惎鍔ㄥ弬鏁�
/// </summary>
- public class AccountOption
+ public class EditorResidencePra : IfacePraCommon
{
/// <summary>
- /// 鏄惁浣跨敤鎸囩汗楠岃瘉
+ /// RequestVersion
/// </summary>
- public bool FingerprintAuthentication = false;
+ public string RequestVersion = Common.CommonPage.RequestVersion;
/// <summary>
- /// 瀵嗙爜楠岃瘉
+ /// LoginAccessToken
/// </summary>
- public string PswAuthentication = string.Empty;
+ public string LoginAccessToken = Common.Config.Instance.Token;
/// <summary>
- /// 鎵嬪娍楠岃瘉
+ /// ZigbeeHomeId
/// </summary>
- public string GestureAuthentication = string.Empty;
+ public string HomeId = "";
/// <summary>
- /// 鏄惁浣跨敤杩滅▼寮�閿�
+ /// Name
/// </summary>
- public bool DoorUnLockByRemote = false;
+ public string Name = string.Empty;
/// <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;
- }
-
+ public double Longitude = 0;
/// <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;
- }
+ public double Latitude = 0;
}
+ #endregion
+ #region 鈻� 娑堟伅绠＄悊绫籣_________________________
+
+ /// <summary>
+ /// 淇℃伅缁撴灉
+ /// </summary>
+ public class MessageRecordInfo
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public string RegId = string.Empty;
+ /// <summary>
+ /// 娑堟伅鍐呭
+ /// </summary>
+ public string MsgContent = string.Empty;
+ /// <summary>
+ /// MsgType
+ /// </summary>
+ public string MsgType = string.Empty;
+ /// <summary>
+ /// 鏄惁宸茶
+ /// </summary>
+ public int IsRead = 0;
+ /// <summary>
+ /// 鏃堕棿 2019-09-10T13:11:55
+ /// </summary>
+ public string MsgTime = string.Empty;
+ }
#endregion
}
--
Gitblit v1.8.0