From 1d1cad99a27c9f644c84eb3d376c70bd30a55879 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期三, 10 三月 2021 18:02:13 +0800 Subject: [PATCH] 2021-3-10-1 --- HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs index fd70da5..9f2bcf7 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs @@ -30,10 +30,6 @@ #region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙 FrameLayout topView; /// <summary> - /// 鍦烘櫙鍖哄煙锛岄《閮ㄥ尯鍩� - /// </summary> - FrameLayout sceneTopView; - /// <summary> /// 妤煎眰閫夋嫨涓嬫媺鍥炬爣 /// </summary> Button btnFloorDownIcon; @@ -75,7 +71,7 @@ bodyView.AddChidren(topView); //涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲 - var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare; + var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1|| DB_ResidenceData.Instance.CurrentRegion.IsOthreShare; //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲 if (HideAutoPage) { @@ -180,18 +176,10 @@ /// </summary> floorChangeView = new FrameLayout() { - Height = Application.GetRealHeight(52), + Height = Application.GetRealHeight(53), }; scenePageView.AddChidren(floorChangeView); #region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙 - /// <summary> - /// 鍦烘櫙鍖哄煙锛岄《閮ㄥ尯鍩� - /// </summary> - sceneTopView = new FrameLayout() - { - Height = Application.GetRealHeight(53), - }; - floorChangeView.AddChidren(sceneTopView); /// <summary> /// 妤煎眰閫夋嫨涓嬫媺鍥炬爣 /// </summary> @@ -200,7 +188,7 @@ Width = Application.GetMinRealAverage(16), Height = Application.GetMinRealAverage(16), X = Application.GetRealWidth(16), - Y = Application.GetRealHeight(18), + Gravity = Gravity.CenterVertical, UnSelectedImagePath = "Public/DownIcon.png", }; floorChangeView.AddChidren(btnFloorDownIcon); @@ -210,7 +198,7 @@ btnFloor = new Button() { X = btnFloorDownIcon.Right, - Y = Application.GetRealHeight(18), + Gravity = Gravity.CenterVertical, Width = Application.GetRealWidth(200), Height = Application.GetMinRealAverage(16), TextColor = CSS_Color.FirstLevelTitleColor, @@ -241,7 +229,7 @@ sceneFunctionView = new VerticalScrolViewLayout() { - Y = floorChangeView.Bottom, + Y = Application.GetRealHeight(53), Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30), }; scenePageView.AddChidren(sceneFunctionView); @@ -280,13 +268,15 @@ //} if (index % 2 == 0) { - sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) }); rowView = new FrameLayout() { Height = Application.GetRealWidth(122), }; sceneFunctionView.AddChidren(rowView); - sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) }); + sceneFunctionView.AddChidren(new Button() + { + Height = Application.GetRealHeight(7 + 7), + }); } var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16); -- Gitblit v1.8.0