From 985abd7ee6049147119518aa41fb2d08c0cfc40d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 17:56:12 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
index d243082..4db67ff 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
+++ b/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;
--
Gitblit v1.8.0