From 4a7c825640dc00c9f81f0021ecc8f3164036aff6 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Thu, 16 May 2024 18:05:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 3 ++- star_lock/images/lan/lan_keys.json | 3 ++- star_lock/images/lan/lan_zh.json | 3 ++- star_lock/lib/blue/blue_manage.dart | 11 +++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 42749191..27e1c76e 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -853,6 +853,7 @@ "开锁事件":"Unlock event", "异常事件":"Abnormal event", "门铃事件":"Doorbell event", - "视频事件":"Video event" + "视频事件":"Video event", + "请开启蓝牙":"Please turn on Bluetooth" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index ddd7610d..3d671b57 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -881,5 +881,6 @@ "开锁事件":"开锁事件", "异常事件":"异常事件", "门铃事件":"门铃事件", - "视频事件":"视频事件" + "视频事件":"视频事件", + "请开启蓝牙":"请开启蓝牙" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index f0ce8aa6..1bd2b742 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -851,5 +851,6 @@ "开锁事件":"开锁事件", "异常事件":"异常事件", "门铃事件":"门铃事件", - "视频事件":"视频事件" + "视频事件":"视频事件", + "请开启蓝牙":"请开启蓝牙" } diff --git a/star_lock/lib/blue/blue_manage.dart b/star_lock/lib/blue/blue_manage.dart index 9f99375b..223fe584 100644 --- a/star_lock/lib/blue/blue_manage.dart +++ b/star_lock/lib/blue/blue_manage.dart @@ -1,9 +1,13 @@ import 'dart:async'; import 'dart:io'; +import 'package:app_settings/app_settings.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; +import 'package:star_lock/tools/showTipView.dart'; +import 'package:star_lock/widget/permission/permission_dialog.dart'; +import 'package:url_launcher/url_launcher.dart'; import 'io_tool/io_model.dart'; import 'io_tool/io_tool.dart'; @@ -657,12 +661,11 @@ class BlueManage { // 写入 Future writeNull() async { List services = - await bluetoothConnectDevice!.discoverServices(); + await bluetoothConnectDevice!.discoverServices(); for (BluetoothService service in services) { if (service.uuid == _serviceIdConnect) { for (BluetoothCharacteristic characteristic - in service.characteristics) { - + in service.characteristics) { if (characteristic.characteristicUuid == _characteristicIdWrite) { try { List valueList = [1]; @@ -739,7 +742,7 @@ class BlueManage { await FlutterBluePlus.turnOn(); } if (Platform.isIOS) { - EasyLoading.showToast("请开启蓝牙", duration: 2000.milliseconds); + EasyLoading.showToast("请开启蓝牙".tr, duration: 2000.milliseconds); } }