diff --git a/lib/data/services/ble_manager.dart b/lib/data/services/ble_manager.dart index 09eb7b842..9bd8325cb 100644 --- a/lib/data/services/ble_manager.dart +++ b/lib/data/services/ble_manager.dart @@ -8,6 +8,7 @@ import 'package:get_storage/get_storage.dart'; import 'package:get/get.dart'; import 'package:ble_service/ble_service.dart'; import 'package:agent_service/agent_service.dart'; +import '../models/user_Info.dart' as userInfo; import '/data/models/appconfig_model.dart'; import '../../data/models/appconfig.dart'; diff --git a/lib/data/services/meeting/meeting_task_service.dart b/lib/data/services/meeting/meeting_task_service.dart index b17d6adf0..51b88520c 100644 --- a/lib/data/services/meeting/meeting_task_service.dart +++ b/lib/data/services/meeting/meeting_task_service.dart @@ -7,7 +7,9 @@ import 'package:http/http.dart' as http; import '../../../core/utils/logger.dart'; import '../../../core/utils/synchrodata.dart'; +import '../../models/meeting_usage_stats.dart'; import '../db/sqflite_api.dart'; +import '../usage_stats_service.dart'; import 'meeting_upload_service.dart'; import '../../../data/models/appconfig.dart'; import 'summary_task_service.dart'; diff --git a/lib/data/services/pay_service.dart b/lib/data/services/pay_service.dart index cece8bcab..7d1f92dcd 100644 --- a/lib/data/services/pay_service.dart +++ b/lib/data/services/pay_service.dart @@ -1,7 +1,15 @@ +import 'dart:async'; +import 'dart:convert'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; import 'package:get/get.dart'; import '/data/services/network/api.dart'; import 'package:tobias/tobias.dart'; import 'package:url_launcher/url_launcher.dart'; +import 'package:in_app_purchase/in_app_purchase.dart'; +import 'package:in_app_purchase_android/in_app_purchase_android.dart'; +import 'package:package_info_plus/package_info_plus.dart'; +import 'package:flutter_dotenv/flutter_dotenv.dart'; import '../../data/models/user_Info.dart'; import '../../modules/login/controllers/weixinLogin.dart'; diff --git a/lib/modules/translation/controllers/translation_controller.dart b/lib/modules/translation/controllers/translation_controller.dart index 230a4369a..f0c9a6c3b 100644 --- a/lib/modules/translation/controllers/translation_controller.dart +++ b/lib/modules/translation/controllers/translation_controller.dart @@ -14,6 +14,7 @@ import 'package:pip/pip.dart'; import '../../../data/services/ast_service.dart'; import '../../../data/services/bluetooth_manager.dart'; import '../../../data/services/music_manager.dart'; +import '../../../data/services/translation_usage_service.dart'; import '../../../data/services/volcano_translation_service.dart'; import '../../../data/services/tts_service.dart'; import '../../../data/services/language_manager.dart'; @@ -51,7 +52,7 @@ class TranslationController extends GetxController with WidgetsBindingObserver { final BluetoothManager bluetoothManager = Get.find(); final BleManager bleManager = Get.find(); final _musiceManager = Get.find(); - late final TranslationUsageService _usageService; + late final UsageStatsService _usageService; // 安卓悬浮窗管理器 late final FloatingWindowManager _floatingWindowManager; // 苹果悬浮窗管理器 @@ -1042,11 +1043,10 @@ class TranslationController extends GetxController with WidgetsBindingObserver { await _astService.stopContinuousTranslation(); } _stopAsrActiveTracking(); - final langName = _languageManager - .getChineseNameByAsrCode( - (detectedLanguageCode.isNotEmpty - ? detectedLanguageCode - : sourceLanguageCode.value)) ?? + final langName = _languageManager.getChineseNameByAsrCode( + (detectedLanguageCode.isNotEmpty + ? detectedLanguageCode + : sourceLanguageCode.value)) ?? '未知'; _recordAsrUsageStats(langName); isRecognizing.value = false; diff --git a/pubspec.yaml b/pubspec.yaml index a6e8889d9..c2ceb54a4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: flutter_shaders: ^0.0.6 get: ^4.7.2 + in_app_purchase: ^3.2.3 json_annotation: ^4.9.0 get_storage: ^2.1.1 http: ^1.3.0 @@ -65,7 +66,6 @@ dependencies: fluwx: ^5.7.1 tobias: ^5.2.0 # 支付宝SDK url_launcher: ^6.3.1 - in_app_purchase: ^3.1.11 in_app_purchase_android: ^0.4.0+5 app_links: firebase_core: ^4.0.0 @@ -120,7 +120,6 @@ dependencies: path: local_plugins/native_plugin test: path: local_plugins/test - in_app_purchase: ^3.2.3 # 应用内购买插件 dev_dependencies: flutter_test: