反射注入方式改成AnnotationProcessor方式注入

yuzhijun · Jun 22, 2017 · 910e435 · 910e435
1 parent 05234de
commit 910e435
Show file tree

Hide file tree

Showing 55 changed files with 524 additions and 444 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,4 +30,6 @@ dependencies {
     compile project(':bussiness-module-b')
     compile project(':basemodel')
     compile project(':rxlrouter-api')
+    compile project(':lrouter-annotation')
+    annotationProcessor project(':lrouter-compiler')
 }
diff --git a/app/src/androidTest/java/com/lenovohit/lrouter/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/lenovohit/lrouter/ExampleInstrumentedTest.java
diff --git a/app/src/main/java/com/lenovohit/lrouter/AppInterceptor.java b/app/src/main/java/com/lenovohit/lrouter/AppInterceptor.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Interceptor;
+import com.lenovohit.annotation.Interceptor;
 import com.lenovohit.lrouter_api.intercept.AopInterceptor;
 
 /**

diff --git a/app/src/main/java/com/lenovohit/lrouter/AppInterceptor1.java b/app/src/main/java/com/lenovohit/lrouter/AppInterceptor1.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Interceptor;
+import com.lenovohit.annotation.Interceptor;
 import com.lenovohit.lrouter_api.intercept.AopInterceptor;
 
 /**

diff --git a/app/src/main/java/com/lenovohit/lrouter/MainAction.java b/app/src/main/java/com/lenovohit/lrouter/MainAction.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Action;
+import com.lenovohit.annotation.Action;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRActionResult;
 import com.lenovohit.lrouter_api.core.LRouterRequest;

diff --git a/app/src/main/java/com/lenovohit/lrouter/MainAnologyApplication.java b/app/src/main/java/com/lenovohit/lrouter/MainAnologyApplication.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Application;
+import com.lenovohit.annotation.Application;
 import com.lenovohit.lrouter_api.base.AnologyApplication;
 
 /**

diff --git a/app/src/main/java/com/lenovohit/lrouter/MainProvider.java b/app/src/main/java/com/lenovohit/lrouter/MainProvider.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Provider;
+import com.lenovohit.annotation.Provider;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRProvider;
 

diff --git a/app/src/main/java/com/lenovohit/lrouter/MainRouterConnectService.java b/app/src/main/java/com/lenovohit/lrouter/MainRouterConnectService.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Service;
+import com.lenovohit.annotation.Service;
 import com.lenovohit.lrouter_api.core.LocalRouterService;
 
 /**

diff --git a/app/src/main/java/com/lenovohit/lrouter/SocketAction.java b/app/src/main/java/com/lenovohit/lrouter/SocketAction.java
@@ -1,6 +1,6 @@
 package com.lenovohit.lrouter;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Action;
+import com.lenovohit.annotation.Action;
 import com.lenovohit.lrouter_api.core.socket.server.LRSocketAction;
 
 /**

diff --git a/app/src/main/java/com/lenovohit/lrouter/StartInterceptor.java b/app/src/main/java/com/lenovohit/lrouter/StartInterceptor.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 
-import com.lenovohit.lrouter_api.annotation.ioc.IntentInterceptor;
+import com.lenovohit.annotation.IntentInterceptor;
 import com.lenovohit.lrouter_api.intercept.StartupInterceptor;
 
 /**

diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/bussiness-module-a/build.gradle b/bussiness-module-a/build.gradle
@@ -28,4 +28,6 @@ dependencies {
     //module依赖路由module
     compile project(':lrouter-api')
     compile project(':basemodel')
+    compile project(':lrouter-annotation')
+    annotationProcessor project(':lrouter-compiler')
 }
diff --git a/...dule-a/src/androidTest/java/com/lenovohit/bussiness_module_a/ExampleInstrumentedTest.java b/...dule-a/src/androidTest/java/com/lenovohit/bussiness_module_a/ExampleInstrumentedTest.java
diff --git a/...le-a/src/main/java/com/lenovohit/bussiness_module_a/BusinessModuleAServiceConnection.java b/...le-a/src/main/java/com/lenovohit/bussiness_module_a/BusinessModuleAServiceConnection.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_a;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Service;
+import com.lenovohit.annotation.Service;
 import com.lenovohit.lrouter_api.core.LocalRouterService;
 
 /**

diff --git a/...le-a/src/main/java/com/lenovohit/bussiness_module_a/BusinessModuleAnologyApplication.java b/...le-a/src/main/java/com/lenovohit/bussiness_module_a/BusinessModuleAnologyApplication.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_a;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Application;
+import com.lenovohit.annotation.Application;
 import com.lenovohit.lrouter_api.base.AnologyApplication;
 
 /**

diff --git a/bussiness-module-a/src/main/java/com/lenovohit/bussiness_module_a/BussinessModuleAction.java b/bussiness-module-a/src/main/java/com/lenovohit/bussiness_module_a/BussinessModuleAction.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Action;
+import com.lenovohit.annotation.Action;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRActionResult;
 import com.lenovohit.lrouter_api.core.LRouterRequest;

diff --git a/...ness-module-a/src/main/java/com/lenovohit/bussiness_module_a/BussinessModuleProvider.java b/...ness-module-a/src/main/java/com/lenovohit/bussiness_module_a/BussinessModuleProvider.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_a;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Provider;
+import com.lenovohit.annotation.Provider;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRProvider;
 

diff --git a/bussiness-module-b/build.gradle b/bussiness-module-b/build.gradle
@@ -27,4 +27,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile project(':lrouter-api')
     compile project(':basemodel')
+    compile project(':lrouter-annotation')
+    annotationProcessor project(':lrouter-compiler')
 }
diff --git a/...dule-b/src/androidTest/java/com/lenovohit/bussiness_module_b/ExampleInstrumentedTest.java b/...dule-b/src/androidTest/java/com/lenovohit/bussiness_module_b/ExampleInstrumentedTest.java
diff --git a/...e-b/src/main/java/com/lenovohit/bussiness_module_b/BusinessModuleBAnologyApplication.java b/...e-b/src/main/java/com/lenovohit/bussiness_module_b/BusinessModuleBAnologyApplication.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_b;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Application;
+import com.lenovohit.annotation.Application;
 import com.lenovohit.lrouter_api.base.AnologyApplication;
 
 /**

diff --git a/...iness-module-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBAction.java b/...iness-module-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBAction.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.lenovohit.annotation.Action;
 import com.lenovohit.basemodel.User;
-import com.lenovohit.lrouter_api.annotation.ioc.Action;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRActionResult;
 import com.lenovohit.lrouter_api.core.LRouterRequest;

diff --git a/...ess-module-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBProvider.java b/...ess-module-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBProvider.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_b;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Provider;
+import com.lenovohit.annotation.Provider;
 import com.lenovohit.lrouter_api.core.LRAction;
 import com.lenovohit.lrouter_api.core.LRProvider;
 

diff --git a/...e-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBServiceConnection.java b/...e-b/src/main/java/com/lenovohit/bussiness_module_b/BussinessModuleBServiceConnection.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_b;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Service;
+import com.lenovohit.annotation.Service;
 import com.lenovohit.lrouter_api.core.LocalRouterService;
 
 /**

diff --git a/bussiness-module-b/src/main/java/com/lenovohit/bussiness_module_b/ModulebSocketAction.java b/bussiness-module-b/src/main/java/com/lenovohit/bussiness_module_b/ModulebSocketAction.java
@@ -1,6 +1,6 @@
 package com.lenovohit.bussiness_module_b;
 
-import com.lenovohit.lrouter_api.annotation.ioc.Action;
+import com.lenovohit.annotation.Action;
 import com.lenovohit.lrouter_api.core.socket.server.LRSocketAction;
 
 /**

diff --git a/lrouter-annotation/.gitignore b/lrouter-annotation/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/lrouter-annotation/build.gradle b/lrouter-annotation/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'java'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"
diff --git a/...it/lrouter_api/annotation/ioc/Action.java → ...java/com/lenovohit/annotation/Action.java b/...it/lrouter_api/annotation/ioc/Action.java → ...java/com/lenovohit/annotation/Action.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,8 +8,9 @@
 /**
  * Created by yuzhijun on 2017/6/2.
  */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.CLASS)
 public @interface Action {
     String name();
     String provider();

diff --git a/...outer_api/annotation/ioc/Application.java → ...com/lenovohit/annotation/Application.java b/...outer_api/annotation/ioc/Application.java → ...com/lenovohit/annotation/Application.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,7 +9,7 @@
  * Created by yuzhijun on 2017/6/2.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface Application {
     String name();
     int priority();

diff --git a/...api/annotation/ioc/IntentInterceptor.java → ...novohit/annotation/IntentInterceptor.java b/...api/annotation/ioc/IntentInterceptor.java → ...novohit/annotation/IntentInterceptor.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,6 +9,6 @@
  * Created by yuzhijun on 2017/6/12.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface IntentInterceptor {
 }
diff --git a/...outer_api/annotation/ioc/Interceptor.java → ...com/lenovohit/annotation/Interceptor.java b/...outer_api/annotation/ioc/Interceptor.java → ...com/lenovohit/annotation/Interceptor.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,6 +9,6 @@
  * Created by yuzhijun on 2017/6/5.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface Interceptor {
 }
diff --git a/.../lrouter_api/annotation/ioc/Provider.java → ...va/com/lenovohit/annotation/Provider.java b/.../lrouter_api/annotation/ioc/Provider.java → ...va/com/lenovohit/annotation/Provider.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,7 +10,7 @@
  * Created by yuzhijun on 2017/6/2.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface Provider {
     String name();
 }
diff --git a/...t/lrouter_api/annotation/ioc/Service.java → ...ava/com/lenovohit/annotation/Service.java b/...t/lrouter_api/annotation/ioc/Service.java → ...ava/com/lenovohit/annotation/Service.java
@@ -1,4 +1,4 @@
-package com.lenovohit.lrouter_api.annotation.ioc;
+package com.lenovohit.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,7 +9,7 @@
  * Created by yuzhijun on 2017/6/2.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.CLASS)
 public @interface Service {
     String name();
 }
diff --git a/lrouter-api/build.gradle b/lrouter-api/build.gradle
@@ -64,6 +64,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'org.aspectj:aspectjrt:1.8.1'
+    compile project(':lrouter-annotation')
 }
 
 android.libraryVariants.all { variant ->