From 24dce73df68f96c4e7ae4ef82658d5fc89f31e0b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 23 八月 2021 09:58:33 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 158 ++++++++++++++++++++--------------------------------
1 files changed, 60 insertions(+), 98 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 6754818..663d170 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -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),
};
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- {
- topView.AddChidren(btnAddIcon);
- }
+ topView.AddChidren(btnAddIcon);
#endregion
contentPageView = new PageLayout()
@@ -242,10 +236,7 @@
/// </summary>
void LoadSceneFunctionControlZone(List<Scene> listScene)
{
- //topView.AddChidren(btnAddIcon);
-
sceneFunctionView.RemoveAll();
- var rowView = new FrameLayout();
try
{
int index = 0;
@@ -260,44 +251,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 +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()
@@ -413,16 +410,20 @@
IsSelected = scene.collect,
};
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 淇敼鍥剧墖鍔犺浇鏂规硶
@@ -436,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
--
Gitblit v1.8.0