合并代码

黄学彪

2020-01-10 985abd7ee6049147119518aa41fb2d08c0cfc40d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs

@@ -41,7 +41,7 @@
        /// <summary>

        /// 设备对象

        /// </summary>

        private AC deviceAc = null;

        private CommonDevice deviceAc = null;

        /// <summary>

        /// 前一次的最终状态

        /// </summary>

@@ -63,7 +63,7 @@
        /// </summary>

        /// <param name="i_deviceAc">设备</param>

        /// <param name="i_deviceFirmware">设备的固件信息</param>

        public HdlACZbGatewayUpdateLogic(AC i_deviceAc, FirmwareVersionInfo i_deviceFirmware)

        public HdlACZbGatewayUpdateLogic(CommonDevice i_deviceAc, FirmwareVersionInfo i_deviceFirmware)

        {

            this.ClassDiv = 2;

            this.deviceAc = i_deviceAc;