[anno] [change error with Json&di in apt ]

Author: leobert-lan

router-anno-compiler/src/main/java/com/ljsw/router/compiler/processor/AutowiredProcessor.java

@@ -71,12 +71,14 @@ public class AutowiredProcessor extends AbstractProcessor {
      */
     private Map<TypeElement, List<Element>> parentAndChild = new HashMap<>();
 
-    //UIRouter:com.mrzhang.component.componentlib.router.ui.UIRouter
-    private static final ClassName UIRouterClass =
-            ClassName.get("com.mrzhang.component.componentlib.router.ui", "UIRouter");
+//    private static final ClassName UIRouterClass =
+//            ClassName.get("com.mrzhang.component.componentlib.router.ui", "UIRouter");
+//
+//    private static final ClassName RouterClass =
+//            ClassName.get("com.mrzhang.component.componentlib.router", "Router");
 
-    private static final ClassName RouterClass =
-            ClassName.get("com.mrzhang.component.componentlib.router", "Router");
+    private static final ClassName JsonServiceInterface =
+            ClassName.get("com.ljsw.component.json","JsonService");
 
     //    private static final ClassName ARouterClass = ClassName.get("com.alibaba.android.arouter.launcher", "ARouter");
     private static final ClassName AndroidLog = ClassName.get("android.util", "Log");
@@ -163,26 +165,18 @@ private void generateHelper() throws IOException, IllegalAccessException {
 
                 logger.info("======== inject jsonservice");
 
-                injectMethodBuilder.addStatement("$T router = $T.getInstance()",
-                        RouterClass,
-                        RouterClass);
-
-                injectMethodBuilder.beginControlFlow("if (router.getService($T.class.getSimpleName()) != null)",
-                        ClassName.get(type_JsonService));
-
-                injectMethodBuilder.addStatement("jsonService = ($T) router.getService($T.class.getSimpleName())",
-                        ClassName.get(type_JsonService),
-                        ClassName.get(type_JsonService));
-
-
-                injectMethodBuilder.endControlFlow();
-
-//                injectMethodBuilder.addStatement(_statement,
-//                        RouterClass,
+//                injectMethodBuilder.addStatement("$T router = $T.getInstance()",
 //                        RouterClass,
-//                        ClassName.get(type_JsonService),
+//                        RouterClass);
+//                injectMethodBuilder.beginControlFlow("if (router.getService($T.class.getSimpleName()) != null)",
+//                        ClassName.get(type_JsonService));
+//                injectMethodBuilder.addStatement("jsonService = ($T) router.getService($T.class.getSimpleName())",
 //                        ClassName.get(type_JsonService),
 //                        ClassName.get(type_JsonService));
+//                injectMethodBuilder.endControlFlow();
+
+                injectMethodBuilder.addStatement("jsonService = $T.Factory.getInstance().create()",
+                        ClassName.get(type_JsonService));
 
                 injectMethodBuilder.addStatement("$T substitute = ($T)target", ClassName.get(parent), ClassName.get(parent));
 

router-anno-compiler/src/main/java/com/ljsw/router/compiler/utils/Constants.java

@@ -43,9 +43,9 @@ public interface Constants {
     String BOOLEAN = LANG + ".Boolean";
     String STRING = LANG + ".String";
 
-    String ISYRINGE = "com.mrzhang.component.componentlib.router.facade.ISyringe";
+    String ISYRINGE = "com.ljsw.component.di.route.ISyringe";
 
-    String JSON_SERVICE = "com.mrzhang.componentservice.json.JsonService";
+    String JSON_SERVICE = "com.ljsw.component.json.JsonService";
 
     String ROUTER_UTIL_METHOD_ADDTO = "addTo";
 

sharecomponent/src/main/java/com/mrzhang/share/ShareActivity.java

@@ -10,7 +10,6 @@
 import com.ljsw.component.json.JsonService;
 import com.ljsw.router.facade.annotation.Autowired;
 import com.ljsw.router.facade.annotation.RouteNode;
-import com.mrzhang.component.componentlib.router.Router;
 
 /**
  * Created by mrzhang on 2017/6/20.
@@ -39,24 +38,19 @@ public void setS(String s) {
     TestDto testDto;
 
     private JsonService jsonService = JsonService.Factory.getInstance().create();
+    private AutowiredService autowiredService = AutowiredService.Factory.getInstance().create();
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.share_activity_share);
-//        UIRouter.getInstance().inject
-
-        Router router = Router.getInstance();
-//        if (router.getService(AutowiredService.class.getSimpleName()) != null) {
-//            AutowiredService service = (AutowiredService) router.getService(AutowiredService.class.getSimpleName());
-//            service.autowire(this);
-//        }
+        autowiredService.autowire(this);
 
 
         TextView textView = (TextView) findViewById(R.id.share_tv_tag);
         textView.setText("share: " + bookName);
 
-        Log.d(TAG,"dto:\r"+(jsonService.toJsonString(testDto));
+        Log.d(TAG, "dto:\r" + (jsonService.toJsonString(testDto)));
 
     }