增加ParcelSize准确计算，处理可能溢出Parcel binder size问题；增大共享内存默认空间

Author: zhanggaoming

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

@@ -22,7 +22,7 @@ class CommonActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_common)
-        IpcManager.config(Config.builder().configDebug(true).configSharedMemoryCapacity(2*1024*1024).build())
+        IpcManager.config(Config.builder().configDebug(true).build())
         IpcManager.init(this)
         IpcManager.open("com.demo.ipcdemo") {
             runOnUiThread {

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

@@ -1,9 +1,11 @@
 package com.demo.ipc
 
+import android.os.Binder
 import android.util.Log
 import com.ipc.extend.test.*
 import com.zclever.ipc.core.*
 import kotlin.concurrent.thread
+import kotlin.random.Random
 
 
 object InfoServiceManager : InfoService {
@@ -39,7 +41,6 @@ object InfoServiceManager : InfoService {
     private var mCallBack: Result<Event>? = null
 
     init {
-
         thread {
             while (true) {
                 mCallBack?.onData(Event(count++))
@@ -71,15 +72,19 @@ object InfoServiceManager : InfoService {
     }
 
     override fun getBigByteArray(): ByteArray {
-        return ByteArray(258_000)
+        return Random.nextBytes(Random.nextInt(1024*1024).also {
+            Log.i(TAG, "getBigByteArray size->${it}")
+        })
     }
 
     private var asyncBigByteArrayCallback:Result<ByteArray>?=null
 
     override fun asyncGetBigByteArray(callBack: Result<ByteArray>) {
         asyncBigByteArrayCallback=callBack
         thread {
-            asyncBigByteArrayCallback?.onData(ByteArray(254_998))
+            asyncBigByteArrayCallback?.onData(Random.nextBytes(Random.nextInt(1024*500).also {
+                Log.i(TAG, "asyncGetBigByteArray size->${it}")
+            }))
         }
     }
 }

ipc-core/src/main/java/com/zclever/ipc/core/Bridge.kt

@@ -5,7 +5,7 @@ import android.os.Process
 
 const val REQUEST_TYPE_CREATE = 1
 const val REQUEST_TYPE_INVOKE = 2
-const val BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE = 510_000 //根据parcel序列化结合接口设计，最大能传输的json字节数据长度
+const val BINDER_MAX_TRANSFORM_PARCEL_SIZE = 600_000 //定义最大Parcel传输的size，理论是1M-8k，这里需要写小一点
 
 /**
  * 请求对象

ipc-core/src/main/java/com/zclever/ipc/core/Config.kt

@@ -12,8 +12,8 @@ class Config private constructor(builder: Builder) {
     val mediaMemoryCapacity = builder.mediaMemoryCapacity
 
     companion object {
-        const val DEFAULT_MEDIA_MEMORY_SIZE = 1280 * 720 * 4 //
-        const val SHARED_MEMORY_DEFAULT_SIZE = 5 * 1024 * 1024 //默认5M数据
+        const val DEFAULT_MEDIA_MEMORY_SIZE = 8 * 1024 * 1024 //默认8M数据
+        const val SHARED_MEMORY_DEFAULT_SIZE = 8 * 1024 * 1024 //默认8M数据
         fun builder() = Builder()
     }
 

ipc-core/src/main/java/com/zclever/ipc/core/ParcelSizeHelper.kt

@@ -0,0 +1,31 @@
+package com.zclever.ipc.core
+
+import android.os.Parcel
+
+/*
+ * *****************************************************************************
+ * <p>
+ * Copyright (C),2007-2016, LonBon Technologies Co. Ltd. All Rights Reserved.
+ * <p>
+ * *****************************************************************************
+ */
+object ParcelSizeHelper {
+
+
+    fun  getStringParcelSize(data:String):Int{
+
+        val parcel = Parcel.obtain()
+
+        parcel.writeString(data)
+
+
+        val size=parcel.marshall().size
+
+        parcel.recycle()
+
+        return size
+    }
+
+
+
+}

ipc-core/src/main/java/com/zclever/ipc/core/client/ServiceInvocationHandler.kt

@@ -55,10 +55,12 @@ internal class ServiceInvocationHandler(
 
                 val paramByteArray = requestParamJson.encodeToByteArray()
 
-                debugD("invoke requestParamJson byte size ->${paramByteArray.size}, content->$requestParamJson")
+                val parcelSize=ParcelSizeHelper.getStringParcelSize(requestParamJson)
+
+                debugD("invoke requestParamJson parcelSize ->${parcelSize}, content->$requestParamJson")
 
                 val response =
-                    if (paramByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {//binder传输
+                    if (parcelSize < BINDER_MAX_TRANSFORM_PARCEL_SIZE) {//binder传输
 
                         synchronized(ClientCache.serverResponseSharedMemory!!) {//确保同步
 

ipc-core/src/main/java/com/zclever/ipc/core/server/ServerCallBack.kt

@@ -22,11 +22,13 @@ internal class ServerCallBack(
 
         val dataJson = GsonInstance.toJson(data)
 
+        val parcelSize=ParcelSizeHelper.getStringParcelSize(dataJson)
+
         val dataJsonByteArray=dataJson.encodeToByteArray()
 
-        debugD("onData: $callbackKey,-------${ServiceCache.remoteClients.getClientByPid(pid)}，size->${dataJsonByteArray.size}")
+        debugD("onData: $callbackKey,-------${ServiceCache.remoteClients.getClientByPid(pid)}，size->${dataJsonByteArray.size}，parcelSize->${parcelSize}")
 
-        if (dataJsonByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {
+        if (parcelSize < BINDER_MAX_TRANSFORM_PARCEL_SIZE) {
             debugD("onData use binder")
             ServiceCache.remoteClients.getClientByPid(pid)
                 ?.onReceive(GsonInstance.toJson(CallbackResponse(callbackKey, dataJson)))

ipc-core/src/main/java/com/zclever/ipc/core/server/ServiceCenter.kt

@@ -102,13 +102,17 @@ class ServiceCenter : Service() {
 
                     val resultByteArray = resultJson.encodeToByteArray()
 
-                    if (resultByteArray.size < BINDER_MAX_TRANSFORM_JSON_BYTE_ARRAY_SIZE) {
+                    val parcelSize = ParcelSizeHelper.getStringParcelSize(resultJson)
+
+                    if (parcelSize < BINDER_MAX_TRANSFORM_PARCEL_SIZE) {
                         debugD("return use binder")
                         Response(resultJson).toJson()
                     } else {
                         debugD("return use shared memory")
 
-                        ServiceCache.serverResponseMemoryMap[requestBase.pid]!!.writeByteArray(resultByteArray)
+                        ServiceCache.serverResponseMemoryMap[requestBase.pid]!!.writeByteArray(
+                            resultByteArray
+                        )
 
                         Response(null, resultByteArray.size).toJson()
                     }