From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
old mode 100644
new mode 100755
index ec2d672..64b9ea0
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
@@ -84,7 +84,7 @@
if (listDataRoom.Count > 0)
{
//鍒濆鍖栨埧闂村拰璁惧鍒楄〃
- this.InitRoomAndDeviceRow(listDataRoom);
+ this.InitRoomAndDeviceRow(listDataRoom);
}
else
{
@@ -155,8 +155,8 @@
/// </summary>
/// <param name="listRoom">鍙互鏄剧ず鐨勬埧闂村璞�</param>
private void InitRoomAndDeviceRow(List<Common.Room> listRoom)
- {
- //鎴块棿鍒楄〃鎺т欢
+ {
+ //鎴块棿鍒楄〃鎺т欢
var roomContr = new RoomDeviceGroupMenuControl(listRoom);
bodyFrameLayout.AddChidren(roomContr);
@@ -200,26 +200,26 @@
listView.RecoverHeight();
DeviceSimpleSelectControl oldSelectContr = null;
- var listDevice = this.dicShowDevice[roomId];
- //鑾峰彇璁惧绫诲瀷鐨�
+ var listDevice = this.dicShowDevice[roomId];
+ //鑾峰彇璁惧绫诲瀷鐨�
var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
//妫�鏌ョ鍚堢殑璁惧
List<CommonDevice> listSupportDevice = new List<CommonDevice> { };
- foreach (var dev in listDevice)
- {
- //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
- {
- continue;
- }
- if (dev.Type == DeviceType.FreshAir)
- {
- listSupportDevice.Add(dev);
- }
- }
-
- DeviceSimpleSelectControl oldDeviceSimpleSelectControl = null;
- int curIndex = 0;
+ foreach (var dev in listDevice)
+ {
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+ if (dev.Type == DeviceType.FreshAir)
+ {
+ listSupportDevice.Add(dev);
+ }
+ }
+
+ DeviceSimpleSelectControl oldDeviceSimpleSelectControl = null;
+ int curIndex = 0;
for (int i = 0; i < listSupportDevice.Count; i++)
{
string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(listSupportDevice[i]);
@@ -230,34 +230,34 @@
{
//搴曠嚎
contr.AddBottomLine();
- }
-
+ }
+
contr.ButtonClickEvent += (sender, e) =>
- {
- if (contr.IsSelected)
- {
- return;
- }
- contr.IsSelected = true;
+ {
+ if (contr.IsSelected)
+ {
+ return;
+ }
+ contr.IsSelected = true;
oldSelectContr = contr;
- this.bindTargetKey = mainKey;
- //contr.IsSelected = !contr.IsSelected;
- ////閫夋嫨浜嗗埆鐨勮澶�
- //if (contr.IsSelected == true)
- //{
- // if (oldSelectContr != null)
- // {
- // oldSelectContr.IsSelected = false;
- // }
- // oldSelectContr = contr;
- // this.bindTargetKey = mainKey;
- //}
- ////鍙栨秷閫夋嫨
- //else
- //{
- // oldSelectContr = null;
- // this.bindTargetKey = string.Empty;
- //}
+ this.bindTargetKey = mainKey;
+ //contr.IsSelected = !contr.IsSelected;
+ ////閫夋嫨浜嗗埆鐨勮澶�
+ //if (contr.IsSelected == true)
+ //{
+ // if (oldSelectContr != null)
+ // {
+ // oldSelectContr.IsSelected = false;
+ // }
+ // oldSelectContr = contr;
+ // this.bindTargetKey = mainKey;
+ //}
+ ////鍙栨秷閫夋嫨
+ //else
+ //{
+ // oldSelectContr = null;
+ // this.bindTargetKey = string.Empty;
+ //}
};
if (this.bindTargetKey == mainKey)
{
@@ -295,19 +295,19 @@
{
bool canShow = false;
//鍏堟竻绌�
- this.dicShowDevice[room.Id] = new List<CommonDevice>();
-
+ this.dicShowDevice[room.Id] = new List<CommonDevice>();
+
foreach (var deviceKeys in room.ListDevice)
{
var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
if (device != null)
{
- if (device.Type == DeviceType.FreshAir)
- {
- //canShow = true;//聽聽杩欎釜鐣岄潰涓嶆樉绀烘埧闂�
- //鏀堕泦鍙互鏄剧ず鐨勮澶�
- this.dicShowDevice[room.Id].Add(device);
- }
+ if (device.Type == DeviceType.FreshAir)
+ {
+ //canShow = true;//聽聽杩欎釜鐣岄潰涓嶆樉绀烘埧闂�
+ //鏀堕泦鍙互鏄剧ず鐨勮澶�
+ this.dicShowDevice[room.Id].Add(device);
+ }
}
--
Gitblit v1.8.0