From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 16 十二月 2020 13:09:08 +0800 Subject: [PATCH] 新云端代码Ver1.2 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs index 3a1eb3e..5b3903d 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(GatewayResourse.AppOldSelectGatewayId); + this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(HdlGatewayResourse.AppOldSelectGatewayId); } /// <summary> @@ -143,16 +143,6 @@ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName16); 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); @@ -261,11 +251,11 @@ int statu = 0; //閲嶆柊鑾峰彇璁惧鍒楄〃 - var listDevice = Common.LocalDevice.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO); + var listDevice = HdlDeviceCommonLogic.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO); if (statu != 1) { //濡傛灉 - listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(zbGateway.GwId); + listDevice = HdlDeviceCommonLogic.Current.GetDeviceByGatewayID(zbGateway.GwId); } //妫�娴媘ini缃戝叧鐨勮澶囨暟 var listMac = new HashSet<string>(); -- Gitblit v1.8.0