From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection3Page.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection3Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection3Page.cs index 3d08125..2332a70 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection3Page.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/MiniRemoteControl/AddMiniRemoteControlDirection3Page.cs @@ -78,12 +78,12 @@ //鐩墠鍙敮鎸�2.4G WiFi缃戠粶 //鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О var strMsg = Language.StringByID(StringId.AddInfraredRemoteControlMsg4); - int yy = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor, + var listContr = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor, Application.GetRealHeight(20), btnWifi.Bottom + Application.GetRealHeight(16), TextAlignment.CenterLeft); //wifi琛� var rowWifi = new RowLayoutControl(); - rowWifi.Y = yy + Application.GetRealHeight(32); + rowWifi.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(32); bodyFrameLayout.AddChidren(rowWifi); //wifi鍚嶅瓧 var txtWifi = rowWifi.frameTable.AddLeftInput(wifiName, 200); -- Gitblit v1.8.0