~wjc/HomeApp.git

			@@ -14,7 +14,7 @@
			/// <summary>
			/// 是否是子账号进行操作
			/// </summary>
			public bool IsOtherAccountCtrl = Common.Config.Instance.isAdministrator;
			public bool IsOtherAccountCtrl = Common.Config.Instance.Home.IsOthreShare;
			}

			#endregion
			@@ -34,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>
			/// 邮箱
			@@ -58,16 +64,6 @@
			/// </summary>
			public string AuthorityText = string.Empty;
			/// <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;
			@@ -79,6 +75,23 @@
			/// 密码验证(临时用,会置空)
			/// </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>
			@@ -101,6 +114,17 @@
			/// 用户名
			/// </summary>
			public string UserName = string.Empty;
			}

			/// <summary>
			/// 昵称信息
			/// </summary>
			public class NicknameInfo
			{
			/// <summary>
			/// 昵称
			/// </summary>
			public string nickname = string.Empty;
			}

			#endregion
			@@ -143,6 +167,10 @@
			/// AccountType
			/// </summary>
			public int AccountType = 0;
			/// <summary>
			/// 是否拥有远程控制权限
			/// </summary>
			public bool IsAllowRemoteCtrl = false;
			}

			/// <summary>
			@@ -201,6 +229,19 @@
			/// 设备
			/// </summary>
			public ZigBee.Device.CommonDevice Device = null;
			}

			/// <summary>
			/// 设备名字内容
			/// </summary>
			public class DeviceNameContent
			{
			public string A官方名字 = string.Empty;
			public string A所属名字 = string.Empty;
			public string A备注名字 = string.Empty;
			public string A类型名字 = string.Empty;
			public int ConcreteTypeValue = 0;
			public int BeloneTypeValue = 0;
			}

			#endregion
			@@ -265,6 +306,14 @@
			/// 云端远程在线状态
			/// </summary>
			public bool MqttOnlineStatus = false;
			/// <summary>
			/// 与此网关在云端Emq通信时，负载加解的16位Aes密钥
			/// </summary>
			public string AesKey;
			/// <summary>
			/// 网关对应的唯一码
			/// </summary>
			public string MacMark;
			}

			/// <summary>
			@@ -424,6 +473,10 @@
			/// 固件分布式唯一,也是下载时的[下载固件的唯一标识]参数
			/// </summary>
			public string DistributedMark = string.Empty;
			/// <summary>
			/// 日期(后面追加的 utc时间)
			/// </summary>
			public string CreatedOnUtc = string.Empty;
			}

			/// <summary>
			@@ -485,6 +538,29 @@
			/// 镜像类型
			/// </summary>
			public string ImagType = string.Empty;
			/// <summary>
			/// 日期(后面追加的 utc时间)
			/// </summary>
			public string CreatedOnUtc = string.Empty;
			}

			/// <summary>
			/// 网关需要升级的信息
			/// </summary>
			public class GatewayNeedUpdateInfo
			{
			/// <summary>
			/// 升级固件的全路径
			/// </summary>
			public string FullFileName = string.Empty;
			/// <summary>
			/// 虚拟驱动号
			/// </summary>
			public int DriveCode = -1;
			/// <summary>
			/// 1:Linux的升级固件 2:协调器的升级固件 3:虚拟驱动的升级固件
			/// </summary>
			public int Div = -1;
			}

			#endregion
			@@ -784,7 +860,7 @@
			/// <summary>
			/// Page
			/// </summary>
			public int Page = 0;
			public int Page = 1;
			/// <summary>
			/// PageSize
			/// </summary>
			@@ -832,6 +908,10 @@
			/// 上报时间(hh:mm:ss)
			/// </summary>
			public string Time = string.Empty;
			/// <summary>
			/// 2020.04.13追加新分类 1:一般报警 9000:门锁常开模式报警
			/// </summary>
			public int MsgDiv = 1;
			}

			#endregion
			@@ -886,21 +966,29 @@
			/// </summary>
			public bool IsHdlDevice = true;
			/// <summary>
			/// 设备的具体类型的翻译名字ID（R文件里面的）
			/// 设备的官方名字
			/// </summary>
			public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
			public string ConcreteText = string.Empty;
			/// <summary>
			/// 设备的具体类型(值为自定义的值,好像可以是镜像ID)
			/// 设备的具体类型
			/// </summary>
			public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
			/// <summary>
			/// 设备所属类型的翻译名字
			/// </summary>
			public string BeloneText = string.Empty;
			/// <summary>
			/// 设备所属类型
			/// </summary>
			public DeviceBeloneType BeloneType = DeviceBeloneType.A未知设备;
			/// <summary>
			/// 设备所属类型的翻译名字ID（R文件里面的）
			/// 设备的默认备注翻译名字
			/// </summary>
			public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
			public string DeviceDefultName = string.Empty;
			/// <summary>
			/// 设备的类型翻译名字
			/// </summary>
			public string ObjectTypeName = string.Empty;
			}

			#endregion
			@@ -1046,4 +1134,311 @@
			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>
			/// 网关上报的json
			/// </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>
			/// 是否将发送及接收到的数据写入到Log中 1->写入
			/// </summary>
			public int WriteSendAndReceveDataToFile = 0;
			/// <summary>
			/// 是否将SocketReceive的数据写入到Log中 1->写入
			/// </summary>
			public int WriteSocketReceiveDataToFile = 0;
			/// <summary>
			/// 是否开启调试App功能 1->开启
			/// </summary>
			public int StartDebugApp = 0;
			/// <summary>
			/// 当设备Type不一样时,是否生成Log 1->生成
			/// </summary>
			public int CheckDeviceType = 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>
			/// 自动化ID
			/// </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>
			/// 接收的Data数据
			/// </summary>
			public string ReceiptData = null;
			/// <summary>
			/// 接收的数据(多个返回主题专用)
			/// </summary>
			public string[] listReceiptData = null;
			/// <summary>
			/// 这个是网关回复的整个json数据,个数与listReceiptData一致
			/// </summary>
			public string[] JsonData = null;
			}

			#endregion
			}