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/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
index 716466e..08c8ac4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 璁惧
/// </summary>
- private AC deviceAc = null;
+ private CommonDevice deviceAc = null;
#endregion
@@ -26,7 +26,7 @@
/// </summary>
/// <param name="i_deviceAc">璁惧</param>
/// <param name="hadNewVersion">鎷ユ湁鏂扮増鏈�</param>
- public void ShowForm(AC i_deviceAc, bool hadNewVersion)
+ public void ShowForm(CommonDevice i_deviceAc, bool hadNewVersion)
{
this.deviceAc = i_deviceAc;
@@ -75,7 +75,7 @@
btnNewVersion.Visible = hadNewVersion;
btnNewVersion.X = Application.GetRealWidth(242);
btnNewVersion.Y = Application.GetRealHeight(23);
- rowComunication.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
+ rowComunication.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);
//绌鸿皟妯″潡
var rowModel = new FrameRowControl(listView.rowSpace / 2);
--
Gitblit v1.8.0