feat: user改造

api/user/.gitignore

+/build
\ No newline at end of file

api/user/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/user/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/user/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.user.api">
+
+</manifest>
\ No newline at end of file

app/build.gradle

@@ -193,7 +193,7 @@ dependencies {
 
     implementation fileTree(dir: 'aars', include: ['*.aar'])
     implementation project(':m-user')
-    implementation modularPublication('com.ydl:m-user-api')
+    implementation project(":api:user")
     implementation project(':m-confide')
     implementation project(':api:confide')
     api project(':m-consultant')

config.gradle

@@ -33,9 +33,7 @@ ext {
             "ydl-net"         : "0.0.3.94",
             "ydl-utils"       : "0.0.3.12",
             //-------------- 业务模块 API 层 --------------
-            "m-course-api"    : "0.0.3.6",
             "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.24",
             "m-home-api"      : "0.0.4.4",
             "m-im-api"        : "0.0.12.24",
     ]
@@ -233,7 +231,7 @@ ext {
             "m-audioim"                    : "com.ydl:m-audioim:${ydlPublishVersion["m-audioim"]}@aar",
 
             //业务组件 <<--- 最后发这些(只发改过的)
-            "ydl-m-user-api"               : "com.ydl:m-user-api:${ydlPublishVersion["m-user-api"]}",
+            "ydl-m-user-api"               : "com.ydl:m-user-api:1.0.0",
             "ydl-m-fm-api"                 : "com.ydl:m-fm-api:1.0.0",
             "ydl-m-tests-api"              : "com.ydl:m-tests-api:${ydlPublishVersion["m-tests-api"]}",
             "ydl-m-audioim-api"            : "com.ydl:m-audioim-api:${ydlPublishVersion["m-audioim-api"]}",

m-audioim/build.gradle

@@ -82,7 +82,7 @@ dependencies {
         //开发时使用
         api project(':ydl-platform')
         api project(':ydl-webview')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation modularPublication('com.ydl:m-im-api')
     }else {
         //发布时使用

m-confide/build.gradle

@@ -77,7 +77,7 @@ dependencies {
         api project(':ydl-webview')
         api project(':ydl-utils')
         implementation modularPublication('com.ydl:m-im-api')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:consultant")
         implementation project(':api:confide')
     }else {

m-consultant/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     api rootProject.ext.dependencies["ydl-user-router"]
     if (rootProject.ext.dev_mode){
         //开发时使用
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation modularPublication('com.ydl:m-im-api')
         implementation modularPublication('com.ydl:m-home-api')
         implementation project(":api:consultant")

m-course/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     if (rootProject.ext.dev_mode){
         //开发时使用
         implementation project(":api:consultant")
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation project(":api:course")
         api project(":ydl-webview")

m-dynamic/build.gradle

@@ -78,7 +78,7 @@ dependencies {
         api project(':ydl-platform')
         api project(":ydl-pay")
         implementation modularPublication('com.ydl:m-im-api')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation modularPublication('com.ydl:m-tests-api')
         implementation project(":api:course")

m-fm/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     if (rootProject.ext.dev_mode){
         //开发时使用
         api project(":ydl-platform")
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation project(":api:fm")
         implementation project(':ydl-media')

m-home/build.gradle

@@ -78,7 +78,7 @@ dependencies {
     if (rootProject.ext.dev_mode){
         //开发时使用
         implementation project(":api:consultant")
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation modularPublication('com.ydl:m-tests-api')
         implementation modularPublication('com.ydl:m-home-api')
         implementation modularPublication('com.ydl:m-im-api')

m-im/build.gradle

@@ -97,7 +97,7 @@ dependencies {
         api project(':ydl-webview')
         api project(':ydl-platform')
         implementation modularPublication('com.ydl:m-im-api')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation modularPublication('com.ydl:m-tests-api')
         implementation project(":api:course")

m-muse/build.gradle

@@ -60,7 +60,7 @@ dependencies {
         //开发时使用
         api project(":ydl-platform")
         implementation project(':ydl-media')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(':ydl-flutter-base')
         implementation project(':ydl-webview')
 

m-tests/build.gradle

@@ -77,7 +77,7 @@ dependencies {
         api project(':ydl-platform')
         implementation project(':ydl-flutter-base')
         implementation modularPublication('com.ydl:m-test-api')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation modularPublication('com.ydl:m-im-api')
     }else {

m-user/build.gradle

@@ -2,13 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'resTools' // 资源重命名插件
-
-// 配置资源重命名插件
-resConfig {
-    new_prefix = 'user_'  // 资源前缀
-    old_prefix = ''         // 老前缀，可为''空字符串
-}
 
 kapt {
     arguments {
@@ -33,9 +26,6 @@ android {
                 arguments = [AROUTER_MODULE_NAME: "user"]
             }
         }
-
-        flavorDimensions "versionCode"//Flavor 维度信息
-
     }
 
     buildTypes {
@@ -45,26 +35,6 @@ android {
         }
     }
 
-    //前缀的名字
-    resourcePrefix "user_"
-
-    //Flavor 信息
-    publishNonDefault true
-    productFlavors {
-        ydl {}
-        xlzx {}
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'src/main/AndroidManifest.xml'
-            res.srcDirs = [
-                    'src/main/res'
-            ]
-        }
-    }
-
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -81,6 +51,7 @@ dependencies {
     kapt 'com.alibaba:arouter-compiler:1.2.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    implementation project(":ydl-resource")
     api rootProject.ext.dependencies["ydl-user-router"]
     if (rootProject.ext.dev_mode){
         //开发时使用
@@ -88,7 +59,7 @@ dependencies {
         api project(':ydl-platform')
         api project(":ydl-pay")
 //        implementation project(":ydl-tuicore")
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:course")
         implementation modularPublication('com.ydl:m-im-api')
         implementation project(":api:fm")

m-user/gradle.properties

-isApplicaiton = false

m-user/modular.gradle

-modular {
-    //模块包名
-    packageName "com.yidianling.user"
-    // 模块发布需要的参数
-    publish {
-        modules {
-            xlzx {
-                groupId = "com.ydl"
-                artifactId = "m-user-module-xlzx"
-                // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-
-            ydl{
-                groupId = "com.ydl"
-                artifactId = "m-user-module-ydl"
-                // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-        }
-
-        api {
-            //壹点灵/心理咨询 业务模块 API层 jar包的发布信息
-            groupId = "com.ydl"
-            artifactId = "m-user-api"
-            //开发时注释掉版本号，发布api时打开
-            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
-            // API 层打包时需要引入的依赖
-            apiDependencies {
-                implementation 'androidx.fragment:fragment-ktx:1.2.4'
-                implementation "com.google.code.gson:gson:2.8.2"
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-                implementation 'com.alibaba:arouter-api:1.4.1'
-                implementation 'de.greenrobot:eventbus:2.4.0'
-            }
-        }
-    }
-}
\ No newline at end of file

m-user/src/main/gen/com/yidianling/user/BuildConfig.java

-/*___Generated_by_IDEA___*/
-
-package com.yidianling.user;
-
-/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
-public final class BuildConfig {
-  public final static boolean DEBUG = Boolean.parseBoolean(null);
-}
\ No newline at end of file

m-user/src/main/gen/com/yidianling/user/Manifest.java

-/*___Generated_by_IDEA___*/
-
-package com.yidianling.user;
-
-/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
-public final class Manifest {
-}
\ No newline at end of file

m-user/src/main/gen/com/yidianling/user/R.java

-/*___Generated_by_IDEA___*/
-
-package com.yidianling.user;
-
-/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
-public final class R {
-}
\ No newline at end of file

m-user/src/xlzx/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>

m-user/src/ydl/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>

settings.gradle

@@ -5,4 +5,4 @@ include ':app',
         ':m-consultant', ':m-muse', ':m-fm', ':m-tests', ":m-course",
         ":m-im",":m-dynamic","m-article","m-audioim","m-user", "m-confide"
 include ':ydl-tuicore', ':api:confide', ':api:dynamic', ':api:fm',':api:consultant',
-        ':api:course'
+        ':api:course',':api:user'

ydl-resource/build.gradle

@@ -35,4 +35,5 @@ android {
 }
 
 dependencies {
+    compileOnly(rootProject.ext.dependencies["ydl-platform"])
 }
\ No newline at end of file

ydl-webview/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     if (rootProject.ext.dev_mode) {
         //开发时使用
         api project(':ydl-platform')
-        implementation modularPublication('com.ydl:m-user-api')
+        implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation modularPublication('com.ydl:m-im-api')
     } else {