From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 4a878f5..f6791aa 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -26,7 +26,7 @@
}
#endregion
- #region 鍙橀噺鐢虫槑
+ #region 鍙橀噺鐢虫槑
/// <summary>
/// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
/// </summary>
@@ -106,7 +106,7 @@
#endregion
- #region UI璁捐
+ #region UI璁捐
/// <summary>
/// 鐩爣椤垫樉绀�
/// </summary>
@@ -144,13 +144,13 @@
BindDownFrameLayout();
//鏍囬鏍忎笅鐨刄I
MidFrameLayoutContent();
- //鍒濆鍖栬澶囨暟鎹�
+ //鍒濆鍖栬澶囨暟鎹�
InitData();
}
/// <summary>
/// 娣诲姞妤煎眰UI
- /// </summary>
+ /// </summary>
void BindDownFrameLayout()
{
var btnAddFrameLayout = new FrameLayout
@@ -658,7 +658,7 @@
curControlDev.currentSelectFloorId = curFloorId;
btnFloorText.Text = dicFloorList[floorId];
- //鑾峰彇妤煎眰涓埧闂村垪琛�
+ //鑾峰彇妤煎眰涓埧闂村垪琛�
supportRoomList = GetFloorRoomList();
if (!btnMethodText.IsSelected)
{
@@ -727,7 +727,7 @@
//鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
- //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
+ //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
var panelBindListRes = await this.curControlDev.GetDeviceBindAsync();
if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
{
@@ -865,7 +865,7 @@
{
foreach (var dev in targetList)
{
- //鑾峰彇鏈湴璁惧鍒楄〃
+ //鑾峰彇鏈湴璁惧鍒楄〃
var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
if (tempDev != null)
@@ -1303,7 +1303,7 @@
{
return;
}
- //鑾峰彇鏈湴璁惧鍒楄〃
+ //鑾峰彇鏈湴璁惧鍒楄〃
var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
if (tempDev != null)
@@ -1489,11 +1489,11 @@
{
var device = LocalDevice.Current.GetDevice(de);
if (device != null)
- {
- //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
- if (device.ZigbeeType != 1)
- {
- continue;
+ {
+ //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+ if (device.ZigbeeType != 1)
+ {
+ continue;
}
if (device.Type == DeviceType.TemperatureSensor)
{
@@ -1530,11 +1530,11 @@
{
var device = LocalDevice.Current.GetDevice(de);
if (device != null)
- {
- //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
- if (device.ZigbeeType != 1)
- {
- continue;
+ {
+ //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+ if (device.ZigbeeType != 1)
+ {
+ continue;
}
if (device.Type == DeviceType.TemperatureSensor)
{
--
Gitblit v1.8.0