Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -599,7 +599,7 @@
        ///读取IRACC模块固件版本

        /// <para>reserve:0-ff</para>

        /// </summary>

        public async void UpgradeAsync(CommonDevice device, SendUpgradeData upgradeData)

        public void UpgradeAsync(CommonDevice device, SendUpgradeData upgradeData)

        {

            var Gateway = device.Gateway;

            if (Gateway == null)

@@ -752,7 +752,7 @@
        ///读取IRACC模块固件版本

        /// <para>status:0--成功;1--失败;ff--无效 .</para>

        /// </summary>

        public async void SendFinishAsync(CommonDevice device, int status)

        public void SendFinishAsync(CommonDevice device, int status)

        {

            var Gateway = device.Gateway;

            if (Gateway == null)