From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 235 ++++++++++++++++++++++++----------------------------------
1 files changed, 96 insertions(+), 139 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index d647195..91a1d58 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -1,5 +1,5 @@
锘縰sing System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -21,8 +21,8 @@
/// 鍦烘櫙鍐呭鏄剧ず鍖哄煙
/// </summary>
FrameLayout floorChangeView;
- /// <summary>
- /// 妤煎眰鎴块棿閫夋嫨鐨勪笅鎷夊璞�
+ /// <summary>
+ /// 妤煎眰鎴块棿閫夋嫨鐨勪笅鎷夊璞�
/// </summary>
FloorRoomSelectPopupView floorRoomSelectView = null;
Button btnSceneTilte;
@@ -130,20 +130,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),
+ 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()
@@ -189,7 +183,7 @@
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
X = Application.GetRealWidth(16),
- Gravity = Gravity.CenterVertical,
+ Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Public/DownIcon.png",
};
floorChangeView.AddChidren(btnFloorDownIcon);
@@ -199,7 +193,7 @@
btnFloor = new Button()
{
X = btnFloorDownIcon.Right,
- Gravity = Gravity.CenterVertical,
+ Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(200),
Height = Application.GetMinRealAverage(16),
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -207,30 +201,30 @@
TextAlignment = TextAlignment.CenterLeft,
Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
- floorChangeView.AddChidren(btnFloor);
-
- string nowSelectId = null;
- btnFloor.MouseUpEventHandler += (sender, e) =>
- {
- if (this.floorRoomSelectView == null)
- {
- //鍏堝垵濮嬪寲
- this.floorRoomSelectView = new FloorRoomSelectPopupView();
- }
- //鏄剧ず涓嬫媺鍒楄〃
- this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
- {
- nowSelectId = selectId;
- //閲嶆柊鍒锋柊鍦烘櫙鍒楄〃
- this.LoadSceneFunctionControlZone(listScene);
- }, nowSelectId);
+ floorChangeView.AddChidren(btnFloor);
+
+ string nowSelectId = null;
+ btnFloor.MouseUpEventHandler += (sender, e) =>
+ {
+ if (this.floorRoomSelectView == null)
+ {
+ //鍏堝垵濮嬪寲
+ this.floorRoomSelectView = new FloorRoomSelectPopupView();
+ }
+ //鏄剧ず涓嬫媺鍒楄〃
+ this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
+ {
+ nowSelectId = selectId;
+ //閲嶆柊鍒锋柊鍦烘櫙鍒楄〃
+ this.LoadSceneFunctionControlZone(listScene);
+ }, nowSelectId);
};
#endregion
-
+
sceneFunctionView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(53),
+ Y = Application.GetRealHeight(53),
Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
};
scenePageView.AddChidren(sceneFunctionView);
@@ -242,62 +236,22 @@
/// </summary>
void LoadSceneFunctionControlZone(List<Scene> listScene)
{
- //topView.AddChidren(btnAddIcon);
-
sceneFunctionView.RemoveAll();
- var rowView = new FrameLayout();
try
{
int index = 0;
//鑾峰彇鑳藉鏄剧ず鐨勫満鏅�
- if (listScene == null)
- {
- //鍒濆鍊�
- if (this.floorRoomSelectView == null)
- {
- //鍏堝垵濮嬪寲
- this.floorRoomSelectView = new FloorRoomSelectPopupView();
- }
- listScene = this.floorRoomSelectView.GetCanShowListScene();
- }
- foreach (var scene in listScene)
+ if (listScene == null)
{
- //if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- //{
- // scene.collect = false;
- // continue;
- //}
- if (index % 2 == 0)
+ //鍒濆鍊�
+ if (this.floorRoomSelectView == null)
{
- rowView = new FrameLayout()
- {
- Height = Application.GetRealWidth(122),
- };
- sceneFunctionView.AddChidren(rowView);
- sceneFunctionView.AddChidren(new Button()
- {
- Height = Application.GetRealHeight(7 + 7),
- });
+ //鍏堝垵濮嬪寲
+ this.floorRoomSelectView = new FloorRoomSelectPopupView();
}
- 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++;
+ listScene = this.floorRoomSelectView.GetCanShowListScene();
}
-
- if (index == 0)
+ if (listScene.Count == 0)
{
var view = new FrameLayout();
sceneFunctionView.AddChidren(view);
@@ -323,6 +277,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 +321,19 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
+ //FrameLayout 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 +373,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 +410,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 +437,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
@@ -503,7 +460,7 @@
contentPageView.AddChidren(automationPage);
UI2.Intelligence.Automation.MainView.automationPage = automationPage;
UI2.Intelligence.Automation.MainView.MainShow();
- }
+ }
#endregion
}
@@ -616,7 +573,7 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
+ void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Button btnShowDelay, Scene scene)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
--
Gitblit v1.8.0