新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs

@@ -7,22 +7,19 @@
    public class ZbGatewayData
    {
        #region 一堆变量
        /// <summary>
        /// 判断网关是否在线的标识，APP界面会改变它的值,Application会重新刷新它的值
        /// </summary>
        public bool GatewayOnlineFlage = false;

        /// <summary>

        /// 住宅ID
        /// </summary>
        public string HomeId = string.Empty;
        /// <summary>
        /// 网关所在的房间ID

        /// </summary>
        public string RoomId = string.Empty;
        ///<summary>
        ///网关序列号，该网关唯一标识
        /// </summary>
        public string GwId = string.Empty;
        public string GwId = string.Empty;

        /// <summary>
        ///网关绑定网卡的mac地址
        /// </summary>
        public string GwMac = string.Empty;
        /// <summary>
        ///网关名称
        /// </summary>
@@ -72,8 +69,7 @@
        /// <summary>
        /// 虚拟驱动信息
        /// </summary>
        public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();

        public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
        /// <summary>
        /// 虚拟网关
        /// </summary>
@@ -84,6 +80,28 @@
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public DateTime LastDateTime = DateTime.MinValue;
        /// <summary>

        /// 网关在线的时间点(这个东西有点用处,当第一次获取时,需要返回当前时间回去,然后才开始计时)

        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        private DateTime m_OnlineTime = new DateTime(1970, 1, 1);
        /// <summary>
        /// 网关在线的时间点
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public DateTime OnlineTime

        {

            get

            {

                if (m_OnlineTime.Year == 1970)

                {

                    //当第一次获取时,需要返回当前时间回去,然后才开始计时

                    m_OnlineTime = DateTime.Now;

                }

                return m_OnlineTime;

            }

            set { m_OnlineTime = value; }

        }

        #endregion

@@ -249,32 +267,9 @@
            /// <summary>
            /// 虚拟驱动信息
            /// </summary>
            public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
            public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
        }



        public class DriveCodeListObj
        {
            /// <summary>
            /// 驱动代号（由网关为驱动分配唯一标识）
            /// </summary>
            public int DriveCode;
            /// <summary>
            /// 驱动硬件版本
            /// </summary>
            public int DriveHwVersion;
            /// <summary>
            /// 驱动软件版
            /// </summary>
            public int DriveFwVersion;
            /// <summary>
            /// 驱动固件类型
            /// </summary>
            public int DriveImageType;
            /// <summary>
            /// 驱动id
            /// </summary>
            public int DriveId;
        }
        #endregion

        #region 修改网关名称