From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期四, 16 四月 2020 17:10:57 +0800 Subject: [PATCH] 请合并代码 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs | 50 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs index 7e10cf7..dee86aa 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs @@ -31,6 +31,35 @@ //娓呯┖bodyFrame this.ClearBodyFrame(); + //涓嬩竴姝� + var btnNext = new BottomClickButton(); + btnNext.TextID = R.MyInternationalizationString.uNextway; + bodyFrameLayout.AddChidren(btnNext); + btnNext.ButtonClickEvent += (sender, e) => + { + //濡傛灉涓嶆槸鐑偣妯″紡 + if (HdlWifiLogic.Current.IsGatewayHotspot == false) + { + //閫夋嫨hdlZigbeeGW-xxxx缃戠粶 + this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uPleaseSelectGatewayXXNet)); + return; + } + var errorMsg = HdlWifiLogic.Current.StartApTcpConnection(); + if (errorMsg != null) + { + //鎷ユ湁閿欒 + this.ShowMassage(ShowMsgType.Error, errorMsg); + return; + } + var form = new WirelessApSelectNetworkForm(); + this.AddFromAndRemoveNowForm(form); + }; + //濡傛灉涓嶆槸缃戝叧鐑偣 + if (HdlWifiLogic.Current.IsGatewayHotspot == false) + { + btnNext.Visible = false; + } + //鍥剧墖 var framePic = new FrameLayout(); framePic.Width = Application.GetMinRealAverage(852); @@ -40,8 +69,7 @@ framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png"; bodyFrameLayout.AddChidren(framePic); - //璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆 - //閫夋嫨hdlZigbeeGW-xxxx缃戠粶 + //鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜 string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries); int yy = framePic.Bottom + Application.GetRealHeight(213); foreach (var msg in ArryMsg) @@ -64,10 +92,12 @@ btnSettion.Text = Language.StringByID(R.MyInternationalizationString.uGotoSettion); btnSettion.ButtonClickEvent += (sender, e) => { + HdlWifiLogic.Current.OpenAppWifiSettion(); + btnNext.Visible = true; }; bodyFrameLayout.AddChidren(btnSettion); //搴曠嚎 - int lineWidth = btnSettion.GetRealWidthByText(12); + int lineWidth = btnSettion.GetRealWidthByText(); var btnLine1 = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false); btnLine1.BackgroundColor = 0xff0075ff; btnLine1.Gravity = Gravity.CenterHorizontal; @@ -78,18 +108,8 @@ var btnHelp = this.AddHelpControl(); btnHelp.ButtonClickEvent += (sender, e) => { - var form = new DeviceDirection.DeviceDirectionHelpForm(); - form.AddForm("WirelessUdp"); - }; - - //涓嬩竴姝� - var btnNext = new BottomClickButton(); - btnNext.TextID = R.MyInternationalizationString.uNextway; - bodyFrameLayout.AddChidren(btnNext); - btnNext.ButtonClickEvent += (sender, e) => - { - var form = new WirelessApSelectNetworkForm(); - this.AddFromAndRemoveNowForm(form); + var form = new AddGatewayHelpForm(); + form.AddForm("Ap"); }; } -- Gitblit v1.8.0