1.修改ipc-core的Result回调支持泛型嵌套

2.优化回调实例内存占用，客户端一个接口一个方法回调只会有一份实例，可以设置成null进行回收

Author: zhanggaoming

gradle.properties

@@ -18,4 +18,27 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+
+# MAVEN PUBLISH 参数
+# maven publish发布问题
+# 问题一
+#Cannot upload checksum for snapshot-maven-metadata.xml. Remote lonbon.intercom.framework.repository doesn't support sha-256. Error: Could not PUT 'http://.../x.y.z-SNAPSHOT/maven-metadata.xml.sha256'. Received status code 400 from server: Invalid path for a Maven 2 lonbon.intercom.framework.repository
+#Cannot upload checksum for snapshot-maven-metadata.xml. Remote lonbon.intercom.framework.repository doesn't support sha-512. Error: Could not PUT 'http://.../x.y.z-SNAPSHOT/maven-metadata.xml.sha512'. Received status code 400 from server: Invalid path for a Maven 2 lonbon.intercom.framework.repository
+#Cannot upload checksum for module-maven-metadata.xml. Remote lonbon.intercom.framework.repository doesn't support sha-256. Error: Could not PUT 'http://.../x.y.z-SNAPSHOT/maven-metadata.xml.sha256'. Received status code 400 from server: Invalid path for a Maven 2 lonbon.intercom.framework.repository
+#Cannot upload checksum for module-maven-metadata.xml. Remote lonbon.intercom.framework.repository doesn't support sha-512. Error: Could not PUT 'http://.../x.y.z-SNAPSHOT/maven-metadata.xml.sha512'. Received status code 400 from server: Invalid path for a Maven 2 lonbon.intercom.framework.repository
+# https://github.com/gradle/gradle/issues/12355
+# Disable maven-metadata.xml SHA256 and SHA512 upload warnings to Nexus #12355
+systemProp.org.gradle.internal.publish.checksums.insecure=true
+-Dorg.gradle.internal.publish.checksums.insecure=true
+# 问题二
+# Return code is: 400 , ReasonPhrase:Repository version policy: RELEASE does not allow metadata in pat
+# https://blog.csdn.net/qq_22362139/article/details/82289097y
+# 1.使用admin账户登录，设置-->reposltorles-->maven-releases(点击)-->deployment pollcy 修改成 allow redeploy
+# 2.项目版本中不能含有-SNAPSHOT
+#org.gradle.java.home=/home/lb/work/android-studio/jre
+
+#maven
+MAVEN_REPO_TYPE=REMOTE
+PUBLISH_GROUP=com.github.zhanggaoming
+PUBLISH_VERSION=2.8

gradle/publish_aar.gradle

@@ -0,0 +1,81 @@
+apply plugin: 'maven-publish'
+
+Properties localProperties = new Properties()
+localProperties.load(new FileInputStream(rootProject.getRootDir().getAbsolutePath() + "/local.properties"))
+
+/**
+ * 本地仓库url
+ */
+def MAVEN_LOCAL_PATH = properties.getOrDefault("MAVEN_LOCAL_PATH", "repo")
+def mavenRepoLocalUrl = MAVEN_LOCAL_PATH.startsWith("/") ? MAVEN_LOCAL_PATH : "$rootDir/$MAVEN_LOCAL_PATH"
+
+def MAVEN_REPO_TYPE = properties.getOrDefault("MAVEN_REPO_TYPE", "LOCAL")
+def MAVEN_REMOTE_URL_RELEASE = properties.getOrDefault("MAVEN_REMOTE_URL_RELEASE", "http://192.168.4.205:8081/repository/maven-releases/")
+def MAVEN_REMOTE_URL_SNAPSHOT = properties.getOrDefault("MAVEN_REMOTE_URL_SNAPSHOT", "http://192.168.4.205:8081/repository/maven-snapshots/")
+def MAVEN_REMOTE_NAME = localProperties.getOrDefault("MAVEN_REMOTE_NAME", "admin")
+def MAVEN_REMOTE_PASSWORD = localProperties.getOrDefault("MAVEN_REMOTE_PASSWORD", "admin123")
+
+println "version->${project.version}"
+
+/**
+ * 远程仓库url
+ */
+def mavenRepoRemoteUrl = project.version.contains("SNAPSHOT") ? MAVEN_REMOTE_URL_SNAPSHOT : MAVEN_REMOTE_URL_RELEASE
+
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    android.libraryVariants.all { variant ->
+        if (variant.name == 'release') {
+            owner.classpath += variant.javaCompileProvider.get().classpath
+        }
+    }
+    exclude '**/R.html', '**/R.*.html', '**/index.html'
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    archiveClassifier.set('javadoc')
+    from androidJavadocs.destinationDir
+}
+
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    if (project.hasProperty("kotlin")) {
+        from android.sourceSets.main.java.getSrcDirs()
+    } else if (project.hasProperty("android")) {
+        from android.sourceSets.main.java.sourceFiles
+    } else {
+        from sourceSets.main.allSource
+    }
+}
+
+group = properties.getOrDefault("PUBLISH_GROUP", "com.lonbon")
+version = properties.getOrDefault("PUBLISH_VERSION", "1.0.0")
+
+afterEvaluate {
+    publishing {
+        repositories {
+            maven {
+                setUrl(MAVEN_REPO_TYPE == "REMOTE" ? mavenRepoRemoteUrl : mavenRepoLocalUrl)
+                if (MAVEN_REPO_TYPE == "REMOTE") {
+                    credentials {
+                        username = MAVEN_REMOTE_NAME
+                        password = MAVEN_REMOTE_PASSWORD
+                    }
+                }
+            }
+        }
+
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifactId = rootProject.name
+//                artifact androidJavadocsJar
+                artifact androidSourcesJar
+
+            }
+
+        }
+    }
+}

gradle/publish_jar.gradle

@@ -0,0 +1,66 @@
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+java {
+//    withJavadocJar()
+    withSourcesJar()
+}
+
+Properties localProperties = new Properties()
+localProperties.load(new FileInputStream(rootProject.getRootDir().getAbsolutePath() + "/local.properties"))
+
+group = properties.getOrDefault("PUBLISH_GROUP", "com.lonbon")
+version = properties.getOrDefault("PUBLISH_VERSION", "1.0.0")
+
+/*
+ * Copyright (C),2007-2020, LonBon Technologies Co. Ltd. All Rights Reserved.
+ */
+
+/**
+ * 本地仓库url
+ */
+def MAVEN_LOCAL_PATH = properties.getOrDefault("MAVEN_LOCAL_PATH", "repo")
+def mavenRepoLocalUrl = MAVEN_LOCAL_PATH.startsWith("/") ? MAVEN_LOCAL_PATH :  "$rootDir/$MAVEN_LOCAL_PATH"
+
+def MAVEN_REPO_TYPE = properties.getOrDefault("MAVEN_REPO_TYPE", "LOCAL")
+def MAVEN_REMOTE_URL_RELEASE = properties.getOrDefault("MAVEN_REMOTE_URL_RELEASE", "http://192.168.4.205:8081/repository/maven-releases/")
+def MAVEN_REMOTE_URL_SNAPSHOT = properties.getOrDefault("MAVEN_REMOTE_URL_SNAPSHOT", "http://192.168.4.205:8081/repository/maven-snapshots/")
+def MAVEN_REMOTE_NAME = localProperties.getOrDefault("MAVEN_REMOTE_NAME", "admin")
+def MAVEN_REMOTE_PASSWORD = localProperties.getOrDefault("MAVEN_REMOTE_PASSWORD", "admin123")
+
+/**
+ * 远程仓库url
+ */
+def mavenRepoRemoteUrl = project.version.contains("SNAPSHOT") ? MAVEN_REMOTE_URL_SNAPSHOT : MAVEN_REMOTE_URL_RELEASE
+
+publishing {
+    repositories {
+        maven {
+            if (MAVEN_REPO_TYPE == "REMOTE") {
+                url = uri(mavenRepoRemoteUrl)
+                credentials {
+                    username = MAVEN_REMOTE_NAME
+                    password = MAVEN_REMOTE_PASSWORD
+                }
+            } else {
+                setUrl(mavenRepoLocalUrl)
+            }
+        }
+    }
+
+    publications {
+        release(MavenPublication) {
+            from components.java
+            artifactId project.name
+//            artifact project.kotlinSourcesJar {
+//                classifier "sources"
+//            }
+        }
+    }
+}
+
+
+
+
+

ipc-annotation/build.gradle

@@ -4,6 +4,8 @@ plugins {
     id 'maven'
 }
 
+apply from:'../gradle/publish_jar.gradle'
+
 group 'com.github.zhanggaoming'
 
 
@@ -21,20 +23,20 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
+//task sourcesJar(type: Jar, dependsOn: classes) {
+//    classifier = 'sources'
+//    from sourceSets.main.allSource
+//}
+//
+//task javadocJar(type: Jar, dependsOn: javadoc) {
+//    classifier = 'javadoc'
+//    from javadoc.destinationDir
+//}
+
+//artifacts {
+//    archives sourcesJar
+//    archives javadocJar
+//}
 
 // To specify a license in the pom:
 install {

ipc-app-test/src/main/java/com/demo/ipc/CommonActivity.kt

@@ -5,10 +5,7 @@ import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.ipc.extend.test.Code
-import com.ipc.extend.test.Event
-import com.ipc.extend.test.InfoService
-import com.ipc.extend.test.UserInfo
+import com.ipc.extend.test.*
 import com.zclever.ipc.core.Config
 import com.zclever.ipc.core.IpcManager
 import com.zclever.ipc.core.Result
@@ -29,15 +26,17 @@ class CommonActivity : AppCompatActivity() {
         setContentView(R.layout.activity_common)
         IpcManager.config(Config.builder().configDebug(true).build())
         IpcManager.init(this)
-        IpcManager.open("com.demo.ipcdemo")
+        IpcManager.open("com.demo.ipcdemo"){
+            runOnUiThread {
+                Toast.makeText(this,"连接服务端成功，可以开始调用相关接口了", Toast.LENGTH_LONG).show()
+            }
+        }
     }
 
     fun syncGetUserInfo(view: View) {
 
         Toast.makeText(this, instance.syncGetUserInfo().toString(), Toast.LENGTH_LONG).show()
 
-        Log.i(TAG, "syncGetUserInfo: ->${instance.getEnum(Code.FAILURE)}")
-
     }
 
 
@@ -75,15 +74,22 @@ class CommonActivity : AppCompatActivity() {
     }
 
 
-
     fun setEventCallBack(view: View) {
 
         instance.setEventCallBack(object : Result<Event>() {
             override fun onData(data: Event) {
                 Log.i(TAG, "onData: ${data.id}")
             }
         })
+    }
 
+    fun setResponeCallBack(view: View) {
+
+        instance.setResponeCallBack(object : Result<BaseRespone<Event>>() {
+            override fun onData(data: BaseRespone<Event>) {
+                Log.i(TAG, "onData,BaseRespone:${data.data.id}")
+            }
+        })
     }
 
 

ipc-app-test/src/main/java/com/demo/ipc/InfoServiceManager.kt

@@ -1,10 +1,8 @@
 package com.demo.ipc
 
 import android.util.Log
-import com.ipc.extend.test.Code
-import com.ipc.extend.test.Event
-import com.ipc.extend.test.InfoService
-import com.ipc.extend.test.UserInfo
+import com.ipc.extend.test.*
+import com.zclever.ipc.core.Response
 import com.zclever.ipc.core.Result
 import com.zclever.ipc.core.TAG
 import kotlin.concurrent.thread
@@ -47,7 +45,7 @@ object InfoServiceManager : InfoService {
         thread {
             while (true) {
                 mCallBack?.onData(Event(count++))
-
+                responeCallBack?.onData(BaseRespone(Event(id = count)))
                 Thread.sleep(2000)
             }
         }
@@ -56,4 +54,10 @@ object InfoServiceManager : InfoService {
     override fun setEventCallBack(callBack: Result<Event>) {
         mCallBack = callBack
     }
+
+    private var responeCallBack:Result<BaseRespone<Event>>?=null
+
+    override fun setResponeCallBack(callBack: Result<BaseRespone<Event>>) {
+        responeCallBack=callBack
+    }
 }

ipc-app-test/src/main/java/com/demo/ipc/InfoServiceManagerJava.java

@@ -2,6 +2,9 @@
 
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
+import com.ipc.extend.test.BaseRespone;
 import com.ipc.extend.test.Code;
 import com.ipc.extend.test.Event;
 import com.ipc.extend.test.InfoService;
@@ -37,6 +40,11 @@ public void setEventCallBack(@NotNull Result<Event> callBack) {
 
     }
 
+    @Override
+    public void setResponeCallBack(@NonNull Result<BaseRespone<Event>> callBack) {
+
+    }
+
     private static final class Holder {
         private static final InfoServiceManagerJava instance = new InfoServiceManagerJava();
     }

ipc-app-test/src/main/java/com/demo/ipc/VideoActivity.kt

@@ -9,6 +9,7 @@ import android.util.Log
 import android.view.View
 import android.view.inputmethod.InputMethodSession
 import android.widget.ImageView
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.ipc.extend.test.Event
 import com.ipc.extend.test.InfoService
@@ -35,7 +36,11 @@ class VideoActivity : AppCompatActivity(){
         //配置开启媒体服务
         IpcManager.config(Config.builder().configDebug(true).configOpenMedia(true).build())
         IpcManager.init(this)
-        IpcManager.open("com.demo.ipcdemo")
+        IpcManager.open("com.demo.ipcdemo"){
+            runOnUiThread {
+                Toast.makeText(this,"连接服务端成功，可以开始调用相关接口了", Toast.LENGTH_LONG).show()
+            }
+        }
 
         showImageView=findViewById(R.id.img_show)
 

ipc-app-test/src/main/res/layout/activity_common.xml

@@ -64,6 +64,18 @@
         app:layout_constraintTop_toBottomOf="@id/sendBigData"
         tools:ignore="OnClick" />
 
+    <Button
+        android:layout_marginTop="5dp"
+        android:id="@+id/setResponeCallBack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="setResponeCallBack"
+        android:text="setResponeCallBack"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/setEventCallBack"
+        tools:ignore="OnClick" />
+
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>