From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 8e94a49..efb7272 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -63,43 +63,47 @@
addSceneView.AddChidren(btnAddSceneText);
#endregion
- #region 鎹曡幏鍦烘櫙
- FrameLayout catchSceneView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Y =addSceneView.Bottom,//+ Application.GetRealWidth(10),
- Width = Application.GetRealWidth(361),
- Height = Application.GetRealWidth(202),
- Radius = (uint)Application.GetRealWidth(12),
- };
- bodyView.AddChidren(catchSceneView);
- ImageView catchSceneImageView = new ImageView()
+ if (DB_ResidenceData.Instance.GatewayType == 0) { }
+ else
{
- Gravity = Gravity.CenterHorizontal,
- Radius = (uint)Application.GetRealWidth(12),
- ImagePath = "Intelligence/CreateScene2Bg.png",
- };
- catchSceneView.AddChidren(catchSceneImageView);
+ #region 鎹曡幏鍦烘櫙
+ FrameLayout catchSceneView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = addSceneView.Bottom,//+ Application.GetRealWidth(10),
+ Width = Application.GetRealWidth(361),
+ Height = Application.GetRealWidth(202),
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ bodyView.AddChidren(catchSceneView);
- btnCatchSceneBg = new Button()
- {
- Radius = (uint)Application.GetRealWidth(12),
- };
- catchSceneView.AddChidren(btnCatchSceneBg);
+ ImageView catchSceneImageView = new ImageView()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetRealWidth(12),
+ ImagePath = "Intelligence/CreateScene2Bg.png",
+ };
+ catchSceneView.AddChidren(catchSceneImageView);
- Button btnCatchSceneText = new Button()
- {
- Y = Application.GetRealWidth(126),
- Height = Application.GetRealWidth(68),
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- TextAlignment = TextAlignment.Center,
- TextID = StringId.CatchScene,
- };
- catchSceneView.AddChidren(btnCatchSceneText);
- #endregion
+ btnCatchSceneBg = new Button()
+ {
+ Radius = (uint)Application.GetRealWidth(12),
+ };
+ catchSceneView.AddChidren(btnCatchSceneBg);
+ Button btnCatchSceneText = new Button()
+ {
+ Y = Application.GetRealWidth(126),
+ Height = Application.GetRealWidth(68),
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
+ TextAlignment = TextAlignment.Center,
+ TextID = StringId.CatchScene,
+ };
+ catchSceneView.AddChidren(btnCatchSceneText);
+ #endregion
+ }
/*
#region 鐢靛奖鍦烘櫙
@@ -150,7 +154,10 @@
void LoadEventList()
{
LoadEvent_SkipAddScenePage();
- LoadEvent_SkipCatchScenePage();
+ if (DB_ResidenceData.Instance.GatewayType != 0)
+ {
+ LoadEvent_SkipCatchScenePage();
+ }
}
/// <summary>
--
Gitblit v1.8.0