From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index d6dd689..a4c9e34 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -271,6 +271,14 @@
//闈㈡澘鐨勬渶鍚庝竴涓洖璺槸娓╁害浼犳劅鍣�
epointName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId11);
}
+ else if (deviceInfoType.ConcreteType == Common.DeviceConcreteType.Sensor_Pir)
+ {
+ //pir浼犳劅鍣�,瀹冨張鎼炵壒娈婁笢瑗�,浼犳劅鍣ㄨ嚜韬敤鑷繁鐨勫悕瀛�,缁х數鍣ㄥ洖璺殑璇濃�︹��
+ if (device.Type == DeviceType.OnOffOutput)
+ {
+ epointName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2300);
+ }
+ }
else
{
//XXXXX(N鍥炶矾)
--
Gitblit v1.8.0