From f25c6122eb7e26be5e7f036cf29b9019c4953be2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 19:44:02 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
old mode 100644
new mode 100755
index 16782af..380a351
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -82,6 +82,7 @@
Height = Application.GetRealHeight(44 * 5),
};
var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
+
if (roomList.Count > 5)
{
bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
@@ -157,7 +158,7 @@
FrameLayout bghFrameLyout = new FrameLayout
{
- X = Application.GetRealWidth(10),
+ X = Application.GetRealWidth(118),
Y = Application.GetRealHeight(103),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(21 + 44),
--
Gitblit v1.8.0