From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index 1368cc6..871c1ad 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -235,6 +235,8 @@
var arry = tempValue.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
var objName = arry[0].Trim();
+ //鑾峰彇璁惧绫诲瀷
+ var deviceInfoType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(this.listNewDevice);
foreach (var device in this.listNewDevice)
{
if (Common.LocalDevice.Current.GetSimpleEpointName(device) != string.Empty)
@@ -244,6 +246,11 @@
var epointName = objName;
if (this.listNewDevice.Count > 1)
{
+ if (deviceInfoType.BeloneType == Common.DeviceBeloneType.A鎸夐敭闈㈡澘 && device.Type == DeviceType.TemperatureSensor)
+ {
+ //闈㈡澘鐨勬渶鍚庝竴涓洖璺槸娓╁害浼犳劅鍣�
+ epointName = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId11);
+ }
//XXXXX(N鍥炶矾)
epointName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
}
--
Gitblit v1.8.0