From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 14:32:30 +0800
Subject: [PATCH] 完全合并了Wjc，Xm 的 代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index 597861e..5d915c2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -83,10 +83,65 @@
unSelectPic = "Device/DimmableLightOneLoad.png";
this.AddMenuRow(objectText, unSelectPic, "DimmableLightOneLoadDirectionForm");
+ //Zigbee鏅鸿兘寮�鍚堝笜鐢垫満
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId100);
+ unSelectPic = "Device/CurtainAutoOpen.png";
+ this.AddMenuRow(objectText, unSelectPic, "CurtainAutoOpenDirectionForm");
+
+ //Zigbee鏅鸿兘绠＄姸鐢垫満
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId101);
+ unSelectPic = "Device/CurtainSiphonate.png";
+ this.AddMenuRow(objectText, unSelectPic, "CurtainSiphonateDirectionForm");
+
+ //绌鸿皟
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3600);
+ unSelectPic = "Device/AirConditionerZbGateway.png";
+ this.AddMenuRow(objectText, unSelectPic, "AirConditionerZbGatewayDirectionForm");
+
//鏅鸿兘闂ㄩ攣
objectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
unSelectPic = "Device/IntelligentLocksH06C.png";
- this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");
+ this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");
+
+ //PIR浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1200);
+ unSelectPic = "Device/SensorPir.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorPirDirectionForm");
+
+ //绾㈠浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1303);
+ unSelectPic = "Device/SensorInfrared.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorInfraredDirectionForm");
+
+ //鐕冩皵浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1300);
+ unSelectPic = "Device/SensorCarbonMonoxide.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorCarbonMonoxideDirectionForm");
+
+ //鐑熼浘浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1302);
+ unSelectPic = "Device/SensorFire.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorFireDirectionForm");
+
+ //姘存蹈浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1304);
+ unSelectPic = "Device/SensorWater.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorWaterDirectionForm");
+
+ //闂ㄧ獥浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1301);
+ unSelectPic = "Device/SensorDoorWindow.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorDoorWindowDirectionForm");
+
+ //涓户鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3900);
+ unSelectPic = "Device/RepeaterZigbee.png";
+ this.AddMenuRow(objectText, unSelectPic, "RepeaterZigbeeDirectionForm");
+
+ //绌烘皵寮�鍏�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId4100);
+ unSelectPic = "Device/AirSwitchCloudContr.png";
+ this.AddMenuRow(objectText, unSelectPic, "AirSwitchCloudContrDirectionForm");
//绗笁鏂硅澶�
objectText = Language.StringByID(R.MyInternationalizationString.uThirdPartyDevice);
@@ -99,12 +154,7 @@
};
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
- var realHeight = listView.ChildrenCount * listView.GetChildren(listView.ChildrenCount - 1).Height + Application.GetRealHeight(23);
- if (realHeight < listView.Height)
- {
- //缂╁皬鎺т欢楂樺害
- listView.Height = realHeight;
- }
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
--
Gitblit v1.8.0