完善库

FlyJingFish · FlyJingFish · commit b85557d28ade · 2024-01-04T14:55:56.000+08:00
diff --git a/app/src/main/java/com/flyjingfish/modulecommunication/MainActivity.kt b/app/src/main/java/com/flyjingfish/modulecommunication/MainActivity.kt
@@ -4,13 +4,8 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import com.flyjingfish.login.LoginActivity
-import com.flyjingfish.login.LoginHelper
-import com.flyjingfish.login.LoginHelperImpl
-import com.flyjingfish.module_communication_core.BeanUtils
 import com.flyjingfish.modulecommunication.databinding.ActivityMainBinding
 import com.flyjingfish.user.UserActivity
-import com.flyjingfish.user.UserHelper
-import com.flyjingfish.user.UserHelperImpl
 
 class MainActivity : ComponentActivity() {
     private lateinit var binding : ActivityMainBinding
diff --git a/base-lib/build.gradle.kts b/base-lib/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
-    api(project(":module-communication-core"))
+    api(project(":module-communication-annotation"))
 
 }
diff --git a/lib-login/build.gradle.kts b/lib-login/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.google.devtools.ksp")
+//    id("com.google.devtools.ksp")
     id("communication.export")
 }
 
@@ -37,7 +37,7 @@ dependencies {
     androidTestImplementation(libs.espresso.core)
 
     implementation(project(":base-lib"))
-    implementation(project(":module-communication-annotation"))
     compileOnly(project(":communication2"))
-    ksp(project(":module-communication-ksp"))
+//    implementation(project(":module-communication-annotation"))
+//    ksp(project(":module-communication-ksp"))
 }
diff --git a/lib-login/src/main/java/com/flyjingfish/login/LoginActivity.kt b/lib-login/src/main/java/com/flyjingfish/login/LoginActivity.kt
@@ -3,7 +3,7 @@ package com.flyjingfish.login
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import com.flyjingfish.module_communication_core.BeanUtils
+import com.flyjingfish.module_communication_annotation.BeanUtils
 import com.flyjingfish.user.UserHelper
 
 class LoginActivity: AppCompatActivity() {
diff --git a/lib-user/build.gradle.kts b/lib-user/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.google.devtools.ksp")
+//    id("com.google.devtools.ksp")
     id("communication.export")
 }
 communicationConfig{
@@ -34,7 +34,7 @@ dependencies {
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
     implementation(project(":base-lib"))
-    implementation(project(":module-communication-annotation"))
     compileOnly(project(":communication"))
-    ksp(project(":module-communication-ksp"))
+//    implementation(project(":module-communication-annotation"))
+//    ksp(project(":module-communication-ksp"))
 }
diff --git a/lib-user/src/main/java/com/flyjingfish/user/UserActivity.kt b/lib-user/src/main/java/com/flyjingfish/user/UserActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import com.flyjingfish.login.LoginHelper
-import com.flyjingfish.module_communication_core.BeanUtils
+import com.flyjingfish.module_communication_annotation.BeanUtils
 
 class UserActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/module-communication-annotation/src/main/java/com/flyjingfish/module_communication_annotation/BeanUtils.kt b/module-communication-annotation/src/main/java/com/flyjingfish/module_communication_annotation/BeanUtils.kt
@@ -0,0 +1,27 @@
+package com.flyjingfish.module_communication_annotation
+
+object BeanUtils {
+    private val singleBean = mutableMapOf<Class<out Any>,Any>()
+
+    fun <T> getNewInstance(key:Class<out Any>):T{
+        val clazzName = CommunicationPackage.BIND_CLASS_PACKAGE + "." + key.simpleName +"\$\$BindClass"
+        val clazz = try {
+            Class.forName(clazzName) as Class<out Any>
+        } catch (e: ClassNotFoundException) {
+            throw RuntimeException("没有找到 ${key.name} 的实现类")
+        }
+        val bindClass = clazz.getDeclaredConstructor()?.newInstance() as BindClass<*>
+        val instance = bindClass.getImplementClassInstance()
+        return instance as T
+    }
+
+    fun <T> getSingleInstance(key:Class<out Any>):T{
+        var instance = singleBean[key]
+        if (instance == null){
+            instance = getNewInstance(key)
+            singleBean[key] = instance as Any
+        }
+        return instance as T
+    }
+
+}
diff --git a/module-communication-core/.gitignore b/module-communication-core/.gitignore
diff --git a/module-communication-core/build.gradle.kts b/module-communication-core/build.gradle.kts
diff --git a/module-communication-core/gradle.properties b/module-communication-core/gradle.properties
diff --git a/module-communication-core/src/main/AndroidManifest.xml b/module-communication-core/src/main/AndroidManifest.xml
diff --git a/module-communication-core/src/main/java/com/flyjingfish/module_communication_core/BeanUtils.kt b/module-communication-core/src/main/java/com/flyjingfish/module_communication_core/BeanUtils.kt
diff --git a/module-communication-plugin/src/main/kotlin/com/flyjingfish/module_communication_plugin/CommunicationExportPlugin.kt b/module-communication-plugin/src/main/kotlin/com/flyjingfish/module_communication_plugin/CommunicationExportPlugin.kt
@@ -16,8 +16,8 @@ class CommunicationExportPlugin : Plugin<Project> {
         if (!hasKsp){
             project.plugins.apply("com.google.devtools.ksp")
         }
-//        project.dependencies.add("implementation","io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:${LibVersion.version}")
-//        project.dependencies.add("ksp","io.github.FlyJingFish.ModuleCommunication:module-communication-ksp:${LibVersion.version}")
+        project.dependencies.add("implementation","io.github.FlyJingFish.ModuleCommunication:module-communication-annotation:${LibVersion.version}")
+        project.dependencies.add("ksp","io.github.FlyJingFish.ModuleCommunication:module-communication-ksp:${LibVersion.version}")
 //        project.dependencies.add("compileOnly",":communication")
         androidComponents.onVariants { variant ->
             variantList.add(variant)
diff --git a/module-communication-plugin/src/main/kotlin/com/flyjingfish/module_communication_plugin/ExportTask.kt b/module-communication-plugin/src/main/kotlin/com/flyjingfish/module_communication_plugin/ExportTask.kt
@@ -27,9 +27,9 @@ abstract class ExportTask : DefaultTask() {
         val variantName = variant.name
 //        val buildType = variant.buildType
 //        val flavorName = variant.flavorName
-        searchJSONFile(project,variantName)
+        searchApiFile(project,variantName)
     }
-    private fun searchJSONFile(curProject: Project, variantName: String){
+    private fun searchApiFile(curProject: Project, variantName: String){
         val genFile = curProject.file("${curProject.buildDir}/generated/ksp/${variantName}").listFiles()
         val collection = curProject.files(genFile).asFileTree.filter { it.name.endsWith(".api") }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,7 +20,6 @@ include(":app")
 include(":module-communication-plugin")
 include(":module-communication-ksp")
 include(":module-communication-annotation")
-include(":module-communication-core")
 include(":base-lib")
 include(":lib-user")
 include(":lib-login")

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ dependencies {`
`30`	`30`	`testImplementation(libs.junit)`
`31`	`31`	`androidTestImplementation(libs.androidx.test.ext.junit)`
`32`	`32`	`androidTestImplementation(libs.espresso.core)`
`33`		`- api(project(":module-communication-core"))`
	`33`	`+ api(project(":module-communication-annotation"))`
`34`	`34`
`35`	`35`	`}`