From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 14 一月 2021 19:34:59 +0800 Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 18 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs index eeaef99..1991ff5 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs @@ -54,16 +54,28 @@ //娓呯┖bodyFrame this.ClearBodyFrame(); - //缃戝叧濡傛灉姝e父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑� - string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries); - int yy = Application.GetRealHeight(1066); + //鎵嬫満杩炴帴缃戝叧 + var btnTitle = new NormalViewControl(400, 60, true); + btnTitle.TextID = R.MyInternationalizationString.uMobileConnectionGateway; + btnTitle.X = Application.GetRealWidth(75); + btnTitle.Y = Application.GetRealHeight(939); + btnTitle.IsBold = true; + btnTitle.TextSize = 14; + bodyFrameLayout.AddChidren(btnTitle); + + //1.app鑻ユ樉绀鸿繛鎺ョ殑缃戝叧璁惧锛岃〃鏄庤繛鎺ユ垚鍔� + //2.璇峰墠寰�娣诲姞鍏朵粬璁惧 + //3.鑻ラ暱鏃堕棿鏃犳硶杩炴帴鎴愬姛锛岃鍓嶅線鈥滄煡鐪嬪府鍔┾�� + string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddMiniGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries); + int yy = btnTitle.Bottom + Application.GetRealHeight(23); foreach (var msg in ArryMsg) { var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false); btnMsg.Text = msg; btnMsg.Y = yy; - btnMsg.TextAlignment = TextAlignment.Center; + btnMsg.X = btnTitle.X; btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1; + btnMsg.TextSize = 12; bodyFrameLayout.AddChidren(btnMsg); yy = btnMsg.Bottom; } @@ -72,6 +84,14 @@ this.InitConcetionAnimete(); //寮�鍚綉鍏虫娴嬬殑绾跨▼ this.StartCheckGatewayThread(); + + //鏌ョ湅甯姪 + var btnHelp = this.AddHelpControl(); + btnHelp.ButtonClickEvent += (sender, e) => + { + var form = new AddGatewayHelpForm(); + form.AddForm("Mini"); + }; } /// <summary> @@ -84,25 +104,25 @@ //鍥炬爣 var picGwImage = new FrameLayout(); - picGwImage.Width = this.GetPictrueRealSize(857); - picGwImage.Height = this.GetPictrueRealSize(239); - picGwImage.Y = Application.GetRealWidth(236); + picGwImage.Width = this.GetPictrueRealSize(848); + picGwImage.Height = this.GetPictrueRealSize(475); + picGwImage.Y = Application.GetRealHeight(199); picGwImage.Gravity = Gravity.CenterHorizontal; - picGwImage.BackgroundImagePath = "Gateway/MiniGatewaySearching.png"; + picGwImage.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png"; bodyFrameLayout.AddChidren(picGwImage); var btnFailIcon = new PicViewControl(66, 66); btnFailIcon.UnSelectedImagePath = "Item/FailIcon.png"; btnFailIcon.Gravity = Gravity.CenterHorizontal; - btnFailIcon.Y = this.GetPictrueRealSize(110); + btnFailIcon.Y = this.GetPictrueRealSize(200); picGwImage.AddChidren(btnFailIcon); //鎼滅储澶辫触 var btnFailView = new NormalViewControl(300, 60, true); btnFailView.TextAlignment = TextAlignment.Center; - btnFailView.Y = picGwImage.Bottom - Application.GetRealHeight(15); + btnFailView.Y = btnFailIcon.Bottom + Application.GetRealHeight(58); btnFailView.Gravity = Gravity.CenterHorizontal; btnFailView.TextColor = UserCenterColor.Current.TextGrayColor3; btnFailView.TextID = R.MyInternationalizationString.uSearchFail; - bodyFrameLayout.AddChidren(btnFailView); + picGwImage.AddChidren(btnFailView); //瑙e喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細 var btnMsg1 = new NormalViewControl(930, 60, true); @@ -198,23 +218,23 @@ { //鍥炬爣 var btnGwImage = new FrameLayout(); - btnGwImage.Width = this.GetPictrueRealSize(857); - btnGwImage.Height = this.GetPictrueRealSize(239); - btnGwImage.Y = Application.GetRealHeight(360); + btnGwImage.Width = this.GetPictrueRealSize(848); + btnGwImage.Height = this.GetPictrueRealSize(475); + btnGwImage.Y = Application.GetRealHeight(199); btnGwImage.Gravity = Gravity.CenterHorizontal; - btnGwImage.BackgroundImagePath = "Gateway/MiniGatewaySearching.png"; + btnGwImage.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png"; bodyFrameLayout.AddChidren(btnGwImage); //姝e湪鎼滅储缃戝叧鈥� var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false); btnMsg.TextID = R.MyInternationalizationString.uGatewaySearching; - btnMsg.Y = Application.GetRealHeight(821); + btnMsg.Y = btnGwImage.Bottom + Application.GetRealHeight(150); btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3; btnMsg.TextAlignment = TextAlignment.Center; bodyFrameLayout.AddChidren(btnMsg); //棣栨牸鐨刋杞� - int firstPoint = this.GetPictrueRealSize(275); + int firstPoint = this.GetPictrueRealSize(280); //涓�鏍肩殑瀹藉害 int width = this.GetPictrueRealSize(22); //闂磋窛澶у皬 @@ -231,7 +251,7 @@ var btnRound = new PicViewControl(width, width, false); btnRound.Radius = (uint)width / 2; btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor; - btnRound.Y = this.GetPictrueRealSize(132); + btnRound.Y = this.GetPictrueRealSize(225); btnRound.X = listPoint[0]; btnGwImage.AddChidren(btnRound); -- Gitblit v1.8.0