From ade5917841b0fdcb1df7353ef7c56b1a1bdc9282 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:03:32 +0800
Subject: [PATCH] 删除 Gateway.Ios文件

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs |  445 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 433 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 989af37..936bcae 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
@@ -13,7 +14,7 @@
         /// <summary>
         /// 鏄惁鏄瓙璐﹀彿杩涜鎿嶄綔
         /// </summary>
-        public bool IsOtherAccountCtrl = Common.Config.Instance.isAdministrator;
+        public bool IsOtherAccountCtrl = Common.Config.Instance.Home.IsOthreShare;
     }
 
     #endregion
@@ -33,8 +34,14 @@
         /// </summary>
         public string UserName = string.Empty;
         /// <summary>
+        /// 璁板綍涓婁竴娆＄殑鐢ㄦ埛鏄电О(缁欎釜浜轰腑蹇冧慨鏀规樀绉版椂鐢ㄧ殑)
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public string OldUserName = string.Empty;
+        /// <summary>
         /// DistributedMark
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public string DistributedMark = string.Empty;
         /// <summary>
         /// 閭
@@ -55,11 +62,37 @@
         /// <summary>
         /// 鐧婚檰鏉冮檺缂栧彿鐨勭炕璇戝悕锛�1:涓昏处鍙疯嚜宸�(鏈汉)  2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳  3:鎴愬憳
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public string AuthorityText = string.Empty;
+        /// <summary>
+        /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public byte[] HeadImage = null;
+        /// <summary>
+        /// 鎵嬪娍瀵嗙爜(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string GesturePwd = string.Empty;
+        /// <summary>
+        /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string StringPwd = string.Empty;
+
+
         /// <summary>
         /// 鐢ㄦ埛鍥炬爣鏂囦欢
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public string UserIconFile = string.Empty;
+        /// <summary>
+        /// 鐢ㄦ埛鍥炬爣鏂囦欢鏄惁鏀瑰彉
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool UserIconFileChanged = false;
+        /// <summary>
+        /// 鏄惁鍒濆鍖栫敤鎴蜂俊鎭垚鍔�
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool InitUserInfoSuccess = false;
     }
 
     /// <summary>
@@ -82,6 +115,17 @@
         /// 鐢ㄦ埛鍚�
         /// </summary>
         public string UserName = string.Empty;
+    }
+
+    /// <summary>
+    /// 鏄电О淇℃伅
+    /// </summary>
+    public class NicknameInfo
+    {
+        /// <summary>
+        /// 鏄电О
+        /// </summary>
+        public string nickname = string.Empty;
     }
 
     #endregion
@@ -124,6 +168,10 @@
         /// AccountType
         /// </summary>
         public int AccountType = 0;
+        /// <summary>
+        /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+        /// </summary>
+        public bool IsAllowRemoteCtrl = false;
     }
 
     /// <summary>
@@ -151,6 +199,10 @@
         /// 鎵嬫満鍙�
         /// </summary>
         public string Phone = string.Empty;
+        /// <summary>
+        /// 澶村儚鏁版嵁
+        /// </summary>
+        public byte[] HeadImage = null;
     }
 
     #endregion
@@ -169,7 +221,7 @@
         /// <summary>
         /// 鎴块棿鍚嶇О
         /// </summary>
-        public List<string> listRoomName = new List<string>();
+        public string RoomName = string.Empty;
         /// <summary>
         /// 璁惧鐨勬墦寮�鐘舵��
         /// </summary>
@@ -242,6 +294,14 @@
         /// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
         /// </summary>
         public bool MqttOnlineStatus = false;
+        /// <summary>
+        /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+        /// </summary>
+        public string AesKey;
+        /// <summary>
+        /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+        /// </summary>
+        public string MacMark;
     }
 
     /// <summary>
@@ -401,6 +461,10 @@
         /// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
         /// </summary>
         public string DistributedMark = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     /// <summary>
@@ -462,6 +526,10 @@
         /// 闀滃儚绫诲瀷
         /// </summary>
         public string ImagType = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     #endregion
@@ -761,7 +829,7 @@
         /// <summary>
         /// Page
         /// </summary>
-        public int Page = 0;
+        public int Page = 1;
         /// <summary>
         /// PageSize
         /// </summary>
@@ -809,6 +877,10 @@
         /// 涓婃姤鏃堕棿(hh:mm:ss)
         /// </summary>
         public string Time = string.Empty;
+        /// <summary>
+        /// 2020.04.13杩藉姞鏂板垎绫� 1:涓�鑸姤璀� 9000:闂ㄩ攣甯稿紑妯″紡鎶ヨ
+        /// </summary>
+        public int MsgDiv = 1;
     }
 
     #endregion
@@ -863,11 +935,11 @@
         /// </summary>
         public bool IsHdlDevice = true;
         /// <summary>
-        /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+        /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID,涔熷彨瀹樻柟鍚嶅瓧锛圧鏂囦欢閲岄潰鐨勶級
         /// </summary>
         public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
         /// <summary>
-        /// 璁惧鐨勫叿浣撶被鍨�(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
+        /// 璁惧鐨勫叿浣撶被鍨�,涔熷彨瀹樻柟绫诲瀷(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
         /// </summary>
         public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
         /// <summary>
@@ -878,6 +950,26 @@
         /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
         /// </summary>
         public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+        /// <summary>
+        /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+        /// </summary>
+        public int DefultNameId
+        {
+            get
+            {
+                int value = ConcreteTextId + 20000;
+                //榛樿澶囨敞鍚嶇О鏄湪50000~59999
+                if (50000 <= value && value <= 59999)
+                {
+                    return value;
+                }
+                return ConcreteTextId;
+            }
+        }
+        /// <summary>
+        /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+        /// </summary>
+        public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice;
     }
 
     #endregion
@@ -890,17 +982,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>
@@ -985,4 +1081,329 @@
     }
 
     #endregion
+
+    #region 鈻� 浣忓畢淇℃伅绫籣_________________________
+
+    /// <summary>
+    ///  缂栬緫浣忓畢鐨勫惎鍔ㄥ弬鏁�
+    /// </summary>
+    public class EditorResidencePra : IfacePraCommon
+    {
+        /// <summary>
+        /// RequestVersion
+        /// </summary>
+        public string RequestVersion = Common.CommonPage.RequestVersion;
+        /// <summary>
+        /// LoginAccessToken
+        /// </summary>
+        public string LoginAccessToken = Common.Config.Instance.Token;
+        /// <summary>
+        /// ZigbeeHomeId
+        /// </summary>
+        public string HomeId = "";
+        /// <summary>
+        /// Name
+        /// </summary>
+        public string Name = string.Empty;
+        /// <summary>
+        /// 缁忓害
+        /// </summary>
+        public double Longitude = 0;
+        /// <summary>
+        /// 绾害
+        /// </summary>
+        public double Latitude = 0;
+    }
+    #endregion
+
+    #region 鈻� 娑堟伅绠＄悊绫籣_________________________
+
+    /// <summary>
+    /// 鑾峰彇娑堟伅璁板綍鐨勮姹傚弬鏁�
+    /// </summary>
+    public class MessageInfoPra : IfacePraCommon
+    {
+        /// <summary>
+        /// RequestVersion
+        /// </summary>
+        public string RequestVersion = Common.CommonPage.RequestVersion;
+        /// <summary>
+        /// LoginAccessToken
+        /// </summary>
+        public string LoginAccessToken = Common.Config.Instance.Token;
+        /// <summary>
+        /// ZigbeeHomeId
+        /// </summary>
+        public string HomeId = Common.Config.Instance.Home.Id;
+        /// <summary>
+        /// 涓婚
+        /// </summary>
+        public string Topic = null;
+        /// <summary>
+        /// 寮�濮嬫椂闂�
+        /// </summary>
+        public string BeginTime = null;
+        /// <summary>
+        /// 缁撴潫鏃堕棿
+        /// </summary>
+        public string EndTime = null;
+        /// <summary>
+        /// 椤垫暟
+        /// </summary>
+        public PageSettingInfo PageSetting = new PageSettingInfo();
+
+        public MessageInfoPra()
+        {
+            PageSetting.PageSize = 50;
+        }
+    }
+
+    /// <summary>
+    /// 娑堟伅涓績鐨勭粨鏋滆繑鍥炲��
+    /// </summary>
+    public class MessageCentetInfo
+    {
+        /// <summary>
+        /// 鍒楄〃鏁版嵁
+        /// </summary>
+        public List<MessageRecordInfo> PageData = null;
+        /// <summary>
+        /// PageIndex
+        /// </summary>
+        public int PageIndex = 0;
+        /// <summary>
+        /// PageSize
+        /// </summary>
+        public int PageSize = 0;
+        /// <summary>
+        /// TotalCount
+        /// </summary>
+        public int TotalCount = 0;
+        /// <summary>
+        /// TotalPages
+        /// </summary>
+        public int TotalPages = 0;
+        /// <summary>
+        /// HasPreviousPage
+        /// </summary>
+        public bool HasPreviousPage = false;
+        /// <summary>
+        /// HasNextPage
+        /// </summary>
+        public bool HasNextPage = false;
+    }
+
+    /// <summary>
+    /// 淇℃伅缁撴灉
+    /// </summary>
+    public class MessageRecordInfo
+    {
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string Id = string.Empty;
+        /// <summary>
+        /// 涓婚
+        /// </summary>
+        public string Topic = string.Empty;
+        /// <summary>
+        /// 缃戝叧涓婃姤鐨刯son
+        /// </summary>
+        public string PayloadJson = string.Empty;
+        /// <summary>
+        /// 鏄惁宸茶
+        /// </summary>
+        public bool IsReading = false;
+        /// <summary>
+        /// 鏄惁宸茶(listMsg鍖归厤,瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
+        /// </summary>
+        public List<bool> ListReading = new List<bool>();
+        /// <summary>
+        /// 鏃堕棿 2019-09-10T13:11:55
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
+        /// <summary>
+        /// 鍥剧墖鍦板潃
+        /// </summary>
+        public string IconPath = string.Empty;
+        /// <summary>
+        /// 娑堟伅绫诲瀷
+        /// </summary>
+        public string MsgObjectText = string.Empty;
+        /// <summary>
+        /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
+        /// </summary>
+        public List<string> listMsg = new List<string>();
+    }
+
+    /// <summary>
+    /// 璁剧疆娑堟伅宸茶鐘舵�佺殑鍚姩鍙傛暟
+    /// </summary>
+    public class MessageReadStatuPra : IfacePraCommon
+    {
+        /// <summary>
+        /// RequestVersion
+        /// </summary>
+        public string RequestVersion = Common.CommonPage.RequestVersion;
+        /// <summary>
+        /// LoginAccessToken
+        /// </summary>
+        public string LoginAccessToken = Common.Config.Instance.Token;
+        /// <summary>
+        /// ZigbeeHomeId
+        /// </summary>
+        public string HomeId = Common.Config.Instance.Home.Id;
+        /// <summary>
+        /// ID
+        /// </summary>
+        public string Id = string.Empty;
+        /// <summary>
+        /// 宸茶鐘舵��
+        /// </summary>
+        public bool IsReading = true;
+        /// <summary>
+        /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+        /// </summary>
+        public int TagAllOrClearType = 0;
+    }
+
+    #endregion
+
+    #region 鈻� 闅愬尶鍔熻兘绫籣_________________________
+
+    /// <summary>
+    /// 闅愬尶鍔熻兘
+    /// </summary>
+    public class HideOptionInfo
+    {
+        /// <summary>
+        /// 鏄惁鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�): 1 -> 鏄剧ず
+        /// </summary>
+        public int CenterHideMenu = 0;
+        /// <summary>
+        /// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏
+        /// </summary>
+        public int DetailedLog = 0;
+        /// <summary>
+        /// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
+        /// </summary>
+        public int DeviceHistory = 0;
+        /// <summary>
+        /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏� 1->寮�鍚�
+        /// </summary>
+        public int CheckCanReceiveGateway = 0;
+        /// <summary>
+        /// 寮哄埗璺宠浆鐪熷疄璁惧鐣岄潰 1->璁惧鍒楄〃寮哄埗璺宠浆
+        /// </summary>
+        public int GotoRealDeviceForm = 0;
+        /// <summary>
+        /// 寮哄埗璺宠浆缃戝叧浜у搧鐣岄潰 1->缃戝叧鍒楄〃寮哄埗璺宠浆
+        /// </summary>
+        public int GotoGatewayProductInfoForm = 0;
+        /// <summary>
+        /// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
+        /// </summary>
+        public int DoorLockNomallyOpenTimeMode = 0;
+        /// <summary>
+        /// 鏄惁灏嗗彂閫佸強鎺ユ敹鍒扮殑鏁版嵁鍐欏叆鍒癓og涓� 1->鍐欏叆
+        /// </summary>
+        public int WriteSendAndReceveDataToFile = 0;
+    }
+    #endregion
+
+    #region 鈻� 闂ㄩ攣鐨勬姤璀︾粨鏋淿_____________________
+
+    /// <summary>
+    /// 闂ㄩ攣鐨勬姤璀︾粨鏋�
+    /// </summary>
+    public class DoorLockAlarmsResult
+    {
+        /// <summary>
+        /// 鎶ヨ绫诲瀷
+        /// </summary>
+        public int AlarmCode = -1;
+        /// <summary>
+        /// Clusterid
+        /// </summary>
+        public int Clusterid = -1;
+    }
+
+    #endregion
+
+    #region 鈻� 鑷姩鍖栨帹閫佺粨鏋淿_____________________
+
+    /// <summary>
+    /// 鑷姩鍖栨帹閫佸唴瀹�
+    /// </summary>
+    public class LogicPushResult
+    {
+        /// <summary>
+        /// 鑷姩鍖朓D
+        /// </summary>
+        public int LogicId = -1;
+        /// <summary>
+        /// 鑷姩鍖栧悕绉�
+        /// </summary>
+        public string LogicName = string.Empty;
+        /// <summary>
+        /// 鑷姩鍖栨帹閫佸唴瀹�
+        /// </summary>
+        public string LogicCustomPushText = string.Empty;
+        /// <summary>
+        /// 闂ㄩ攣甯稿紑妯″紡鏁版嵁(鑷姩鍖栨帹閫�)
+        /// </summary>
+        public DoorNormallyOpenData ActionData = null;
+    }
+
+    /// <summary>
+    /// 闂ㄩ攣甯稿紑妯″紡鏁版嵁(鑷姩鍖栨帹閫�)
+    /// </summary>
+    public class DoorNormallyOpenData
+    {
+        /// <summary>
+        /// 8:甯稿紑妯″紡鐨勬暟鎹�
+        /// </summary>
+        public int Actiontype = -1;
+        /// <summary>
+        /// 闂ㄩ攣Mac鍦板潃
+        /// </summary>
+        public string MacStr = string.Empty;
+        /// <summary>
+        /// 闂ㄩ攣绔彛鍙�
+        /// </summary>
+        public int Epoint = -1;
+        /// <summary>
+        /// 璁剧疆鑷姩鍖栨椂锛屽彂閫佺殑閫忎紶鏁版嵁 055704010112:甯稿紑妯″紡鎵撳紑  055704010113:甯稿紑妯″紡鍏抽棴
+        /// </summary>
+        public string PassDataString = string.Empty;
+    }
+
+    #endregion
+
+    #region 鈻� 缃戝叧鍥炲鎺ユ敹绫籣_____________________
+
+    /// <summary>
+    /// 缃戝叧鍥炲鎺ユ敹绫�
+    /// </summary>
+    public class ReceiptGatewayResult
+    {
+        /// <summary>
+        /// 閿欒娑堟伅,濡傛灉娌℃湁閿欒,鍒欎负null(缃戝叧瓒呮椂涔熶负null)
+        /// </summary>
+        public string ErrorMsg = null;
+        /// <summary>
+        /// 閿欒娑堟伅鐨勭被鍨� -1:缃戝叧瀵硅薄涓㈠け 0:瓒呮椂缃戝叧娌℃湁鍥炲  1:姝ｅ父
+        /// </summary>
+        public int ErrorMsgDiv = 1;
+        /// <summary>
+        /// 鎺ユ敹鐨勬暟鎹�
+        /// </summary>
+        public string ReceiptData = null;
+        /// <summary>
+        /// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
+        /// </summary>
+        public string[] listReceiptData = null;
+    }
+
+    #endregion
 }

--
Gitblit v1.8.0