Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

android/app/build.gradle.kts

@@ -33,7 +33,7 @@ android {
 
         ndk {
                // 添加所有常见的 ABI，按优先级排序
-                abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+                abiFilters += listOf("arm64-v8a")
         }
     }
 
@@ -61,7 +61,7 @@ android {
             signingConfig = signingConfigs.getByName("release")
             ndk {
                 abiFilters.clear()
-                abiFilters += listOf("armeabi-v7a", "arm64-v8a")
+                abiFilters += listOf("arm64-v8a")
                 // 或者：abiFilters.add("arm64-v8a")
             }
 
@@ -79,13 +79,13 @@ android {
             signingConfig = signingConfigs.getByName("release")
             ndk {
                 abiFilters.clear()
-                abiFilters += listOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
+                abiFilters += listOf("arm64-v8a")
                 // 或者：abiFilters.add("arm64-v8a")
             }
 
             // 对应：shrinkResources true / minifyEnabled true
-            isShrinkResources = false
-            isMinifyEnabled = false
+            isShrinkResources = true
+            isMinifyEnabled = true
 
             // 对应：proguardFiles "proguard-rules.pro"
             // 最简单写法：
@@ -95,10 +95,8 @@ android {
 
     packaging {
         jniLibs {
-            pickFirsts += listOf("lib/arm64-v8a/libaosl.so")
-            pickFirsts += listOf("lib/armeabi-v7a/libaosl.so")
-            pickFirsts += listOf("lib/x86/libaosl.so")
-            pickFirsts += listOf("lib/x86_64/libaosl.so")
+            pickFirsts.clear()
+            pickFirsts += listOf("lib/**/libaosl.so")
         }
     }
 }

android/app/proguard-rules.pro

@@ -27,5 +27,19 @@
 -dontwarn com.vivo.push.util.VivoPushException
 -dontwarn com.xiaomi.mipush.sdk.MiPushClient
 
+-dontwarn androidx.window.extensions.WindowExtensions
+-dontwarn androidx.window.extensions.WindowExtensionsProvider
+-dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
+
 -keep class com.hyphenate.** {*;}
 -dontwarn  com.hyphenate.**

lib/pages/setting/setting_page.dart

@@ -8,6 +8,7 @@ import 'package:dating_touchme_app/pages/setting/teenager_mode_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:tdesign_flutter/tdesign_flutter.dart';
 
 import '../../components/page_appbar.dart';
@@ -71,7 +72,9 @@ class SettingPage extends StatelessWidget {
               TDCellGroup(
                 theme: TDCellGroupTheme.cardTheme,
                 cells: [
-                  TDCell(arrow: true, title: '系统权限管理'),
+                  TDCell(arrow: true, title: '系统权限管理', onClick: (cell) {
+                    openAppSettings();
+                  },),
                   TDCell(arrow: true, title: '消息通知', onClick: (cell) {
                     Get.to(() => NoticePage());
                   }),