Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

app/build.gradle

@@ -203,6 +203,7 @@ dependencies {
         api project(':m-fm')
         api project(':m-course')
         implementation modularPublication('com.ydl:m-fm-api')
+        implementation modularPublication('com.ydl:m-audioim-api')
     } else {
         //发布模式
         api 'com.ydl:m-user-module-ydl:0.0.6'

config.gradle

@@ -43,7 +43,7 @@ ext {
             // -------------- 业务模块 --------------
             //第三步 若干
 
-            "m-confide"       : "0.0.26",
+            "m-confide"       : "0.0.28",
             "m-consultant"    : "0.0.39",
             "m-course"        : "0.0.28",
             "m-fm"            : "0.0.20",
@@ -53,7 +53,7 @@ ext {
 
 
             //-------------- 业务模块 API 层 --------------
-            "m-audioim-api"   : "0.0.2",
+            "m-audioim-api"   : "0.0.5",
             "m-confide-api"   : "0.0.1",
             "m-consultant-api": "0.0.3",
             "m-course-api"    : "0.0.2",
@@ -70,7 +70,7 @@ ext {
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.26",
+            "m-audioim"       : "0.0.28",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -107,7 +107,7 @@ ext {
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.26",
+            "m-audioim"       : "0.0.28",
 
             //以下 几乎不会动
 

m-audioim/build.gradle

@@ -83,9 +83,11 @@ dependencies {
         //开发时使用
         api project(':ydl-platform')
         api project(':ydl-webview')
+        implementation modularPublication('com.ydl:m-audioim-api')
     }else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-webview"]
+        compileOnly rootProject.ext.dependencies["ydl-m-audioim-api"]
         api(rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true
         }

m-audioim/modular.gradle

@@ -6,8 +6,8 @@ modular {
             //发布信息 module/api 通用
             groupId = "com.ydl"
             artifactId = "m-audioim-api"
-//            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
-            version = "0.0.5"
+            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
+//            version = "0.0.5"
             // API 层打包时需要引入的依赖
             apiDependencies {
                 implementation "com.google.code.gson:gson:2.8.2"