Merge remote-tracking branch 'origin/dev' into feature/test_home_pager

# Conflicts:
#	config.gradle
#	m-audioim/modular.gradle

app/build.gradle

@@ -206,6 +206,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 {
         
         //发布模式

config.gradle

@@ -42,7 +42,8 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.27.1",
+
+            "m-confide"       : "0.0.28",
             "m-consultant"    : "0.0.39",
             "m-fm"            : "0.0.20",
             "m-user"          : "0.0.33",
@@ -52,7 +53,7 @@ ext {
             "m-course"        : "0.0.28.5",
 
             //-------------- 业务模块 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",
@@ -69,7 +70,7 @@ ext {
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.26.7",
+            "m-audioim"       : "0.0.28",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
@@ -90,7 +91,6 @@ ext {
 
             // 以下为接入flutter的模块
             "m-muse"          : "0.0.7",
-            "m-muse"          : "0.0.7",
             "m-tests"         : "0.0.4",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -110,7 +110,7 @@ ext {
             "ydl-webview"     : "0.0.27",
             "ydl-media"       : "0.0.13",
             "ydl-pay"         : "0.0.10",
-            "m-audioim"       : "0.0.26.7",
+            "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,7 +6,8 @@ modular {
             //发布信息 module/api 通用
             groupId = "com.ydl"
             artifactId = "m-audioim-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"