Browse Source

1:使用阿里ARouter替换ActivityRouter;

guiying712 8 years ago
parent
commit
335064003c

+ 3 - 3
build.gradle

@@ -52,9 +52,9 @@ ext {
     gsonVersion = "2.8.0"
     photoViewVersion = "2.0.0"
 
-    //需检查升级版本
-    annotationProcessor = "1.1.7"
-    routerVersion = "1.2.2"
+    //检查时间:2017.6.6
+    annotationProcessor = "1.0.3"
+    routerVersion = "1.2.1.1"
     easyRecyclerVersion = "4.4.0"
     cookieVersion = "v1.0.1"
     toastyVersion = "1.1.3"

+ 1 - 1
lib_common/build.gradle

@@ -33,5 +33,5 @@ dependencies {
     compile "com.github.GrenderG:Toasty:$rootProject.toastyVersion"
 
     //router
-    compile "com.github.mzule.activityrouter:activityrouter:$rootProject.routerVersion"
+    compile "com.alibaba:arouter-api:$rootProject.routerVersion"
 }

+ 8 - 4
module_main/build.gradle

@@ -13,6 +13,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
+
+        //ARouter
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [moduleName: project.getName()]
+            }
+        }
     }
 
 
@@ -29,14 +36,11 @@ android {
             }
         }
     }
-    //设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
-    //但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
-    //resourcePrefix "girls_"
 
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
 }

+ 0 - 17
module_main/src/main/java/com/guiying/main/Main.java

@@ -1,17 +0,0 @@
-package com.guiying.main;
-
-import com.github.mzule.activityrouter.annotation.Module;
-
-/**
- * <p>声明主要组件</p>
- * <p>
- * 这个组件是应用默认启动的组件
- *
- * @author 张华洋 2017/4/1 12:39
- * @version V1.2.0
- * @name Main
- */
-
-@Module("main")
-public class Main {
-}

+ 12 - 3
module_main/src/main/java/com/guiying/main/MainActivity.java

@@ -5,11 +5,18 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
 
-import com.github.mzule.activityrouter.router.Routers;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.common.base.BaseApplication;
 import com.guiying.common.utils.ToastUtils;
 
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/7/1 13:13
+ * @version V1.2.0
+ * @name MainActivity
+ */
 public class MainActivity extends BaseActivity implements View.OnClickListener {
 
     private long exitTime = 0;
@@ -29,9 +36,11 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.news_button) {
-            Routers.open(MainActivity.this, "module://news");
+            //跳转到NewsCenterActivity
+            ARouter.getInstance().build("/news/center").navigation();
         } else if (view.getId() == R.id.girls_button) {
-            Routers.open(MainActivity.this, "module://girls");
+            //跳转到GirlsActivity
+            ARouter.getInstance().build("/girls/list").navigation();
         }
     }
 

+ 8 - 6
module_news/build.gradle

@@ -13,6 +13,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
+
+        //ARouter
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [moduleName: project.getName()]
+            }
+        }
     }
 
     sourceSets {
@@ -29,15 +36,10 @@ android {
         }
     }
 
-    //设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
-    //但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
-    //resourcePrefix "girls_"
-
-
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
 }

+ 0 - 14
module_news/src/main/java/com/guiying/news/News.java

@@ -1,14 +0,0 @@
-package com.guiying.news;
-
-import com.github.mzule.activityrouter.annotation.Module;
-
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 16:31
- * @version V1.2.0
- * @name news
- */
-@Module("news")
-public class News {
-}

+ 2 - 0
module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java

@@ -2,6 +2,7 @@ package com.guiying.news.detail;
 
 import android.os.Bundle;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.base.BaseActivity;
 
 /**
@@ -11,6 +12,7 @@ import com.guiying.common.base.BaseActivity;
  * @version V1.2.0
  * @name NewsDetailActivity
  */
+@Route(path = "/news/detail")
 public class NewsDetailActivity extends BaseActivity {
 
     @Override

+ 9 - 2
module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java

@@ -5,7 +5,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 
-import com.github.mzule.activityrouter.annotation.Router;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.news.R;
 
@@ -15,7 +15,14 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
-@Router("news")
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/4/20 22:26
+ * @version V1.2.0
+ * @name NewsCenterActivity
+ */
+@Route(path = "/news/center")
 public class NewsCenterActivity extends BaseActivity {
 
     protected Toolbar mToolBar;

+ 0 - 2
module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java

@@ -22,8 +22,6 @@ import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
  * @version V1.2.0
  * @name NewsListAdapter
  */
-
-
 public class NewsListAdapter extends RecyclerArrayAdapter<Story> {
 
     public NewsListAdapter(Context context) {