From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index c79cefc..3a1eb3e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -36,7 +36,7 @@
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
- this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(HdlGatewayResourse.AppOldSelectGatewayId);
+ this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
}
/// <summary>
@@ -144,6 +144,16 @@
unSelectPic = "Device/IntelligentLocksH06C.png";
this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");
+ //鏅捐。鏋�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName31);
+ unSelectPic = "Device/Airer.png";
+ this.AddMenuRow(objectText, unSelectPic, "AirerDirectionForm");
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName32);
+ unSelectPic = "Device/AirQualitySensor.png";
+ this.AddMenuRow(objectText, unSelectPic, "AirQualitySensorDirectionForm");
+
//PIR浼犳劅鍣�
objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName17);
unSelectPic = "Device/SensorPir.png";
@@ -244,18 +254,18 @@
/// </summary>
private string CheckGateway()
{
- if (zbGateway != null && zbGateway.LinuxImageType == 11)
+ if (HdlGatewayLogic.Current.IsMiniGateway(zbGateway) == true)
{
//mini澶滅伅鍙兘闄愬埗鍔犲叆16鍜岃澶�
this.ShowProgressBar();
int statu = 0;
//閲嶆柊鑾峰彇璁惧鍒楄〃
- var listDevice = HdlDeviceCommonLogic.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO);
+ var listDevice = Common.LocalDevice.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO);
if (statu != 1)
{
//濡傛灉
- listDevice = HdlDeviceCommonLogic.Current.GetDeviceByGatewayID(zbGateway.GwId);
+ listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(zbGateway.GwId);
}
//妫�娴媘ini缃戝叧鐨勮澶囨暟
var listMac = new HashSet<string>();
--
Gitblit v1.8.0