From ca233e3c6154859a17948d892fbc6bbf723b60a8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 五月 2020 15:47:30 +0800
Subject: [PATCH] 发布的1.0.20052901
---
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
old mode 100755
new mode 100644
index 7edae6d..4010383
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -276,8 +276,8 @@
private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
{
//鑾峰彇鎸夌粍鍒嗛厤鐨勮澶�
- var listIcon = this.GetAllDeviceGroup();
-
+ var listIcon = this.GetAllDeviceGroup();
+
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(147);
frameBorder.Gravity = Gravity.CenterHorizontal;
@@ -355,7 +355,7 @@
//璁＄畻鐪熷疄楂樺害
int realHeight = this.GetPictrueRealSize(58 + 58);//涓婁笅闂磋窛
realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//鍦嗗湀楂樺害
- realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
+ realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
if (realHeight > frameBack.Height)
{
//鍙樻洿楂樺害
@@ -426,7 +426,19 @@
{
//鍙鍚屼竴绉嶇被鍨嬬殑
continue;
+ }
+
+ //鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘绗�1鍥炶矾鏄竴涓粦瀹氭俯婀垮害浼犳劅鍣ㄧ绫诲瀷锛屼笉鏄湡鐨勬俯婀垮害鐨勪紶鎰熷櫒锛岄渶瑕佸睆钄芥帀
+ continue;
+ }
}
+
listRelay.Add(device);
if (device.DeviceEpoint == deviceObj.DeviceEpoint)
{
@@ -466,12 +478,11 @@
listIcon.Insert(0, listTemp);
}
return listIcon;
- }
-
+ }
#endregion
-
+
#region 鈻� 鍥炶矾閫夋嫨___________________________
-
+
/// <summary>
/// 鍥炶矾閫夋嫨浜嬩欢
/// </summary>
--
Gitblit v1.8.0