From 21736b2944d5e88cd705a39ff87fd73d5a16e609 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 11:06:35 +0800
Subject: [PATCH] 安川
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index 1354120..85634c4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -86,7 +86,7 @@
{
var rowInfo = new RowControlInfo();
- var frameTable = new FrameLayoutControl();
+ var frameTable = new FrameLayoutStatuControl();
frameTable.UseClickStatu = false;
frameTable.Width = Application.GetRealWidth(994);
frameTable.Height = Application.GetRealHeight(337);
@@ -98,9 +98,9 @@
var btnIconBack = new FrameLayout();
btnIconBack.X = Application.GetRealWidth(46);
btnIconBack.Y = Application.GetRealHeight(43);
- btnIconBack.Height = Application.GetMinRealAverage(112);
- btnIconBack.Width = Application.GetMinRealAverage(112);
- btnIconBack.Radius = (uint)Application.GetMinRealAverage(112) / 2;
+ btnIconBack.Height = this.GetPictrueRealSize(112);
+ btnIconBack.Width = this.GetPictrueRealSize(112);
+ btnIconBack.Radius = (uint)this.GetPictrueRealSize(112) / 2;
btnIconBack.BackgroundColor = 0xfff5f6fa;
frameTable.AddChidren(btnIconBack, ChidrenBindMode.NotBind);
rowInfo.btnIconBack = btnIconBack;
@@ -125,7 +125,7 @@
btnRoom.Y = btnDeviceName.Bottom + Application.GetRealHeight(12);
btnRoom.TextSize = 12;
btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
+ btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
rowInfo.btnRoom = btnRoom;
//鎽勬皬搴�
@@ -211,21 +211,13 @@
{
for (int i = 0; i < listDevice.Count; i++)
{
- if (i != 0 && i % 5 == 0)
+ if (this.Parent == null)
{
- //璇诲彇5涓悗锛岄棿闅斾竴娈垫椂闂�
- System.Threading.Thread.Sleep(200);
- if (this.Parent == null)
- {
- return;
- }
+ return;
}
- //鑾峰彇褰撳墠瀹ゆ俯
- ((AC)listDevice[i]).ReadLocalTemperature();
- //鑾峰彇寮�鍏崇姸鎬�(澶勪簬鏌愮宸ヤ綔鐘舵��,鍗充负鎵撳紑鐘舵��)
- ((AC)listDevice[i]).ReadSystemMode();
- //娓呮礂婊ょ綉
- listDevice[i].ReadAttri(Cluster_ID.Thermostat, AttriButeId.FilterCleaningStatus);
+ //璇诲彇鐘舵��
+ HdlDeviceAttributeLogic.Current.SendThermostatStatuComand(listDevice[i]);
+ System.Threading.Thread.Sleep(200);
}
});
}
@@ -340,7 +332,7 @@
{
var contr = dicControl[this.actionDeviceKeys];
contr.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
- contr.btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
+ contr.btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
}
}
this.actionDeviceKeys = null;
--
Gitblit v1.8.0