合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -212,7 +212,7 @@
            this.zbGateway.ReportAction += receiveAction;



            //读取空调模块版本

            var result = await deviceAc.ReadACFirewareVersionAsync();

            var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(deviceAc);

            if (result == null || result.readACFirewareVersionResponData == null || result.readACFirewareVersionResponData.Status != 0)

            {

                //获取空调模块版本失败

@@ -222,11 +222,11 @@
                this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                this.zbGateway.ReportAction -= receiveAction;

                //发送失败给设备

                deviceAc.SendFinishAsync(1);

                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                return;

            }

            //发送升级通知

            var result2 = await deviceAc.UpggradeACNotificationAsync(result.readACFirewareVersionResponData.FirewareVersion, this.deviceFirmwareByte.Length);

            var result2 = await HdlDeviceAirConditionerLogic.Current.UpggradeACNotificationAsync(deviceAc, result.readACFirewareVersionResponData.FirewareVersion, this.deviceFirmwareByte.Length);

            if (result2.responseData == null)

            {

                //发送升级命令失败

@@ -236,7 +236,7 @@
                this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                this.zbGateway.ReportAction -= receiveAction;

                //发送失败给设备

                deviceAc.SendFinishAsync(1);

                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                return;

            }

            else if (result2.responseData.status == 1)

@@ -248,7 +248,7 @@
                this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                this.zbGateway.ReportAction -= receiveAction;

                //发送失败给设备

                deviceAc.SendFinishAsync(1);

                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                return;

            }

            else if (result2.responseData.status != 0)

@@ -260,7 +260,7 @@
                this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                this.zbGateway.ReportAction -= receiveAction;

                //发送失败给设备

                deviceAc.SendFinishAsync(1);

                HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                return;

            }



@@ -278,7 +278,7 @@
                    this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                    this.zbGateway.ReportAction -= receiveAction;

                    //发送失败给设备

                    deviceAc.SendFinishAsync(1);

                    HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                    return;

                }

                await System.Threading.Tasks.Task.Delay(1000);

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

        /// 执行设备升级操作

        /// </summary>

        private async void DoSetUpdateDevice(string i_offset,int i_dataLength)

        private async void DoSetUpdateDevice(string i_offset, int i_dataLength)

        {

            this.UpdateStatu = UpdateStatuMode.DeviceUpdateReady;

            //设备正在升级…

@@ -372,7 +372,7 @@
                        this.UpdateStatu = UpdateStatuMode.DeviceUpdateFail;

                        this.zbGateway.ReportAction -= receiveAction;

                        //发送失败给设备

                        deviceAc.SendFinishAsync(1);

                        HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 1);

                        return;

                    }

                    await System.Threading.Tasks.Task.Delay(50);

@@ -398,9 +398,9 @@
                    }

                }

                //发送透传数据

                var sendData = new AC.SendUpgradeData() { dataLength = i_dataLength, offset = i_offset };

                var sendData = new HdlDeviceAirConditionerLogic.SendUpgradeData() { dataLength = i_dataLength, offset = i_offset };

                sendData.databytes = listData.ToArray();

                deviceAc.UpgradeAsync(sendData);

                HdlDeviceAirConditionerLogic.Current.UpgradeAsync(deviceAc, sendData);

            }

            this.zbGateway.ReportAction -= receiveAction;



@@ -421,7 +421,7 @@
            this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uSendingFinishUpdateComand));



            //发送成功命令给设备

            deviceAc.SendFinishAsync(0);

            HdlDeviceAirConditionerLogic.Current.SendFinishAsync(deviceAc, 0);



            //等个两秒钟吧

            await System.Threading.Tasks.Task.Delay(2000);