Skip to content

Commit 6c15fc6

Browse files
committed
1:替换阿里ARouter,修改全局Gradle脚本,以及路由跳转;
1 parent 3350640 commit 6c15fc6

File tree

7 files changed

+31
-46
lines changed

7 files changed

+31
-46
lines changed

module_app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
targetSdkVersion rootProject.ext.targetSdkVersion
2323
versionCode rootProject.ext.versionCode
2424
versionName rootProject.ext.versionName
25-
multiDexEnabled false
25+
multiDexEnabled true
2626
//打包时间
2727
resValue "string", "build_time", buildTime()
2828
}
@@ -61,7 +61,7 @@ android {
6161

6262
dependencies {
6363
compile fileTree(dir: 'libs', include: ['*.jar'])
64-
annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
64+
compile 'com.android.support:multidex:1.0.1'
6565
if (isModule.toBoolean()) {
6666
compile project(':lib_common')
6767
} else {

module_app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
1212

13-
<!--声明整个应用程序的路由协议-->
14-
<activity
15-
android:name="com.github.mzule.activityrouter.router.RouterActivity"
16-
android:theme="@android:style/Theme.NoDisplay">
17-
<intent-filter>
18-
<action android:name="android.intent.action.VIEW" />
19-
20-
<category android:name="android.intent.category.DEFAULT" />
21-
<category android:name="android.intent.category.BROWSABLE" />
22-
23-
<data android:scheme="@string/global_scheme" /> <!-- 改成自己的scheme -->
24-
</intent-filter>
25-
</activity>
2613
<!--发送崩溃日志界面-->
2714
<activity
2815
android:name="org.acra.CrashReportDialog"

module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.guiying.androidmodulepattern;
22

33
import android.content.Context;
4+
import android.support.multidex.MultiDex;
45

5-
import com.github.mzule.activityrouter.annotation.Modules;
6+
import com.alibaba.android.arouter.launcher.ARouter;
67
import com.guiying.common.base.BaseApplication;
8+
import com.guiying.common.utils.Utils;
79

810
import org.acra.ACRA;
911
import org.acra.ReportField;
@@ -15,7 +17,7 @@
1517
import org.acra.sender.ReportSenderException;
1618

1719
/**
18-
* <p>这里是整个组件化项目管理各个组件的地方,所有需要使用的组件必须在此声明</p>
20+
* <p>这里仅需做一些初始化的工作</p>
1921
*
2022
* @author 张华洋 2017/2/15 20:14
2123
* @version V1.2.0
@@ -36,25 +38,31 @@
3638
resToastText = R.string.crash_toast_text,
3739
resDialogText = R.string.crash_dialog_text,
3840
resDialogTitle = R.string.crash_dialog_title)
39-
@Modules({"main", "girls", "news"})
4041
public class MyApplication extends BaseApplication {
4142

4243

4344
@Override
4445
public void onCreate() {
4546
super.onCreate();
47+
if (Utils.isAppDebug()) {
48+
//开启InstantRun之后,一定要在ARouter.init之前调用openDebug
49+
ARouter.openDebug();
50+
ARouter.openLog();
51+
}
52+
ARouter.init(this);
4653
//崩溃日志记录初始化
4754
ACRA.init(this);
4855
ACRA.getErrorReporter().removeAllReportSenders();
4956
ACRA.getErrorReporter().setReportSender(new CrashReportSender());
5057
}
5158

52-
// @Override
53-
// protected void attachBaseContext(Context base) {
54-
// super.attachBaseContext(base);
55-
// // dex突破65535的限制
56-
// MultiDex.install(this);
57-
// }
59+
60+
@Override
61+
protected void attachBaseContext(Context base) {
62+
super.attachBaseContext(base);
63+
// dex突破65535的限制
64+
MultiDex.install(this);
65+
}
5866

5967

6068
/**

module_girls/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ android {
1313
targetSdkVersion rootProject.ext.targetSdkVersion
1414
versionCode rootProject.ext.versionCode
1515
versionName rootProject.ext.versionName
16-
}
1716

17+
//ARouter
18+
javaCompileOptions {
19+
annotationProcessorOptions {
20+
arguments = [moduleName: project.getName()]
21+
}
22+
}
23+
}
1824

1925
sourceSets {
2026
main {
@@ -29,15 +35,11 @@ android {
2935
}
3036
}
3137
}
32-
//设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
33-
//但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
34-
//resourcePrefix "girls_"
35-
3638

3739
}
3840

3941
dependencies {
4042
compile fileTree(dir: 'libs', include: ['*.jar'])
41-
annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
43+
annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
4244
compile project(':lib_common')
4345
}

module_girls/src/main/java/com/guiying/girls/Girls.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.support.v4.view.ViewPager;
55
import android.view.WindowManager;
66

7+
import com.alibaba.android.arouter.facade.annotation.Route;
78
import com.guiying.common.HackyViewPager;
89
import com.guiying.common.base.BaseActivity;
910
import com.guiying.girls.Constants;
@@ -18,6 +19,7 @@
1819
* @version V1.1
1920
* @name GirlActivity
2021
*/
22+
@Route(path = "/girls/detail")
2123
public class GirlActivity extends BaseActivity {
2224

2325
@Override

module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import android.os.Bundle;
44

5-
import com.github.mzule.activityrouter.annotation.Router;
5+
import com.alibaba.android.arouter.facade.annotation.Route;
66
import com.guiying.common.base.BaseActionBarActivity;
77
import com.guiying.girls.R;
88

9-
@Router("girls")
9+
@Route(path = "/girls/list")
1010
public class GirlsActivity extends BaseActionBarActivity {
1111

1212
private GirlsView mView;

0 commit comments

Comments
 (0)