From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
index 7e10cf7..d7f3ef3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
@@ -31,17 +31,45 @@
//娓呯┖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.AddFormAndCloseNowForm(form);
+ };
+ //濡傛灉涓嶆槸缃戝叧鐑偣
+ if (HdlWifiLogic.Current.IsGatewayHotspot == false)
+ {
+ btnNext.Visible = false;
+ }
+
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(852);
- framePic.Height = Application.GetMinRealAverage(478);
+ framePic.Width = this.GetPictrueRealSize(852);
+ framePic.Height = this.GetPictrueRealSize(478);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(285);
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,11 +92,13 @@
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);
- var btnLine1 = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ int lineWidth = btnSettion.GetRealWidthByText();
+ var btnLine1 = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = 0xff0075ff;
btnLine1.Gravity = Gravity.CenterHorizontal;
btnLine1.Y = btnSettion.Bottom - Application.GetRealHeight(8);
@@ -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