From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 81 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index d647195..6754818 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;
@@ -136,9 +136,9 @@
}
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)
{
@@ -189,7 +189,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 +199,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 +207,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);
@@ -250,15 +250,15 @@
{
int index = 0;
//鑾峰彇鑳藉鏄剧ず鐨勫満鏅�
- if (listScene == null)
- {
- //鍒濆鍊�
- if (this.floorRoomSelectView == null)
- {
- //鍏堝垵濮嬪寲
- this.floorRoomSelectView = new FloorRoomSelectPopupView();
- }
- listScene = this.floorRoomSelectView.GetCanShowListScene();
+ if (listScene == null)
+ {
+ //鍒濆鍊�
+ if (this.floorRoomSelectView == null)
+ {
+ //鍏堝垵濮嬪寲
+ this.floorRoomSelectView = new FloorRoomSelectPopupView();
+ }
+ listScene = this.floorRoomSelectView.GetCanShowListScene();
}
foreach (var scene in listScene)
{
@@ -413,11 +413,6 @@
IsSelected = scene.collect,
};
view.AddChidren(btnCollection);
- //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
- //{
- // view.AddChidren(btnCollection);
- //}
btnCollection.MouseUpEventHandler = (sender, e) => {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
@@ -503,7 +498,7 @@
contentPageView.AddChidren(automationPage);
UI2.Intelligence.Automation.MainView.automationPage = automationPage;
UI2.Intelligence.Automation.MainView.MainShow();
- }
+ }
#endregion
}
@@ -616,7 +611,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