From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index 8ff084f..27d0ccd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/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)
--
Gitblit v1.8.0