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/WirelessApDirection3Form.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
index 881549b..aa16a54 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection3Form.cs
@@ -9,6 +9,10 @@
/// </summary>
public class WirelessApDirection3Form : EditorCommonForm
{
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ #endregion
+
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
@@ -35,8 +39,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
//涓嬩竴姝�
@@ -45,9 +49,17 @@
bodyFrameLayout.AddChidren(btnNext);
btnNext.ButtonClickEvent += (sender, e) =>
{
+ //濡傛灉杩樻槸鐑偣妯″紡
+ if (HdlWifiLogic.Current.IsGatewayHotspot == true)
+ {
+ //璇烽摼鎺ュ搴璚ifi
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uPleaseLinkHomeWifi));
+ return;
+ }
var form = new WirelessApSearchForm();
this.AddFromAndRemoveNowForm(form);
};
+ btnNext.Visible = false;
//鍥剧墖
var framePic = new FrameLayout();
@@ -58,8 +70,7 @@
framePic.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璇峰墠寰�绉诲姩璁惧WLAN璁剧疆
- //閲嶆柊杩炴帴瀹跺涵wiFi
+ //鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg3).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = framePic.Bottom + Application.GetRealHeight(369);
foreach (var msg in ArryMsg)
@@ -82,10 +93,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;
--
Gitblit v1.8.0