From bb4b3ed9e69ed83c9dd79f3ae4c0f0081cacee83 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 25 八月 2021 18:00:44 +0800
Subject: [PATCH] 2021-08-24 1.更新iOSLinphoneDLL库
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 95 +++++++++++++++++++++++------------------------
1 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 7fd9097..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;
@@ -61,6 +61,7 @@
public void LoadPage()
{
+ MainPage.CurPageIndex = 2;
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
#region top
topView = new FrameLayout()
@@ -71,7 +72,7 @@
bodyView.AddChidren(topView);
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
- var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
@@ -129,17 +130,17 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
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.IsOthreShare)
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnAddIcon);
}
@@ -188,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);
@@ -198,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,
@@ -206,27 +207,27 @@
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),
@@ -249,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)
{
@@ -395,7 +396,7 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (scene.userId == UserInfo.Current.ID)
{
view.AddChidren(btnSettingIcon);
}
@@ -411,12 +412,7 @@
SelectedImagePath = "Collection/CollectionIcon.png",
IsSelected = scene.collect,
};
- //view.AddChidren(btnCollection);
- //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- view.AddChidren(btnCollection);
- }
+ view.AddChidren(btnCollection);
btnCollection.MouseUpEventHandler = (sender, e) => {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
@@ -502,7 +498,7 @@
contentPageView.AddChidren(automationPage);
UI2.Intelligence.Automation.MainView.automationPage = automationPage;
UI2.Intelligence.Automation.MainView.MainShow();
- }
+ }
#endregion
}
@@ -582,7 +578,7 @@
if (!btnAutomationTitle.IsSelected)
{
//濡傛灉鏄垚鍛�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//濡傛灉娌℃湁鍦烘櫙鏉冮檺
if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
@@ -605,7 +601,8 @@
else
{
//璺宠浆鍒伴�昏緫鐣岄潰
- UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
+ UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
+ logicMainView.SkipAddLogicPage();
}
};
}
@@ -614,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