完善代码

FlyJingFish · FlyJingFish · commit 8940022d8bcb · 2024-05-23T15:20:46.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
@@ -1,13 +1,12 @@
 package com.flyjingfish.modulecommunication
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
 import com.flyjingfish.login.LoginActivity
 import com.flyjingfish.module_communication_intercept.RouterInterceptManager
-import com.flyjingfish.module_communication_intercept.intercept.Proceed
+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint
 import com.flyjingfish.module_communication_intercept.intercept.RouterIntercept
 import com.flyjingfish.modulecommunication.databinding.ActivityMainBinding
 import com.flyjingfish.user.UserActivity
@@ -29,7 +28,7 @@ class MainActivity : ComponentActivity() {
 
         binding.btnGoUri.setOnClickListener {
             RouterInterceptManager.addIntercept(object :RouterIntercept{
-                override fun onIntercept(proceed: Proceed) {
+                override fun onIntercept(proceed: InterceptPoint) {
                     Log.e("onIntercept","--MainActivity--${proceed.path},params = ${proceed.paramsMap},byPath = ${proceed.byPath}")
                     proceed.proceed()
                 }
diff --git a/lib-login/src/main/java/com/flyjingfish/login/LoginIntercept.kt b/lib-login/src/main/java/com/flyjingfish/login/LoginIntercept.kt
@@ -1,11 +1,11 @@
 package com.flyjingfish.login
 
 import android.util.Log
-import com.flyjingfish.module_communication_intercept.intercept.Proceed
+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint
 import com.flyjingfish.module_communication_intercept.intercept.RouterIntercept
 
 class LoginIntercept : RouterIntercept {
-    override fun onIntercept(proceed: Proceed) {
+    override fun onIntercept(proceed: InterceptPoint) {
         Log.e("onIntercept","--LoginIntercept--${proceed.path},params = ${proceed.paramsMap},byPath = ${proceed.byPath}")
         proceed.proceed()
     }
diff --git a/lib-user/src/main/java/com/flyjingfish/user/UserIntercept.kt b/lib-user/src/main/java/com/flyjingfish/user/UserIntercept.kt
@@ -1,11 +1,11 @@
 package com.flyjingfish.user
 
 import android.util.Log
-import com.flyjingfish.module_communication_intercept.intercept.Proceed
+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint
 import com.flyjingfish.module_communication_intercept.intercept.RouterIntercept
 
 class UserIntercept : RouterIntercept {
-    override fun onIntercept(proceed: Proceed) {
+    override fun onIntercept(proceed: InterceptPoint) {
         Log.e("onIntercept","--UserIntercept--${proceed.path},params = ${proceed.paramsMap},byPath = ${proceed.byPath}")
         proceed.proceed()
     }
diff --git a/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/RouterInterceptManager.kt b/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/RouterInterceptManager.kt
@@ -1,6 +1,6 @@
 package com.flyjingfish.module_communication_intercept
 
-import com.flyjingfish.module_communication_intercept.intercept.Proceed
+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint
 import com.flyjingfish.module_communication_intercept.intercept.RouterIntercept
 
 object RouterInterceptManager {
@@ -31,29 +31,29 @@ object RouterInterceptManager {
         RouterInterceptManager.intercepts.addAll(intercepts.sortedBy { it.order() })
     }
 
-    internal fun notifyIntercept(proceed : Proceed) {
+    internal fun notifyIntercept(point : InterceptPoint) {
         if (intercepts.isEmpty()) {
-            proceed.proceed()
+            point.proceed()
             return
         }
         val thisIntercepts = mutableSetOf<RouterIntercept>().apply {
             addAll(intercepts)
         }
         val iterator = thisIntercepts.iterator()
-        proceed.listener = object : Proceed.OnProceedListener {
+        point.listener = object : InterceptPoint.OnProceedListener {
             override fun onInvoke() {
                 if (iterator.hasNext()) {
                     val intercept = iterator.next()
                     iterator.remove()
-                    proceed.hasNext = iterator.hasNext()
-                    intercept.onIntercept(proceed)
+                    point.hasNext = iterator.hasNext()
+                    intercept.onIntercept(point)
                 }
             }
         }
 
-        proceed.hasNext = thisIntercepts.size > 1
+        point.hasNext = thisIntercepts.size > 1
         val intercept = iterator.next()
         iterator.remove()
-        intercept.onIntercept(proceed)
+        intercept.onIntercept(point)
     }
 }
diff --git a/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/cut/RouteInterceptCut.kt b/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/cut/RouteInterceptCut.kt
@@ -6,7 +6,7 @@ import com.flyjingfish.android_aop_annotation.anno.AndroidAopMatchClassMethod
 import com.flyjingfish.android_aop_annotation.base.MatchClassMethod
 import com.flyjingfish.android_aop_annotation.enums.MatchType
 import com.flyjingfish.module_communication_annotation.bean.PathInfo
-import com.flyjingfish.module_communication_intercept.intercept.Proceed
+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint
 import com.flyjingfish.module_communication_intercept.RouterInterceptManager
 
 @AndroidAopMatchClassMethod(
@@ -21,8 +21,8 @@ internal class RouteInterceptCut : MatchClassMethod{
         val byPath = joinPoint.args?.get(2)
         val pathInfo = joinPoint.args?.get(3)
         val intent = joinPoint.args?.get(4)
-        val proceed = Proceed(joinPoint,path as String,map as MutableMap<String,Any?>,pathInfo as PathInfo,byPath as Boolean,intent as Intent)
-        RouterInterceptManager.notifyIntercept(proceed)
+        val point = InterceptPoint(joinPoint,path as String,map as MutableMap<String,Any?>,pathInfo as PathInfo,byPath as Boolean,intent as Intent)
+        RouterInterceptManager.notifyIntercept(point)
         return null
     }
 }
diff --git a/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/intercept/InterceptPoint.kt b/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/intercept/InterceptPoint.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import com.flyjingfish.android_aop_annotation.ProceedJoinPoint
 import com.flyjingfish.module_communication_annotation.bean.PathInfo
 
-class Proceed(
+class InterceptPoint(
     private val joinPoint: ProceedJoinPoint,
     /**
      * 路由页面的 path
diff --git a/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/intercept/RouterIntercept.kt b/module-communication-intercept/src/main/java/com/flyjingfish/module_communication_intercept/intercept/RouterIntercept.kt
@@ -1,6 +1,6 @@
 package com.flyjingfish.module_communication_intercept.intercept
 
 interface RouterIntercept {
-    fun onIntercept(proceed: Proceed)
+    fun onIntercept(point: InterceptPoint)
     fun order():Int
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.flyjingfish.module_communication_intercept`
`2`	`2`
`3`		`-import com.flyjingfish.module_communication_intercept.intercept.Proceed`
	`3`	`+import com.flyjingfish.module_communication_intercept.intercept.InterceptPoint`
`4`	`4`	`import com.flyjingfish.module_communication_intercept.intercept.RouterIntercept`
`5`	`5`
`6`	`6`	`object RouterInterceptManager {`
`@@ -31,29 +31,29 @@ object RouterInterceptManager {`
`31`	`31`	`RouterInterceptManager.intercepts.addAll(intercepts.sortedBy { it.order() })`
`32`	`32`	`}`
`33`	`33`
`34`		`- internal fun notifyIntercept(proceed : Proceed) {`
	`34`	`+ internal fun notifyIntercept(point : InterceptPoint) {`
`35`	`35`	`if (intercepts.isEmpty()) {`
`36`		`- proceed.proceed()`
	`36`	`+ point.proceed()`
`37`	`37`	`return`
`38`	`38`	`}`
`39`	`39`	`val thisIntercepts = mutableSetOf<RouterIntercept>().apply {`
`40`	`40`	`addAll(intercepts)`
`41`	`41`	`}`
`42`	`42`	`val iterator = thisIntercepts.iterator()`
`43`		`- proceed.listener = object : Proceed.OnProceedListener {`
	`43`	`+ point.listener = object : InterceptPoint.OnProceedListener {`
`44`	`44`	`override fun onInvoke() {`
`45`	`45`	`if (iterator.hasNext()) {`
`46`	`46`	`val intercept = iterator.next()`
`47`	`47`	`iterator.remove()`
`48`		`- proceed.hasNext = iterator.hasNext()`
`49`		`- intercept.onIntercept(proceed)`
	`48`	`+ point.hasNext = iterator.hasNext()`
	`49`	`+ intercept.onIntercept(point)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- proceed.hasNext = thisIntercepts.size > 1`
	`54`	`+ point.hasNext = thisIntercepts.size > 1`
`55`	`55`	`val intercept = iterator.next()`
`56`	`56`	`iterator.remove()`
`57`		`- intercept.onIntercept(proceed)`
	`57`	`+ intercept.onIntercept(point)`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.flyjingfish.module_communication_intercept.intercept`
`2`	`2`
`3`	`3`	`interface RouterIntercept {`
`4`		`- fun onIntercept(proceed: Proceed)`
	`4`	`+ fun onIntercept(point: InterceptPoint)`
`5`	`5`	`fun order():Int`
`6`	`6`	`}`