请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

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

@@ -8,9 +8,10 @@
    {
        #region 一堆变量
        /// <summary>
        /// 判断网关是否在线的标识，APP界面会改变它的值,Application会重新刷新它的值
        /// 网关在线的时间点
        /// </summary>
        public bool GatewayOnlineFlage = false;
        [Newtonsoft.Json.JsonIgnore]
        public DateTime OnlineTime = DateTime.Now;
        /// <summary>

        /// 住宅ID
        /// </summary>
@@ -23,6 +24,10 @@
        ///网关序列号，该网关唯一标识
        /// </summary>
        public string GwId = string.Empty;
        /// <summary>
        ///网关绑定网卡的mac地址
        /// </summary>
        public string GwMac = string.Empty;
        /// <summary>
        ///网关名称
        /// </summary>
@@ -72,8 +77,7 @@
        /// <summary>
        /// 虚拟驱动信息
        /// </summary>
        public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();

        public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
        /// <summary>
        /// 虚拟网关
        /// </summary>
@@ -249,32 +253,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 修改网关名称