From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 7deda9b..5c0822a 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -54,6 +54,7 @@
/// </summary>
public CategoryMainForm()
{
+ this.FormID = "CategoryMainForm";
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
instance = this;
}
@@ -161,8 +162,8 @@
floors.changeFloor = true;
floors.FloorAction += (floorId) =>
{
- btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
+ btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
+ HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
//鍒锋柊bodyView
this.RefreshBodyView();
};
@@ -276,16 +277,21 @@
{
//褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ if (HdlRoomLogic.Current.NowCategoryRoom == null)
+ {
+ //璁剧疆绗竴涓负鍒濆鎴块棿
+ HdlRoomLogic.Current.NowCategoryRoom = lisrRoom[0];
+ }
//鎴块棿鑿滃崟鎺т欢
var roomSwitchContr = new RoomDeviceGroupMenuControl(lisrRoom);
roomSwitchContr.Y = Application.GetRealHeight(-55);
this.functionSceneAutoBodyView.AddChidren(roomSwitchContr);
//璁剧疆鍒濆鍊�
- roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.CurrentRoom.Id);
+ roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.NowCategoryRoom.Id);
//閫夋嫨浜嬩欢
roomSwitchContr.SelectRoomEvent += (selectRoom) =>
{
- HdlRoomLogic.Current.CurrentRoom = selectRoom;
+ HdlRoomLogic.Current.NowCategoryRoom = selectRoom;
//鍦烘櫙
if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
{
@@ -502,6 +508,11 @@
{
cardContr = new Controls.DeviceFreshAirRowControl();
}
+ // PM2.5
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ cardContr = new Controls.DevicePmSensorRowControl();
+ }
//褰╃伅(璋冨厜鍣�)
else if (device.Type == DeviceType.DimmableLight)
{
@@ -522,6 +533,11 @@
{
cardContr = new Controls.DeviceDoorLockRowControl();
}
+ //鑹叉俯鐏�
+ else if (device.Type == DeviceType.ColorTemperatureLight)
+ {
+ cardContr = new Controls.DeviceColorTemperatureRowControl();
+ }
//鏃犳硶璇嗗埆
else
{
@@ -532,7 +548,7 @@
cardContr.chidrenYaxis = listView.rowSpace / 2;
//鍒濆鍖栧崱鐗�
listView.AddChidren(cardContr);
- cardContr.InitControl(device);
+ cardContr.InitControl(device, HdlRoomLogic.Current.NowCategoryRoom);
//鎺т欢璁板綍鍒扮紦瀛樹腑
this.dicDeviceRowControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
//鍔犵紦瀛�,鐒跺悗鍙戝懡浠�
@@ -583,6 +599,60 @@
/// <param name="room"></param>
private void RefreshSceneView(Room room)
{
+ //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
+ VerticalListRefreshControl listview1 = null;
+ //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
+ VerticalListControl listview2 = null;
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ {
+ //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
+ listview1 = new VerticalListRefreshControl();
+ functionSceneBodyView.AddChidren(listview1);
+ //涓嬫媺鍒锋柊
+ listview1.BeginHeaderRefreshingAction += () =>
+ {
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�,鍒欏彧缁欎釜鐗规晥
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ System.Threading.Thread.Sleep(1500);
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ listview1.EndHeaderRefreshing();
+ });
+ });
+ return;
+ }
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庣綉鍏冲埛鏂板満鏅垪琛�
+ bool result = HdlSceneLogic.Current.RefreshSceneUIList();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ listview1.EndHeaderRefreshing();
+ if (result == true)
+ {
+ //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
+ this.functionSceneBodyView.RemoveAll();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
+ this.RefreshSceneView(room);
+ });
+ }
+ });
+ });
+ };
+ }
+ else
+ {
+ //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
+ listview2 = new VerticalListControl();
+ functionSceneBodyView.AddChidren(listview2);
+ }
+
var listScene = new List<SceneUI>();
foreach (var sceneId in room.ListSceneId)
{
@@ -594,28 +664,17 @@
}
if (listScene.Count == 0)
{
+ //鍦ㄦ粦鍔ㄦ帶浠堕噷闈㈡坊鍔犱竴涓甯�
+ var frameTable = new FrameLayout();
+ listview1?.AddChidren(frameTable);
+ listview2?.AddChidren(frameTable);
//娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
string[] arryMsg = Language.StringByID(R.MyInternationalizationString.NoScene).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- this.ShowNotDataImage(functionSceneBodyView, arryMsg);
+ this.ShowNotDataImage(frameTable, arryMsg);
return;
}
var dicSceneContr = new Dictionary<int, SceneCategoryView>();
- //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
- VerticalListRefreshControl listview1 = null;
- //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
- VerticalListControl listview2 = null;
- //if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
- //{
- // listview1 = new VerticalListRefreshControl();
- // functionSceneBodyView.AddChidren(listview1);
- //}
- //else
- {
- listview2 = new VerticalListControl();
- functionSceneBodyView.AddChidren(listview2);
- }
-
foreach (var scene in listScene)
{
//鍦烘櫙鍗＄墖鎺т欢
@@ -744,7 +803,7 @@
private void AddNormalDeviceReportEvent()
{
//璁惧灞炴�т笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -763,7 +822,7 @@
});
//璁惧鍦ㄧ嚎涓婃姤(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -790,7 +849,7 @@
private void AddSensorDeviceReportEvent()
{
//浼犳劅鍣ㄤ笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("CategoryMainFormSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -844,14 +903,9 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
dic[typeInfo.BeloneTextId].IconPath = path1;
dic[typeInfo.BeloneTextId].IconPathSelected = path2;
- if (device.Type == DeviceType.FreshAir)
- {
- dic[typeInfo.BeloneTextId].IconPath = "Device/FreshAirEpoint.png";
- dic[typeInfo.BeloneTextId].IconPathSelected = "Device/FreshAirEpointSelected.png";
- }
dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
}
dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
@@ -870,6 +924,9 @@
{
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
instance = null;
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceStatus");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormDeviceOnline");
+ HdlGatewayReceiveLogic.Current.RemoveEvent("CategoryMainFormSensor");
base.CloseFormBefore();
}
--
Gitblit v1.8.0