From acb2b278663952ce555b06a2e821f359225f15e0 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 10 七月 2020 09:41:15 +0800
Subject: [PATCH] 备份
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Home0630/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
old mode 100644
new mode 100755
similarity index 99%
rename from Home0630/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
index 4010383..ec57ceb
--- a/Home0630/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp/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;
@@ -426,17 +426,17 @@
{
//鍙鍚屼竴绉嶇被鍨嬬殑
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;
- }
+ }
+
+ //鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
+ 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);
@@ -478,11 +478,11 @@
listIcon.Insert(0, listTemp);
}
return listIcon;
- }
+ }
#endregion
-
+
#region 鈻� 鍥炶矾閫夋嫨___________________________
-
+
/// <summary>
/// 鍥炶矾閫夋嫨浜嬩欢
/// </summary>
--
Gitblit v1.8.0