From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 420 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 274 insertions(+), 146 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 15217b3..230d2f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -15,6 +15,16 @@
/// </summary>
PageLayout contentPageView;
Button btnAutomationTitle;
+
+ Button btnAddIconBg;
+
+
+ #region 瀹夐槻鍖哄煙
+ FrameLayout securityView;
+ Button btnSecurityTitle;
+ #endregion
+
+
#region 鍦烘櫙鍖哄煙
FrameLayout scenePageView;
/// <summary>
@@ -76,53 +86,141 @@
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
- btnSceneTilte = new Button()
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
- Y = Application.GetRealHeight(30),
- //Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Scenes,
- IsSelected = true
- };
- topView.AddChidren(btnSceneTilte);
- btnAutomationTitle = new Button();
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+ btnSecurityTitle = new Button()
+ {
+ X = Application.GetRealWidth(209),
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.anfang,
+ };
+ topView.AddChidren(btnSecurityTitle);
+ btnAutomationTitle = new Button();
+ }
+ else
+ {
+
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ //Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+ btnAutomationTitle = new Button();
+
+ }
}
else
{
-
- btnSceneTilte = new Button()
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterRight,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Scenes,
- IsSelected = true
- };
- topView.AddChidren(btnSceneTilte);
+ btnAutomationTitle = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Automation,
+ IsSelected = false
+ };
+ topView.AddChidren(btnAutomationTitle);
+ btnAutomationTitle.Width = btnAutomationTitle.GetTextWidth() + Application.GetRealWidth(40);
- btnAutomationTitle = new Button()
+ var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
+ btnAutomationTitle.X = otherWidth;
+
+
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = otherWidth,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected =true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+
+ btnSecurityTitle = new Button()
+ {
+ X = btnAutomationTitle.Right,
+ Y = Application.GetRealHeight(30),
+ Width = otherWidth,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.anfang,
+ };
+ topView.AddChidren(btnSecurityTitle);
+ }
+ else
{
- X = Application.GetRealWidth(209),
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Automation,
- };
- topView.AddChidren(btnAutomationTitle);
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+ btnAutomationTitle = new Button()
+ {
+ X = Application.GetRealWidth(209),
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Automation,
+ };
+ topView.AddChidren(btnAutomationTitle);
+ }
}
- var btnAddIconBg = new Button()
+ btnAddIconBg = new Button()
{
X = Application.GetRealWidth(337),
Y = Application.GetRealHeight(29),
@@ -130,20 +228,14 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
};
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- {
- topView.AddChidren(btnAddIconBg);
- }
+ topView.AddChidren(btnAddIconBg);
btnAddIcon = new Button()
{
X = Application.GetRealWidth(337 - 20),
Width = Application.GetMinRealAverage(28 + 30),
Height = Application.GetMinRealAverage(28 + 29),
};
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- {
- topView.AddChidren(btnAddIcon);
- }
+ topView.AddChidren(btnAddIcon);
#endregion
contentPageView = new PageLayout()
@@ -161,9 +253,28 @@
{
LoadAutomationPageView();
}
+ LoadSecurityPageView();
LoadEventList();
}
+
+ #region 瀹夐槻甯冮槻
+ /// <summary>
+ /// 鍔犺浇瀹夐槻鐣岄潰
+ /// </summary>
+ void LoadSecurityPageView()
+ {
+ securityView = new FrameLayout();
+ contentPageView.AddChidren(securityView);
+
+ var page = new ArmCenterPage();
+ securityView.AddChidren(page);
+ page.LoadPage(false);
+ }
+
+
+ #endregion
+
#region 鍦烘櫙閮ㄥ垎
/// <summary>
/// 鍔犺浇鍦烘櫙鍒楄〃鐣岄潰
@@ -231,7 +342,7 @@
sceneFunctionView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(53),
- Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
+ Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 0),
};
scenePageView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone(null);
@@ -242,10 +353,7 @@
/// </summary>
void LoadSceneFunctionControlZone(List<Scene> listScene)
{
- //topView.AddChidren(btnAddIcon);
-
sceneFunctionView.RemoveAll();
- var rowView = new FrameLayout();
try
{
int index = 0;
@@ -260,44 +368,7 @@
}
listScene = this.floorRoomSelectView.GetCanShowListScene();
}
- foreach (var scene in listScene)
- {
- //if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- //{
- // scene.collect = false;
- // continue;
- //}
- if (index % 2 == 0)
- {
- rowView = new FrameLayout()
- {
- Height = Application.GetRealWidth(122),
- };
- sceneFunctionView.AddChidren(rowView);
- sceneFunctionView.AddChidren(new Button()
- {
- Height = Application.GetRealHeight(7 + 7),
- });
- }
- var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
-
- var functionView = new FrameLayout()
- {
- X = functionView_X,
- Width = Application.GetRealWidth(164),
- Height = Application.GetRealWidth(122),
- Tag = scene.sid,
- //BackgroundImagePath = (scene as Scene).ImagePath,
- };
- rowView.AddChidren(functionView);
- //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
- ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
-
- LoadSceneFunctionDiv(functionView, scene);
- index++;
- }
-
- if (index == 0)
+ if (listScene.Count == 0)
{
var view = new FrameLayout();
sceneFunctionView.AddChidren(view);
@@ -323,6 +394,38 @@
};
view.AddChidren(btnNoCollectionTip);
}
+ else
+ {
+ var rowView = new FrameLayout();
+ new System.Threading.Thread(() =>
+ {
+ foreach (var scene in listScene)
+ {
+ System.Threading.Thread.Sleep(10);
+ Application.RunOnMainThread(() =>
+ {
+ if (index % 2 == 0)
+ {
+ rowView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(122),
+ };
+ sceneFunctionView.AddChidren(rowView);
+ sceneFunctionView.AddChidren(new Button()
+ {
+ Height = Application.GetRealHeight(7 + 7),
+ });
+ }
+ var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
+
+ var functionView = LoadSceneFunctionDiv(functionView_X, scene);
+ rowView.AddChidren(functionView);
+ index++;
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
}
catch (Exception ex)
{
@@ -335,8 +438,18 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
+ FrameLayout LoadSceneFunctionDiv(int functionView_X, Scene scene)
{
+ var view = new FrameLayout()
+ {
+ X = functionView_X,
+ Width = Application.GetRealWidth(164),
+ Height = Application.GetRealWidth(122),
+ Tag = scene.sid,
+ };
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, view);
+
try
{
Button btnCoverd = new Button()
@@ -376,7 +489,7 @@
btnZone = new Button()
{
X = Application.GetRealWidth(12),
- Y = btnName.Bottom,
+ Y = Application.GetRealWidth(68+24),
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
TextColor = CSS_Color.MainBackgroundColor,
@@ -413,21 +526,20 @@
IsSelected = scene.collect,
};
view.AddChidren(btnCollection);
- //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- //{
- // view.AddChidren(btnCollection);
- //}
- btnCollection.MouseUpEventHandler = (sender, e) => {
+ btnCollection.MouseUpEventHandler = (sender, e) =>
+ {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
};
LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
- btnSettingIcon.MouseUpEventHandler = (sender, e) => {
- Action backAction = () => {
+ btnSettingIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ Action backAction = () =>
+ {
LoadSceneFunctionControlZone(null);
};
- Action refreshAction = () => {
+ Action refreshAction = () =>
+ {
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
@@ -441,54 +553,15 @@
//鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑
scene.SceneCountDown(btnShowDelay);
- //if (scene.LastExecutionTime == "" || Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) < Convert.ToDouble(Utlis.GetTimestamp(false)))
- //{
- // int time = 0;
- // int.TryParse(Convert.ToInt32(
- // Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) - Convert.ToDouble(Utlis.GetTimestamp(false))
- // ).ToString(),out time);
- // if (time > 0)
- // {
- // new System.Threading.Thread(() =>
- // {
- // //int time = Convert.ToInt32(scene.delay);
- // if (time > 0)
- // {
- // while (time > 0)
- // {
- // Application.RunOnMainThread(() =>
- // {
- // if (time / 60 > 1)
- // {
- // btnShowDelay.Text = (time / 60).ToString() + "min";
- // }
- // else
- // {
- // btnShowDelay.Text = (time--).ToString() + "s";
- // }
- // });
- // if (time / 60 > 1)
- // {
- // System.Threading.Thread.Sleep(time / 60 * 60000);
- // }
- // else
- // {
- // System.Threading.Thread.Sleep(1000);
- // }
- // }
- // Application.RunOnMainThread(() =>
- // {
- // btnShowDelay.Text = "";
- // });
- // }
- // })
- // { IsBackground = true, Priority = System.Threading.ThreadPriority.BelowNormal }.Start();
- // }
- //}
+ return view;
}
catch (Exception ex)
{
MainPage.Log("homepage LoadControlView error : " + ex.Message);
+ return view;
+ }
+ finally
+ {
}
}
#endregion
@@ -525,8 +598,28 @@
{
contentPageView.PageChange = (sender, e) =>
{
- if (contentPageView.PageIndex == 0)
+ if (contentPageView.PageIndex == 2)
{
+ btnAddIconBg.Visible = false;
+ btnSecurityTitle.IsSelected = true;
+ btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnSecurityTitle.IsBold = true;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ btnSceneTilte.IsBold = false;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnAutomationTitle.IsBold = false;
+ }
+ else if (contentPageView.PageIndex == 0)
+ {
+ btnAddIconBg.Visible = true;
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSecurityTitle.IsBold = false;
+ }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsBold = true;
@@ -536,6 +629,13 @@
}
else
{
+ btnAddIconBg.Visible = true;
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSecurityTitle.IsBold = false;
+ }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsBold = true;
@@ -551,6 +651,12 @@
{
return;
}
+
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsSelected = false;
@@ -563,13 +669,35 @@
{
return;
}
+
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
-
};
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.MouseUpEventHandler = (sender, e) =>
+ {
+ if (btnSecurityTitle.IsSelected)
+ {
+ return;
+ }
+ btnSecurityTitle.IsSelected = true;
+ btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ contentPageView.PageIndex = 2;
+ };
+ }
}
#endregion
--
Gitblit v1.8.0