diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4c83b34..0d3f422 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,7 +16,6 @@
-
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d6433b7..9f20fd6 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -51,5 +51,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a6e74f6..1aa0379 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,14 +56,14 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- testImplementation 'junit:junit:4.13.1'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-// implementation project(path: ':ffmpeg')
- implementation 'com.github.AnJoiner:FFmpegCommand:1.2.1'
- implementation 'androidx.recyclerview:recyclerview:1.1.0'
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ implementation project(path: ':ffmpeg')
+// implementation 'com.github.AnJoiner:FFmpegCommand:1.2.1'
+ implementation 'androidx.recyclerview:recyclerview:1.2.1'
// 腾讯bugly
implementation 'com.tencent.bugly:crashreport:3.3.1'
implementation 'com.tencent.bugly:nativecrashreport:3.7.500'
diff --git a/build.gradle b/build.gradle
index 0cde747..12c0c8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,17 +2,22 @@
buildscript {
// ext.kotlin_version = '1.4.20'
- ext.kotlin_version = '1.6.20'
+ ext.kotlin_version = '1.6.21'
repositories {
- gradlePluginPortal()
+// gradlePluginPortal()
+// google()
+// maven { url 'https://jitpack.io' }
+// maven {
+// url 'https://maven.aliyun.com/repository/public/'
+// }
+// mavenLocal()
+// mavenCentral()
+ maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
+ maven { url 'https://maven.aliyun.com/repository/public'}
google()
- maven { url 'https://jitpack.io' }
- maven {
- url 'https://maven.aliyun.com/repository/public/'
- }
- mavenLocal()
mavenCentral()
+ maven { url 'https://jitpack.io' }
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
@@ -25,14 +30,19 @@ buildscript {
allprojects {
repositories {
- gradlePluginPortal()
+// gradlePluginPortal()
+// google()
+// maven { url 'https://jitpack.io' }
+// maven {
+// url 'https://maven.aliyun.com/repository/public/'
+// }
+// mavenLocal()
+// mavenCentral()
+ maven {url 'https://maven.aliyun.com/repository/gradle-plugin'}
+ maven { url 'https://maven.aliyun.com/repository/public'}
google()
- maven { url 'https://jitpack.io' }
- maven {
- url 'https://maven.aliyun.com/repository/public/'
- }
- mavenLocal()
mavenCentral()
+ maven { url 'https://jitpack.io' }
}
}
diff --git a/ffmpeg/build.gradle b/ffmpeg/build.gradle
index dae06b8..6014749 100644
--- a/ffmpeg/build.gradle
+++ b/ffmpeg/build.gradle
@@ -25,11 +25,11 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.appcompat:appcompat:1.1.0'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test.ext:junit:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
- implementation "androidx.core:core-ktx:+"
+ implementation 'androidx.appcompat:appcompat:1.4.1'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ implementation "androidx.core:core-ktx:1.7.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// apply from: 'nexus.gradle'
diff --git a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so
old mode 100755
new mode 100644
index fa90f37..c6bacaf
Binary files a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so and b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-command.so differ
diff --git a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so
old mode 100755
new mode 100644
index 3850951..e07121d
Binary files a/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so and b/ffmpeg/src/main/jniLibs/arm64-v8a/libffmpeg-org.so differ
diff --git a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so
old mode 100755
new mode 100644
index f55eb87..a845668
Binary files a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so and b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-command.so differ
diff --git a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so
old mode 100755
new mode 100644
index 9904ecc..ca233cd
Binary files a/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so and b/ffmpeg/src/main/jniLibs/armeabi-v7a/libffmpeg-org.so differ