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/AddMiniRemoteControlDirection1Page.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection1Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection1Page.cs
index 3f32913..17c9dc1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection1Page.cs
@@ -57,21 +57,19 @@
var btnNext = this.AddBottomClickButton(Language.StringByID(StringId.Next));
btnNext.ButtonClickEvent += (sender, e) =>
{
-#if __IOS__
-#endif
-#if __Android__
//妫�娴嬭摑鐗欓渶瑕佺殑涓滆タ
- HdlAndroidBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
+ btnNext.CanClick = false;
+ HdlBluetoothLogic.Current.CheckCanScanBluetooth((result) =>
{
+ btnNext.CanClick = true;
if (result == true)
{
this.CloseForm();
var form = new AddMiniRemoteControlDirection2Page();
- //wifi鍜屽瘑鐮侀兘涓虹┖
- form.AddForm();
+ //鍒濆wifi鍜屽瘑鐮佷负绌�
+ form.AddForm(string.Empty, string.Empty);
}
});
-#endif
};
}
--
Gitblit v1.8.0