From 96b3b6a3f9c37997e4ef97afa07ab56e65f0eddc Mon Sep 17 00:00:00 2001 From: csf Date: Tue, 8 Feb 2022 22:44:32 +0800 Subject: [PATCH] change main ffi to service --- android/app/build.gradle | 13 +- android/app/src/main/AndroidManifest.xml | 6 +- .../com/carriez/flutter_hbb/MainActivity.kt | 196 ++++----- .../com/carriez/flutter_hbb/MainService.kt | 398 ++++++++++++------ .../kotlin/com/carriez/flutter_hbb/common.kt | 69 ++- .../app/src/main/res/drawable/check_blue.xml | 5 + .../app/src/main/res/drawable/close_red.xml | 5 + android/app/src/main/res/values/colors.xml | 4 + android/build.gradle | 2 + 9 files changed, 407 insertions(+), 291 deletions(-) create mode 100644 android/app/src/main/res/drawable/check_blue.xml create mode 100644 android/app/src/main/res/drawable/close_red.xml create mode 100644 android/app/src/main/res/values/colors.xml diff --git a/android/app/build.gradle b/android/app/build.gradle index cc4209010..96c62ed04 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,17 +32,22 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 ndkVersion '22.1.7171670' // * 仅个人使用 存在多版本NDK无法自动选择 需要使用此配置指定NDK版本 [CSF] sourceSets { main.java.srcDirs += 'src/main/kotlin' } + compileOptions { + targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + } + defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.carriez.flutter_hbb" - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -70,6 +75,8 @@ flutter { } dependencies { + implementation "androidx.media:media:1.4.3" + implementation 'com.github.getActivity:XXPermissions:13.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c83ccf780..962b3b113 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + @@ -10,6 +12,7 @@ + android:windowSoftInputMode="adjustResize" + android:exported="true">