diff --git a/lib/modules/meeting/views/meeting_view.dart b/lib/modules/meeting/views/meeting_view.dart index c7d9c7688..dfa9a4e5a 100644 --- a/lib/modules/meeting/views/meeting_view.dart +++ b/lib/modules/meeting/views/meeting_view.dart @@ -74,7 +74,7 @@ class MeetingView extends GetView { ), ), Positioned( - bottom: 10, + bottom: ScreenUtil().bottomBarHeight + 10, child: GestureDetector( onTap: () { Get.bottomSheet( diff --git a/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart b/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart index 3fe3f689c..7adfc296b 100644 --- a/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart +++ b/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart @@ -216,11 +216,6 @@ class OtaUpgradeController extends GetxController { // 版本检查 bool isUpdate = _isNewVersionAvailable(product.version!); - if (isUpdate) { - await _bleManager.setEnterOta(true); - await Future.delayed(const Duration(seconds: 2)); - jlota.init(); - } isUpdateAvailable.value = isUpdate; } catch (e) { @@ -337,6 +332,10 @@ class OtaUpgradeController extends GetxController { // 修改后的startDownload方法 Future startDownload() async { + await _bleManager.setEnterOta(true); + await Future.delayed(const Duration(seconds: 2)); + jlota.init(); + isDownloading.value = true; showDetailedStatus.value = true; detailedStatus.value = '准备下载固件包...'; diff --git a/local_plugins/ota/ios/Classes/BleManager/JLBleManager.m b/local_plugins/ota/ios/Classes/BleManager/JLBleManager.m index cb22ecfa8..08cd5b8c5 100644 --- a/local_plugins/ota/ios/Classes/BleManager/JLBleManager.m +++ b/local_plugins/ota/ios/Classes/BleManager/JLBleManager.m @@ -48,7 +48,7 @@ NSString *FLT_BLE_RCSP_R = @"AE02"; //命令“读”通道 - (instancetype)init { self = [super init]; if (self) { - _isPaired = YES; + _isPaired = NO; _pairStatus = NO; _bleManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];