From 54dfcb0eb8ee4e6a1696e9d4e0dffaca1833f652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E7=BA=AC?= Date: Thu, 22 Oct 2020 11:04:37 +0800 Subject: [PATCH] Modify the project structure to facilitate users to understand the design concept of the framework. --- app/build.gradle | 14 ++----- app/src/main/AndroidManifest.xml | 12 ------ .../android/arouter/demo/MainActivity.java | 17 ++++---- module-java-export/build.gradle | 40 +++++++++++++++++++ .../src/main/AndroidManifest.xml | 4 ++ .../arouter/demo/service/Entrance.java | 21 ++++++++++ .../arouter/demo/service}/HelloService.java | 4 +- .../arouter/demo/service/model}/TestObj.java | 2 +- .../demo/service/model}/TestParcelable.java | 2 +- .../demo/service/model}/TestSerializable.java | 2 +- module-java/build.gradle | 8 +++- module-java/src/main/AndroidManifest.xml | 10 ++++- .../arouter/demo/module1}/BlankFragment.java | 8 ++-- .../arouter/demo/module1}/MainLooper.java | 2 +- .../arouter/demo/module1}/TestWebview.java | 2 +- .../module1}/testactivity/BaseActivity.java | 2 +- .../module1}/testactivity/Test1Activity.java | 13 +++--- .../module1}/testactivity/Test2Activity.java | 4 +- .../module1}/testactivity/Test3Activity.java | 4 +- .../module1}/testactivity/Test4Activity.java | 4 +- .../testactivity/TestDynamicActivity.java | 2 +- .../testinterceptor/Test1Interceptor.java | 6 +-- .../testservice/HelloServiceImpl.java | 3 +- .../module1}/testservice/JsonServiceImpl.java | 2 +- .../module1}/testservice/SingleService.java | 2 +- .../src/main/res/layout/activity_test1.xml | 2 +- .../src/main/res/layout/activity_test2.xml | 2 +- .../src/main/res/layout/activity_test4.xml | 2 +- .../main/res/layout/activity_test_module.xml | 2 +- .../main/res/layout/activity_test_module2.xml | 2 +- .../main/res/layout/activity_test_webview.xml | 0 settings.gradle | 1 + 32 files changed, 130 insertions(+), 71 deletions(-) create mode 100644 module-java-export/build.gradle create mode 100644 module-java-export/src/main/AndroidManifest.xml create mode 100644 module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/Entrance.java rename {app/src/main/java/com/alibaba/android/arouter/demo/testservice => module-java-export/src/main/java/com/alibaba/android/arouter/demo/service}/HelloService.java (59%) rename {app/src/main/java/com/alibaba/android/arouter/demo/testinject => module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model}/TestObj.java (86%) rename {app/src/main/java/com/alibaba/android/arouter/demo/testinject => module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model}/TestParcelable.java (95%) rename {app/src/main/java/com/alibaba/android/arouter/demo/testinject => module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model}/TestSerializable.java (85%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/BlankFragment.java (83%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/MainLooper.java (91%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/TestWebview.java (91%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/BaseActivity.java (81%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/Test1Activity.java (84%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/Test2Activity.java (87%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/Test3Activity.java (90%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/Test4Activity.java (86%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testactivity/TestDynamicActivity.java (83%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testinterceptor/Test1Interceptor.java (92%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testservice/HelloServiceImpl.java (87%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testservice/JsonServiceImpl.java (93%) rename {app/src/main/java/com/alibaba/android/arouter/demo => module-java/src/main/java/com/alibaba/android/arouter/demo/module1}/testservice/SingleService.java (91%) rename {app => module-java}/src/main/res/layout/activity_test1.xml (92%) rename {app => module-java}/src/main/res/layout/activity_test2.xml (89%) rename {app => module-java}/src/main/res/layout/activity_test4.xml (87%) rename {app => module-java}/src/main/res/layout/activity_test_webview.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index 2c0acd54..0e8d8611 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,12 +9,6 @@ android { minSdkVersion Integer.parseInt(MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(TARGET_SDK_VERSION) versionName "0.0.1" - - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"] - } - } } compileOptions { @@ -50,13 +44,13 @@ android { } dependencies { - annotationProcessor project(':arouter-compiler') implementation project(':arouter-api') + + // 开发中依赖对方的 service 包 + implementation project(':module-java-export') implementation project(':module-java') - implementation project(':module-kotlin') - implementation project(':arouter-annotation') - implementation 'com.alibaba:fastjson:1.2.48' + implementation project(':module-kotlin') implementation "com.android.support:support-v4:${SUPPORT_LIB_VERSION}" implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 597fb1cb..8f87259a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,18 +43,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java b/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java index 3ce5caf6..9590a902 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java +++ b/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java @@ -1,6 +1,5 @@ package com.alibaba.android.arouter.demo; -import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Build; @@ -12,12 +11,12 @@ import android.view.View; import android.widget.Toast; -import com.alibaba.android.arouter.demo.testactivity.TestDynamicActivity; -import com.alibaba.android.arouter.demo.testinject.TestObj; -import com.alibaba.android.arouter.demo.testinject.TestParcelable; -import com.alibaba.android.arouter.demo.testinject.TestSerializable; -import com.alibaba.android.arouter.demo.testservice.HelloService; -import com.alibaba.android.arouter.demo.testservice.SingleService; +import com.alibaba.android.arouter.demo.module1.testactivity.TestDynamicActivity; +import com.alibaba.android.arouter.demo.service.model.TestObj; +import com.alibaba.android.arouter.demo.service.model.TestParcelable; +import com.alibaba.android.arouter.demo.service.model.TestSerializable; +import com.alibaba.android.arouter.demo.service.HelloService; +import com.alibaba.android.arouter.demo.module1.testservice.SingleService; import com.alibaba.android.arouter.facade.Postcard; import com.alibaba.android.arouter.facade.callback.NavCallback; import com.alibaba.android.arouter.facade.enums.RouteType; @@ -73,6 +72,10 @@ public void onClick(View v) { ARouter.getInstance() .build("/test/activity2") .navigation(); + + // 也可以通过依赖对方提供的二方包来约束入参 + // 非必须，可以通过这种方式调用 + // Entrance.redirect2Test1Activity("张飞", 48, this); break; case R.id.kotlinNavigation: ARouter.getInstance() diff --git a/module-java-export/build.gradle b/module-java-export/build.gradle new file mode 100644 index 00000000..e089b157 --- /dev/null +++ b/module-java-export/build.gradle @@ -0,0 +1,40 @@ +apply plugin: 'com.android.library' + +dependencies { + implementation project(':arouter-annotation') + implementation project(':arouter-api') + implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}" + annotationProcessor project(':arouter-compiler') + + implementation 'com.alibaba:fastjson:1.2.48' +} +android { + compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION) + buildToolsVersion BUILDTOOLS_VERSION + + defaultConfig { + minSdkVersion Integer.parseInt(MIN_SDK_VERSION) + targetSdkVersion Integer.parseInt(TARGET_SDK_VERSION) + + javaCompileOptions { + annotationProcessorOptions { + arguments = [ AROUTER_MODULE_NAME : project.getName() ] + } + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + buildTypes { + release { + debuggable false + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + + lintOptions { abortOnError false } + } +} \ No newline at end of file diff --git a/module-java-export/src/main/AndroidManifest.xml b/module-java-export/src/main/AndroidManifest.xml new file mode 100644 index 00000000..25d47e7a --- /dev/null +++ b/module-java-export/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/Entrance.java b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/Entrance.java new file mode 100644 index 00000000..2c4a109a --- /dev/null +++ b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/Entrance.java @@ -0,0 +1,21 @@ +package com.alibaba.android.arouter.demo.service; + +import android.content.Context; + +import com.alibaba.android.arouter.launcher.ARouter; + +public class Entrance { + /** + * 跳转到 Test1 Activity, + * + * @param name 姓名 + * @param age 年龄 + * @param context ctx + */ + public static void redirect2Test1Activity(String name, int age, Context context) { + ARouter.getInstance().build("/test/activity1") + .withString("name", name) + .withInt("age", age) + .navigation(context); + } +} diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloService.java b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/HelloService.java similarity index 59% rename from app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloService.java rename to module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/HelloService.java index 912e66a4..ace31117 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloService.java +++ b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/HelloService.java @@ -1,9 +1,9 @@ -package com.alibaba.android.arouter.demo.testservice; +package com.alibaba.android.arouter.demo.service; import com.alibaba.android.arouter.facade.template.IProvider; /** - * TODO feature + * 通过 service module 提供给使用方依赖，使用方可以不依赖具体实现，只需要保证最终打包在 app 中即可 * * @author Alex Contact me. * @version 1.0 diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestObj.java b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestObj.java similarity index 86% rename from app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestObj.java rename to module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestObj.java index 9b14169d..9d1875ef 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestObj.java +++ b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestObj.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testinject; +package com.alibaba.android.arouter.demo.service.model; /** * TODO:Feature diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestParcelable.java b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestParcelable.java similarity index 95% rename from app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestParcelable.java rename to module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestParcelable.java index a9df5605..67fe2292 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestParcelable.java +++ b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestParcelable.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testinject; +package com.alibaba.android.arouter.demo.service.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestSerializable.java b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestSerializable.java similarity index 85% rename from app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestSerializable.java rename to module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestSerializable.java index abf07f5d..bc6dd02e 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testinject/TestSerializable.java +++ b/module-java-export/src/main/java/com/alibaba/android/arouter/demo/service/model/TestSerializable.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testinject; +package com.alibaba.android.arouter.demo.service.model; import java.io.Serializable; diff --git a/module-java/build.gradle b/module-java/build.gradle index 07fd17f6..8455ca45 100644 --- a/module-java/build.gradle +++ b/module-java/build.gradle @@ -3,8 +3,12 @@ apply plugin: 'com.android.library' dependencies { implementation project(':arouter-annotation') implementation project(':arouter-api') - implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}" annotationProcessor project(':arouter-compiler') + + implementation project(':module-java-export') + + implementation "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}" + implementation 'com.alibaba:fastjson:1.2.48' } android { compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION) @@ -16,7 +20,7 @@ android { javaCompileOptions { annotationProcessorOptions { - arguments = [ AROUTER_MODULE_NAME : project.getName() ] + arguments = [AROUTER_MODULE_NAME: project.getName(), AROUTER_GENERATE_DOC: "enable"] } } } diff --git a/module-java/src/main/AndroidManifest.xml b/module-java/src/main/AndroidManifest.xml index fff9ccee..665f0d35 100644 --- a/module-java/src/main/AndroidManifest.xml +++ b/module-java/src/main/AndroidManifest.xml @@ -7,8 +7,14 @@ - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/BlankFragment.java similarity index 83% rename from app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/BlankFragment.java index 5ef11451..25db484e 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/BlankFragment.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo; +package com.alibaba.android.arouter.demo.module1; import android.os.Bundle; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.alibaba.android.arouter.demo.testinject.TestObj; -import com.alibaba.android.arouter.demo.testinject.TestParcelable; -import com.alibaba.android.arouter.demo.testinject.TestSerializable; +import com.alibaba.android.arouter.demo.service.model.TestObj; +import com.alibaba.android.arouter.demo.service.model.TestParcelable; +import com.alibaba.android.arouter.demo.service.model.TestSerializable; import com.alibaba.android.arouter.facade.annotation.Autowired; import com.alibaba.android.arouter.facade.annotation.Route; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/MainLooper.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/MainLooper.java similarity index 91% rename from app/src/main/java/com/alibaba/android/arouter/demo/MainLooper.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/MainLooper.java index fe6eefc4..22835180 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/MainLooper.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/MainLooper.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo; +package com.alibaba.android.arouter.demo.module1; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/TestWebview.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestWebview.java similarity index 91% rename from app/src/main/java/com/alibaba/android/arouter/demo/TestWebview.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestWebview.java index b9f50a3b..467f4bfe 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/TestWebview.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestWebview.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo; +package com.alibaba.android.arouter.demo.module1; import android.app.Activity; import android.os.Bundle; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/BaseActivity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/BaseActivity.java similarity index 81% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/BaseActivity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/BaseActivity.java index e8e6e224..04fab78a 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/BaseActivity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.support.v7.app.AppCompatActivity; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test1Activity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test1Activity.java similarity index 84% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test1Activity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test1Activity.java index af00f4e2..87df1d79 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test1Activity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test1Activity.java @@ -1,14 +1,13 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.TextView; -import com.alibaba.android.arouter.demo.R; -import com.alibaba.android.arouter.demo.testinject.TestObj; -import com.alibaba.android.arouter.demo.testinject.TestParcelable; -import com.alibaba.android.arouter.demo.testinject.TestSerializable; -import com.alibaba.android.arouter.demo.testservice.HelloService; +import com.alibaba.android.arouter.demo.module1.R; +import com.alibaba.android.arouter.demo.service.HelloService; +import com.alibaba.android.arouter.demo.service.model.TestObj; +import com.alibaba.android.arouter.demo.service.model.TestParcelable; +import com.alibaba.android.arouter.demo.service.model.TestSerializable; import com.alibaba.android.arouter.facade.annotation.Autowired; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test2Activity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test2Activity.java similarity index 87% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test2Activity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test2Activity.java index c8c9c3b9..acf12d45 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test2Activity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test2Activity.java @@ -1,11 +1,11 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.widget.Toast; -import com.alibaba.android.arouter.demo.R; +import com.alibaba.android.arouter.demo.module1.R; import com.alibaba.android.arouter.facade.annotation.Autowired; import com.alibaba.android.arouter.facade.annotation.Route; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test3Activity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test3Activity.java similarity index 90% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test3Activity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test3Activity.java index 521e7b9f..96ede898 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test3Activity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test3Activity.java @@ -1,10 +1,10 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.widget.TextView; -import com.alibaba.android.arouter.demo.R; +import com.alibaba.android.arouter.demo.module1.R; import com.alibaba.android.arouter.facade.annotation.Autowired; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test4Activity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test4Activity.java similarity index 86% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test4Activity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test4Activity.java index 87d5c052..7911f466 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/Test4Activity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/Test4Activity.java @@ -1,11 +1,11 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.widget.TextView; -import com.alibaba.android.arouter.demo.R; +import com.alibaba.android.arouter.demo.module1.R; import com.alibaba.android.arouter.facade.annotation.Route; @Route(path = "/test/activity4") diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/TestDynamicActivity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/TestDynamicActivity.java similarity index 83% rename from app/src/main/java/com/alibaba/android/arouter/demo/testactivity/TestDynamicActivity.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/TestDynamicActivity.java index 81e4350c..6223fed9 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testactivity/TestDynamicActivity.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testactivity/TestDynamicActivity.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testactivity; +package com.alibaba.android.arouter.demo.module1.testactivity; import android.os.Bundle; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testinterceptor/Test1Interceptor.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testinterceptor/Test1Interceptor.java similarity index 92% rename from app/src/main/java/com/alibaba/android/arouter/demo/testinterceptor/Test1Interceptor.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testinterceptor/Test1Interceptor.java index 1c514aeb..e3deaf0b 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testinterceptor/Test1Interceptor.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testinterceptor/Test1Interceptor.java @@ -1,13 +1,11 @@ -package com.alibaba.android.arouter.demo.testinterceptor; +package com.alibaba.android.arouter.demo.module1.testinterceptor; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.util.Log; -import com.alibaba.android.arouter.demo.MainActivity; -import com.alibaba.android.arouter.demo.MainLooper; -import com.alibaba.android.arouter.demo.testservice.HelloService; +import com.alibaba.android.arouter.demo.module1.MainLooper; import com.alibaba.android.arouter.facade.Postcard; import com.alibaba.android.arouter.facade.annotation.Interceptor; import com.alibaba.android.arouter.facade.callback.InterceptorCallback; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloServiceImpl.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/HelloServiceImpl.java similarity index 87% rename from app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloServiceImpl.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/HelloServiceImpl.java index 74ff0e7b..14de9728 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/HelloServiceImpl.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/HelloServiceImpl.java @@ -1,9 +1,10 @@ -package com.alibaba.android.arouter.demo.testservice; +package com.alibaba.android.arouter.demo.module1.testservice; import android.content.Context; import android.util.Log; import android.widget.Toast; +import com.alibaba.android.arouter.demo.service.HelloService; import com.alibaba.android.arouter.facade.annotation.Route; /** diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/JsonServiceImpl.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/JsonServiceImpl.java similarity index 93% rename from app/src/main/java/com/alibaba/android/arouter/demo/testservice/JsonServiceImpl.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/JsonServiceImpl.java index bfe0f75c..cbb5d52c 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/JsonServiceImpl.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/JsonServiceImpl.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testservice; +package com.alibaba.android.arouter.demo.module1.testservice; import android.content.Context; diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/SingleService.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/SingleService.java similarity index 91% rename from app/src/main/java/com/alibaba/android/arouter/demo/testservice/SingleService.java rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/SingleService.java index 69c88a7e..9093aec3 100644 --- a/app/src/main/java/com/alibaba/android/arouter/demo/testservice/SingleService.java +++ b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/testservice/SingleService.java @@ -1,4 +1,4 @@ -package com.alibaba.android.arouter.demo.testservice; +package com.alibaba.android.arouter.demo.module1.testservice; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/res/layout/activity_test1.xml b/module-java/src/main/res/layout/activity_test1.xml similarity index 92% rename from app/src/main/res/layout/activity_test1.xml rename to module-java/src/main/res/layout/activity_test1.xml index 105cb7c3..9163f5f9 100644 --- a/app/src/main/res/layout/activity_test1.xml +++ b/module-java/src/main/res/layout/activity_test1.xml @@ -9,7 +9,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.alibaba.android.arouter.demo.testactivity.Test1Activity"> + tools:context=".module1.testactivity.Test1Activity"> + tools:context=".module1.testactivity.Test2Activity"> + tools:context=".module1.testactivity.Test4Activity"> diff --git a/module-java/src/main/res/layout/activity_test_module.xml b/module-java/src/main/res/layout/activity_test_module.xml index ffd65786..7fe13766 100644 --- a/module-java/src/main/res/layout/activity_test_module.xml +++ b/module-java/src/main/res/layout/activity_test_module.xml @@ -8,7 +8,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.alibaba.android.arouter.demo.module1.TestModuleActivity"> + tools:context="com.alibaba.android.arouter.demo.service.com.alibaba.android.arouter.demo.module1.TestModuleActivity"> + tools:context="com.alibaba.android.arouter.demo.service.com.alibaba.android.arouter.demo.module1.TestModuleActivity">