From 0e0584b87851c56745bf73b1a961b80613dd0721 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 19 五月 2020 16:35:16 +0800
Subject: [PATCH] 2020-05-19-4
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 116 ++++++++++++---------------------------------------------
1 files changed, 25 insertions(+), 91 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index cb99f85..13b308f 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -250,13 +250,10 @@
}
//鍔熻兘鍜屽満鏅痓odyView
- this.bodyFrameLayout = new FrameLayout()
- {
- Y = functionSceneView.Bottom,
- Height = Application.GetRealHeight(750),
- Gravity = Gravity.CenterHorizontal,
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
- };
+ this.bodyFrameLayout = new FrameLayout();
+ bodyFrameLayout.Y = functionSceneView.Bottom;
+ bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;
+ bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
this.listBodyContr.frameTable.AddChidren(bodyFrameLayout);
//閫夋嫨鍔熻兘鍒嗘爮
@@ -401,6 +398,11 @@
//褰撳墠鎴块棿
var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ if (HdlRoomLogic.Current.NowMainPageRoom == null)
+ {
+ //璁剧疆绗竴涓负鍒濆鎴块棿
+ HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];
+ }
var curIndex = 0;
for (int i = 0; i < listRoom.Count; i++)
{
@@ -408,7 +410,7 @@
roomPageView.AddChidren(roomView);
roomView.Init(listRoom[i]);
- if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)
+ if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id)
{
//褰撳墠鎴块棿,鍒欐樉绀洪偅浜涙暟鎹嚭鏉�
roomView.HideName(false);
@@ -473,7 +475,7 @@
btnRoomRightShadow.Visible = true;
btnRoomBottomShadow.Visible = true;
//鍒囨崲褰撳墠鎴块棿
- HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];
+ HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];
//鍒锋柊璁惧妗屽竷鎺т欢
this.isRoomChanging = false;
this.RefreshBodyView();
@@ -535,7 +537,7 @@
this.dicDeviceCardControl.Clear();
var listDevice = new List<CommonDevice>();
- foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice)
+ foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
{
var device = LocalDevice.Current.GetDevice(mainkeys);
//鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
@@ -549,7 +551,8 @@
//褰撳墠鎴块棿鐨勮澶囨暟
if (listDevice.Count == 0)
{
- ShowNoFunctionTip();
+ //杩樻病鏈夊姛鑳藉摝
+ this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoFunction_Tip));
return;
}
//璁惧鍒楄〃瀹瑰櫒鎺т欢
@@ -642,7 +645,7 @@
cardContr.X = XX;
cardContr.Y = YY;
listDeviceBackContr.AddChidren(cardContr);
- cardContr.InitControl(device);
+ cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);
//鍗＄墖闇�瑕佽绉婚櫎鐨勪簨浠�
cardContr.CardNeedRemoveEvent += () =>
{
@@ -694,33 +697,6 @@
System.Threading.Thread.Sleep(50);
}
}
- }
-
- /// <summary>
- /// 鏄剧ず娌℃湁鍔熻兘
- /// </summary>
- private void ShowNoFunctionTip()
- {
- var noFunction = new Button
- {
- Y = Application.GetRealHeight(69),
- Width = this.GetPictrueRealSize(683),
- Height = this.GetPictrueRealSize(392),
- Gravity = Gravity.CenterHorizontal,
- UnSelectedImagePath = "Item/NoFunction.png"
- };
- bodyFrameLayout.AddChidren(noFunction);
-
- var noFunctionTip = new Button()
- {
- Y = noFunction.Bottom,
- Height = Application.GetRealHeight(200),
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- bodyFrameLayout.AddChidren(noFunctionTip);
}
#endregion
@@ -816,7 +792,7 @@
this.dicDeviceCardControl.Clear();
var listScene = new List<SceneUI>();
- foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId)
+ foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
{
var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
if (sceneUi == null)
@@ -829,8 +805,8 @@
if (listScene.Count == 0)
{
- //鏄剧ず娌″満鏅�
- this.ShowNoSceneTip();
+ //杩樻病鏈夊満鏅摝
+ this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoScene_Tip));
return;
}
//鍒楄〃鎺т欢
@@ -912,26 +888,6 @@
System.Threading.Thread.Sleep(50);
}
}
- }
-
- /// <summary>
- /// 鏄剧ず娌″満鏅�
- /// </summary>
- private void ShowNoSceneTip()
- {
- var picNoFunc = new PicViewControl(683, 392);
- picNoFunc.Y = Application.GetRealHeight(69);
- picNoFunc.Gravity = Gravity.CenterHorizontal;
- picNoFunc.UnSelectedImagePath = "Item/NoFunction.png";
- bodyFrameLayout.AddChidren(picNoFunc);
-
- var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(200), false);
- btnTip.Y = picNoFunc.Bottom;
- btnTip.Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n");
- btnTip.TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor;
- btnTip.TextAlignment = TextAlignment.Center;
- btnTip.IsMoreLines = true;
- bodyFrameLayout.AddChidren(btnTip);
}
/// <summary>
@@ -1103,7 +1059,9 @@
Application.RunOnMainThread(() =>
{
- ShowForm();
+ //鍒锋柊鐣岄潰
+ this.ShowForm();
+
CommonPage.Loading.Hide();
});
})
@@ -1139,16 +1097,9 @@
{
//鍒锋柊鍗＄墖淇℃伅
var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)
- {
- //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
- }
- if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
- {
- //鏂伴鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
- }
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚
+ this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
+ //鍒锋柊鎺т欢
this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
}
}, ShowErrorMode.NO);
@@ -1166,23 +1117,6 @@
bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report);
this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline);
return;
- }
-
- }, ShowErrorMode.NO);
- });
-
- //璁惧鎺у埗鍙嶉涓婃姤
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
- {
- //璁惧鍗＄墖
- var deviceCardContr = this.dicDeviceCardControl[mainKeys];
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- deviceCardContr.SetHadGetResponeResultStatu();
}
}, ShowErrorMode.NO);
@@ -1233,7 +1167,7 @@
floorFL.FloorAction = (floorId) =>
{
btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
+ HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
this.ShowForm();
};
}
--
Gitblit v1.8.0