From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
index ce14a14..716466e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using ZigBee.Device;
namespace Shared.Phone.UserCenter.DeviceAirConditioner
{
@@ -12,9 +13,9 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 璁惧mac鍦板潃
+ /// 璁惧
/// </summary>
- private string deviceMac = null;
+ private AC deviceAc = null;
#endregion
@@ -23,11 +24,11 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_deviceMac">璁惧mac鍦板潃</param>
+ /// <param name="i_deviceAc">璁惧</param>
/// <param name="hadNewVersion">鎷ユ湁鏂扮増鏈�</param>
- public void ShowForm(string i_deviceMac, bool hadNewVersion)
+ public void ShowForm(AC i_deviceAc, bool hadNewVersion)
{
- this.deviceMac = i_deviceMac;
+ this.deviceAc = i_deviceAc;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFirmwareUpdate));
@@ -67,7 +68,7 @@
//杩欓噷鏄澶囩殑Ota鍗囩骇
btnNewVersion.Visible = false;
var form = new Device.DeviceFirmwareUpdateForm();
- form.AddForm(this.deviceMac);
+ form.AddForm(this.deviceAc.DeviceAddr);
};
//鎻愮ず鏈夋柊鐗堟湰
btnNewVersion.UnSelectedImagePath = "Item/NewVersion.png";
@@ -84,7 +85,7 @@
rowModel.ButtonClickEvent += (sender, e) =>
{
var form = new ACZbGatewayModuleUpdateForm();
- form.AddForm(deviceMac);
+ form.AddForm(deviceAc);
};
//璋冩暣鍒楄〃楂樺害
--
Gitblit v1.8.0