From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index 335f45b..2680692 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 璁惧
/// </summary>
- private AC deviceAc = null;
+ private CommonDevice deviceAc = null;
/// <summary>
/// 鍓嶅洖閫夋嫨鐨勬帶浠�
/// </summary>
@@ -33,7 +33,7 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_deviceAc">璁惧</param>
- public void ShowForm(AC i_deviceAc)
+ public void ShowForm(CommonDevice i_deviceAc)
{
this.deviceAc = i_deviceAc;
this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);
@@ -170,6 +170,11 @@
//閲嶅伐绌鸿皟妯″潡
textView = Language.StringByID(R.MyInternationalizationString.uHicAirConditioningModule);
}
+ else if (info.Name.Contains("IRACC_HITACHI") == true)
+ {
+ //鏃ョ珛绌鸿皟妯″潡
+ textView = Language.StringByID(R.MyInternationalizationString.uHitachiAirConditioningModule);
+ }
else
{
//绌鸿皟鍗囩骇妯″潡
--
Gitblit v1.8.0