From 9c8a5408b707322bc195b5dbce07aa30bd539cc7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 12 三月 2021 17:13:01 +0800
Subject: [PATCH] ios蓝牙
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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..93c6491 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection2Page.cs
@@ -62,12 +62,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 +81,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 +105,7 @@
if (listDevice.Count == 0)
{
//鎽ф瘉钃濈墮缂撳瓨
- HdlAndroidBluetoothLogic.Current.Dispone();
+ HdlBluetoothLogic.Current.Dispone();
//鏄剧ず澶辫触鐣岄潰
HdlThreadLogic.Current.RunMain(() =>
{
@@ -119,7 +115,7 @@
else if (listDevice.Count == 1)
{
//濡傛灉鍙娴嬪埌涓�涓�,鍒欑洿鎺ヨ繛鎺�
- HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
+ HdlBluetoothLogic.Current.ContectBluetooth(listDevice[0], (result) =>
{
if (result == true)
{
@@ -144,7 +140,7 @@
this.ShowBluetoothListView(listName, (index) =>
{
//濡傛灉鍙娴嬪埌涓�涓�,鍒欑洿鎺ヨ繛鎺�
- HdlAndroidBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
+ HdlBluetoothLogic.Current.ContectBluetooth(listDevice[index], (result) =>
{
if (result == true)
{
@@ -161,7 +157,6 @@
}
});
}
-#endif
#endregion
@@ -232,8 +227,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