From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
index 68bb03f..220c220 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
@@ -13,6 +13,15 @@
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// wifi鍚�
+ /// </summary>
+ private string wifiName = string.Empty;
+ /// <summary>
+ /// wifi瀵嗙爜
+ /// </summary>
+ private string wifiPassword = string.Empty;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -20,8 +29,13 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- public void ShowForm()
+ /// <param name="i_wifiName">wifi鍚�(鍒殑鐣岄潰浼犺繃鏉ョ殑)</param>
+ /// <param name="i_wifiPassword">(鍒殑鐣岄潰浼犺繃鏉ョ殑)</param>
+ public void ShowForm(string i_wifiName, string i_wifiPassword)
{
+ this.wifiName = i_wifiName;
+ this.wifiPassword = i_wifiPassword;
+
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(StringId.AddInfraredRemoteControl));
//杩欎釜鐣岄潰鐨勮儗鏅渶瑕佺櫧鑹�
@@ -62,12 +76,9 @@
//鎼滅储鏃堕棿(绉�)
int searchTime = 5;
-#if __IOS__
-#endif
-#if __Android__
- //瀹夊崜鎼滅储钃濈墮(鐗规晥闂,鍔�1绉�)
- this.StartSearchBluetoothOnAndriod(searchTime + 1);
-#endif
+ //鎼滅储钃濈墮(鐗规晥闂,鍔�1绉�)
+ this.StartSearchBluetooth(searchTime + 1);
+
HdlThreadLogic.Current.RunThread(() =>
{
//杩涘害鏉＄壒鏁�
@@ -84,19 +95,18 @@
#endregion
- #region 鈻� 瀹夊崜鎼滅储钃濈墮_______________________
+ #region 鈻� 鎼滅储钃濈墮___________________________
-#if __Android__
/// <summary>
/// 瀹夊崜鎼滅储钃濈墮
/// </summary>
/// <param name="i_searchTime">鎼滅储鏃堕棿(绉�)</param>
- private void StartSearchBluetoothOnAndriod(int i_searchTime)
+ private void StartSearchBluetooth(int i_searchTime)
{
//寮�濮嬫悳绱㈣摑鐗�
- HdlAndroidBluetoothLogic.Current.ScanBluetooth(i_searchTime, (listBluetooth) =>
+ HdlBluetoothLogic.Current.ScanBluetooth(i_searchTime, (listBluetooth) =>
{
- var listDevice = new List<HdlAndroidBluetoothLogic.BluetoothInfo>();
+ var listDevice = new List<HdlBluetoothLogic.BluetoothInfo>();
foreach (var device in listBluetooth)
{
//鍙湁杩欎釜鏍囪瘑,鎵嶆槸绾㈠瀹�
@@ -109,7 +119,7 @@
if (listDevice.Count == 0)
{
//鎽ф瘉钃濈墮缂撳瓨
- HdlAndroidBluetoothLogic.Current.Dispone();
+ HdlBluetoothLogic.Current.Dispone();
//鏄剧ず澶辫触鐣岄潰
HdlThreadLogic.Current.RunMain(() =>
{
@@ -119,7 +129,7 @@
else if (listDevice.Count == 1)
{
//濡傛灉鍙娴嬪埌涓�涓�,鍒欑洿鎺ヨ繛鎺�
- HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
+ HdlBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
{
if (result == true)
{
@@ -128,8 +138,12 @@
{
this.CloseForm();
var form = new AddMiniRemoteControlDirection3Page();
- form.AddForm();
+ form.AddForm(this.wifiName, this.wifiPassword);
});
+ }
+ else
+ {
+ HdlBluetoothLogic.Current.Dispone();
}
});
}
@@ -144,7 +158,7 @@
this.ShowBluetoothListView(listName, (index) =>
{
//濡傛灉鍙娴嬪埌涓�涓�,鍒欑洿鎺ヨ繛鎺�
- HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
+ HdlBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
{
if (result == true)
{
@@ -153,15 +167,18 @@
{
this.CloseForm();
var form = new AddMiniRemoteControlDirection3Page();
- form.AddForm();
+ form.AddForm(this.wifiName, this.wifiPassword);
});
+ }
+ else
+ {
+ HdlBluetoothLogic.Current.Dispone();
}
});
});
}
});
}
-#endif
#endregion
@@ -232,8 +249,17 @@
var btnReSearch = this.AddBottomClickButton(Language.StringByID(StringId.ReSearch));
btnReSearch.ButtonClickEvent += (sender, e) =>
{
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ //妫�娴嬭摑鐗欓渶瑕佺殑涓滆タ
+ btnReSearch.CanClick = false;
+ HdlBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
+ {
+ btnReSearch.CanClick = true;
+ if (result == true)
+ {
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+ });
};
}
--
Gitblit v1.8.0