Merge branch 'new_dev' of https://github.com/deepcloud2048/deep_voice into new_dev

1 year ago · 23c3ad4222
8 changed files with 47 additions and 50 deletions
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -45,7 +45,6 @@

 /* Begin PBXFileReference section */
 		0AD944112DD9DB5C00557D21 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
-		0AD944132DDA0C0D00557D21 /* AccessorySetupKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AccessorySetupKit.framework; path = System/Library/Frameworks/AccessorySetupKit.framework; sourceTree = SDKROOT; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		162D67C21ED243BA396CEF5C /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@ -109,7 +108,6 @@
 		1E5DDD8701F6FB27AA502080 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				0AD944132DDA0C0D00557D21 /* AccessorySetupKit.framework */,
 				EFDA2C0DD7A7D82CA03799B2 /* Pods_Runner.framework */,
 				162D67C21ED243BA396CEF5C /* Pods_RunnerTests.framework */,
 			);
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -106,6 +106,8 @@
 	<string>Bluetooth permission is required to connect and manage audio devices</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>Calendar permission is required to schedule and manage your audio meetings and recording tasks</string>
+	<key>NSCalendarsFullAccessUsageDescription</key>
+	<string>Calendar permission is required to schedule and manage your audio meetings and recording tasks</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Camera permission is required for QR code scanning and video calling functions</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
--- a/lib/data/services/novice_guide_service.dart
+++ b/lib/data/services/novice_guide_service.dart
@ -68,11 +68,11 @@ class NoviceGuideService extends GetxService {
      'method': () async {
        //创建会议提醒需要日历权限
        await PermissionUtil.instance.requestPermission(
-          permissionType: Permission.calendarWriteOnly,
-          permissionName: 'calendarWrite'.tr, // 日历写入
-          explanationText: 'calendarWritePermissionDesc'.tr, // 用于创建日历事件和提醒
+          permissionType: Permission.calendarFullAccess,
+          permissionName: 'calendarFullAccess'.tr, // 日历写入
+          explanationText: 'calendarFullAccessPermissionDesc'.tr, // 用于创建日历事件和提醒
          permanentDenialText:
-              'calendarWritePermissionDetailDesc'.tr, // 创建日历事件需要日历写入权限
+              'calendarFullAccessPermissionDetailDesc'.tr, // 创建日历事件需要日历写入权限
        );
      },
    },
--- a/lib/modules/permissions/models/permission_group.dart
+++ b/lib/modules/permissions/models/permission_group.dart
@ -3,17 +3,19 @@ import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:device_info_plus/device_info_plus.dart';

-class PermissionGroup {
+class PermissionGroupModel {
  final String titleKey;
  final IconData icon;
  final List<Permission> permissions;

-  const PermissionGroup({
+  const PermissionGroupModel({
    required this.titleKey,
    required this.icon,
    required this.permissions,
  });
+}

+class PermissionGroup {
  /// 获取蓝牙权限列表（根据平台和Android版本）
  static Future<List<Permission>> _getBluetoothPermissions() async {
    if (Platform.isAndroid) {
@ -41,55 +43,55 @@ class PermissionGroup {
  }

  /// 获取平台特定的权限组列表（异步方法）
-  static Future<List<PermissionGroup>> getPlatformGroups() async {
+  static Future<List<PermissionGroupModel>> getPlatformGroups() async {
    // 动态获取蓝牙权限列表
    final bluetoothPermissions = await _getBluetoothPermissions();

    return [
      // 通讯权限组 - 仅Android（包含联系人权限）
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'communicationPermissions',
        icon: Icons.phone_android,
        permissions: [Permission.phone, Permission.sms, Permission.contacts],
      ),
      // 蓝牙权限组 - 根据平台动态获取权限
-      PermissionGroup(
+      PermissionGroupModel(
        titleKey: 'bluetoothPermissions',
        icon: Icons.bluetooth,
        permissions: bluetoothPermissions,
      ),
      // 通知权限组
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'notificationPermissions',
        icon: Icons.notifications,
        permissions: [Permission.notification],
      ),
      // 闹钟权限组 - 仅Android
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'alarmPermissions',
        icon: Icons.alarm,
        permissions: [Permission.scheduleExactAlarm],
      ),
      // 日历权限组
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'calendarPermissions',
        icon: Icons.calendar_today,
        permissions: [Permission.calendarFullAccess],
      ),
      // 位置权限组
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'locationPermissions',
        icon: Icons.location_on,
        permissions: [Permission.location],
      ),
      // 存储权限组
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'storagePermissions',
        icon: Icons.storage,
        permissions: [Permission.storage],
      ),
      // 麦克风权限组
-      const PermissionGroup(
+      const PermissionGroupModel(
        titleKey: 'microphonePermissions',
        icon: Icons.mic,
        permissions: [Permission.microphone],
--- a/lib/modules/permissions/views/permissions_view.dart
+++ b/lib/modules/permissions/views/permissions_view.dart
@ -4,7 +4,6 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'dart:ui';
 import 'dart:io' show Platform;
-import 'package:device_info_plus/device_info_plus.dart';

 import '../controllers/permissions_controller.dart';
 import '../models/permission_group.dart';
@ -56,7 +55,7 @@ class PermissionsView extends GetView<PermissionsController> {
  }

  Widget _buildPermissionGroups(bool isDarkMode) {
-    return FutureBuilder<List<PermissionGroup>>(
+    return FutureBuilder<List<PermissionGroupModel>>(
      future: PermissionGroup.getPlatformGroups(),
      builder: (context, snapshot) {
        if (snapshot.connectionState == ConnectionState.waiting) {
@ -94,7 +93,7 @@ class PermissionsView extends GetView<PermissionsController> {
    );
  }

-  bool _shouldShowGroup(PermissionGroup group) {
+  bool _shouldShowGroup(PermissionGroupModel group) {
    // Android特定权限组
    if (group.titleKey == 'communicationPermissions' ||
        group.titleKey == 'alarmPermissions') {
@ -162,7 +161,8 @@ class PermissionsView extends GetView<PermissionsController> {
                  ? ImageFilter.blur(sigmaX: 5, sigmaY: 5)
                  : ImageFilter.blur(sigmaX: 0, sigmaY: 0),
              child: Column(
-                children: _buildPermissionItems(permissions, statuses, isDarkMode),
+                children:
+                    _buildPermissionItems(permissions, statuses, isDarkMode),
              ),
            ),
          ),
@ -241,7 +241,8 @@ class PermissionsView extends GetView<PermissionsController> {
                value: status.isGranted,
                onChanged: controller.isRequestingPermission.value
                    ? null
-                : (value) => _handlePermissionToggle(permission, status, value),
+                    : (value) =>
+                        _handlePermissionToggle(permission, status, value),
                activeColor: Colors.blue[600],
              )),
        ],
--- a/local_plugins/ble_service/ios/ble_service/Package.swift
+++ b/local_plugins/ble_service/ios/ble_service/Package.swift
@ -21,9 +21,8 @@ let package = Package(
      linkerSettings: [
        .linkedFramework("AVFoundation"),
        .linkedFramework("AudioToolbox"),
-        .linkedFramework("CoreBluetooth"),
-        .linkedFramework("AccessorySetupKit", .when(platforms: [.iOS], configuration: .release)),
-        .linkedFramework("AccessorySetupKit", .when(platforms: [.iOS], configuration: .debug))
+        .linkedFramework("CoreBluetooth")
+        // 移除 AccessorySetupKit 链接，因为它只在 iOS 18+ 可用
      ]
    )
  ]
--- a/local_plugins/jl_opus/pubspec.yaml
+++ b/local_plugins/jl_opus/pubspec.yaml
@ -11,7 +11,7 @@ dependencies:
  flutter:
    sdk: flutter
  path_provider: ^2.0.0
-  permission_handler: ^11.4.0
+  permission_handler: ^12.0.1

 dev_dependencies:
  flutter_test:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -28,7 +28,7 @@ dependencies:
  htmltopdfwidgets: ^1.1.0
  wifi_iot: ^0.3.19+2
  flutter_intro: ^3.4.0
-  permission_handler: ^10.4.5
+  permission_handler: ^12.0.1
  web_socket_channel: ^2.4.0
  flutter_dotenv: ^5.1.0
  synchronized: ^3.1.0
@ -119,11 +119,6 @@ dev_dependencies:
  build_runner: ^2.3.3 # 用于生成代码 flutter pub run build_runner build
  json_serializable: ^6.6.0 # 用于自动生成代码

-dependency_overrides:
-  permission_handler: ^12.0.0
-  permission_handler_android: ^13.0.0
-  permission_handler_apple: ^9.4.0
-
 flutter:
  uses-material-design: true
  shaders: