1.7.5版本

accompanySDK/build.gradle

@@ -37,12 +37,11 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
-    api fileTree(dir: 'libs', include: ['*.jar','*.aar'])
+    compileOnly fileTree(dir: 'libs', include: ['*.jar','*.aar'])
     implementation project(':BaseLibrary')
     implementation project(':usercenter')
     implementation 'com.airbnb.android:lottie:5.0.3'

musicMerge/build.gradle

@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':BaseLibrary')
     implementation project(':usercenter')
     implementation 'androidx.appcompat:appcompat:1.3.0'
@@ -67,4 +67,5 @@ dependencies {
     implementation 'com.alibaba:arouter-api:1.5.2'
     kapt 'com.alibaba:arouter-compiler:1.5.2'
     implementation 'com.google.android.exoplayer:exoplayer:2.15.0'
+    compileOnly files('libs/ffmpegCmd-release_1.0.2_2410081548.aar')
 }

student/build.gradle

@@ -18,25 +18,25 @@ android {
         applicationId "com.cooleshow.student"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 173
-        versionName "1.7.3"
+        versionCode 175
+        versionName "1.7.5"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
         }
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
-                qqappid: "1110018403",
-                JPUSH_PKGNAME: applicationId,
-                JPUSH_APPKEY : "911d07f359c18a078f29792f", //JPush 上注册的包名对应的 Appkey.
-                JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
-                XIAOMI_APPID : "MI-2882303761520172242",
+                qqappid       : "1110018403",
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY  : "911d07f359c18a078f29792f", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                XIAOMI_APPID  : "MI-2882303761520172242",
                 XIAOMI_APPKEY : "MI-5692017221242",
-                OPPO_APPKEY : "OP-5b2b716e774c45f2bd9a90b242b295e9",
-                OPPO_APPID : "OP-30841111",
-                OPPO_APPSECRET : "OP-3f1d849d8bce4273be48ca08a2ce320b",
-                VIVO_APPKEY : "ebf526d1d61ab3bba65ce30d333189f3",
-                VIVO_APPID : "105573871",
+                OPPO_APPKEY   : "OP-5b2b716e774c45f2bd9a90b242b295e9",
+                OPPO_APPID    : "OP-30841111",
+                OPPO_APPSECRET: "OP-3f1d849d8bce4273be48ca08a2ce320b",
+                VIVO_APPKEY   : "ebf526d1d61ab3bba65ce30d333189f3",
+                VIVO_APPID    : "105573871",
         ]
     }
 
@@ -105,6 +105,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: '../accompanySDK/libs', include: ['*.jar', '*.aar'])
+
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'

teacher/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "com.cooleshow.teacher"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 173
-        versionName "1.7.3"
+        versionCode 175
+        versionName "1.7.5"
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
         }
@@ -111,6 +111,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: '../accompanySDK/libs', include: ['*.jar', '*.aar'])
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'