From aa5797500d421869f79b4fc51d051bb0f7c63246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E7=BA=AC?= <zhilong.lzl@alibaba-inc.com>
Date: Wed, 12 Jul 2017 10:46:42 +0800
Subject: [PATCH] update kotlin demo.

---
 README.md                                     |  3 +-
 README_CN.md                                  |  3 +-
 app/build.gradle                              |  3 +-
 .../android/arouter/demo/MainActivity.java    |  7 ++++
 app/src/main/res/layout/activity_main.xml     |  7 ++++
 build.gradle                                  |  2 +
 {test-module-1 => module-java}/build.gradle   |  0
 .../src/main/AndroidManifest.xml              |  0
 .../demo/module1/TestInterceptor90.java       |  0
 .../demo/module1/TestModule2Activity.java     |  0
 .../demo/module1/TestModuleActivity.java      |  0
 .../main/res/layout/activity_test_module.xml  |  0
 .../main/res/layout/activity_test_module2.xml |  0
 .../src/main/res/values/dimens.xml            |  0
 .../src/main/res/values/strings.xml           |  0
 module-kotlin/build.gradle                    | 42 +++++++++++++++++++
 module-kotlin/src/main/AndroidManifest.xml    | 15 +++++++
 .../arouter/demo/kotlin/KotlinTestActivity.kt | 26 ++++++++++++
 .../demo/kotlin/TestNormalActivity.java       | 16 +++++++
 .../main/res/layout/activity_kotlin_test.xml  | 14 +++++++
 .../main/res/layout/activity_test_normal.xml  | 10 +++++
 module-kotlin/src/main/res/values/dimens.xml  |  5 +++
 module-kotlin/src/main/res/values/strings.xml |  1 +
 settings.gradle                               |  3 +-
 .../src/main/res/values-w820dp/dimens.xml     |  6 ---
 25 files changed, 153 insertions(+), 10 deletions(-)
 rename {test-module-1 => module-java}/build.gradle (100%)
 rename {test-module-1 => module-java}/src/main/AndroidManifest.xml (100%)
 rename {test-module-1 => module-java}/src/main/java/com/alibaba/android/arouter/demo/module1/TestInterceptor90.java (100%)
 rename {test-module-1 => module-java}/src/main/java/com/alibaba/android/arouter/demo/module1/TestModule2Activity.java (100%)
 rename {test-module-1 => module-java}/src/main/java/com/alibaba/android/arouter/demo/module1/TestModuleActivity.java (100%)
 rename {test-module-1 => module-java}/src/main/res/layout/activity_test_module.xml (100%)
 rename {test-module-1 => module-java}/src/main/res/layout/activity_test_module2.xml (100%)
 rename {test-module-1 => module-java}/src/main/res/values/dimens.xml (100%)
 rename {test-module-1 => module-java}/src/main/res/values/strings.xml (100%)
 create mode 100644 module-kotlin/build.gradle
 create mode 100644 module-kotlin/src/main/AndroidManifest.xml
 create mode 100644 module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/KotlinTestActivity.kt
 create mode 100644 module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/TestNormalActivity.java
 create mode 100644 module-kotlin/src/main/res/layout/activity_kotlin_test.xml
 create mode 100644 module-kotlin/src/main/res/layout/activity_test_normal.xml
 create mode 100644 module-kotlin/src/main/res/values/dimens.xml
 create mode 100644 module-kotlin/src/main/res/values/strings.xml
 delete mode 100644 test-module-1/src/main/res/values-w820dp/dimens.xml

diff --git a/README.md b/README.md
index 39667cc0..6e767ef7 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@
 9. 页面、拦截器、服务等组件均自动注册到框架
 10. 支持多种方式配置转场动画
 11. 支持获取Fragment
-12. 完全支持Kotlin(配置见文末 其他#5)
+12. 完全支持Kotlin以及混编(配置见文末 其他#5)
 
 #### 二、典型应用
 1. 从外部URL映射到内部页面，以及参数传递与解析
@@ -454,6 +454,7 @@ dependencies {
 
 5. Kotlin项目中的配置方式
 ```
+// 可以参考 module-kotlin 模块中的写法
 apply plugin: 'kotlin-kapt'
 
 kapt {
diff --git a/README_CN.md b/README_CN.md
index 39667cc0..6e767ef7 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -30,7 +30,7 @@
 9. 页面、拦截器、服务等组件均自动注册到框架
 10. 支持多种方式配置转场动画
 11. 支持获取Fragment
-12. 完全支持Kotlin(配置见文末 其他#5)
+12. 完全支持Kotlin以及混编(配置见文末 其他#5)
 
 #### 二、典型应用
 1. 从外部URL映射到内部页面，以及参数传递与解析
@@ -454,6 +454,7 @@ dependencies {
 
 5. Kotlin项目中的配置方式
 ```
+// 可以参考 module-kotlin 模块中的写法
 apply plugin: 'kotlin-kapt'
 
 kapt {
diff --git a/app/build.gradle b/app/build.gradle
index 1c732769..9d5bb155 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,8 @@ dependencies {
 
     annotationProcessor project(':arouter-compiler')
     compile project(':arouter-api')
-    compile project(':test-module-1')
+    compile project(':module-java')
+    compile project(':module-kotlin')
     compile project(':arouter-annotation')
 
     compile 'com.alibaba:fastjson:1.2.9'
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 f27fe359..217b791e 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
@@ -64,6 +64,13 @@ public void onClick(View v) {
                         .build("/test/activity2")
                         .navigation();
                 break;
+            case R.id.kotlinNavigation:
+                ARouter.getInstance()
+                        .build("/test/kotlin")
+                        .withString("name", "老王")
+                        .withInt("age", 23)
+                        .navigation();
+                break;
             case R.id.normalNavigationWithParams:
                 // ARouter.getInstance()
                 //         .build("/test/activity2")
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2300ba3e..d3a9f805 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -81,6 +81,13 @@
                 android:onClick="onClick"
                 android:text="简单的应用内跳转" />
 
+            <Button
+                android:id="@+id/kotlinNavigation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="onClick"
+                android:text="跳转到Kotlin页面" />
+
             <Button
                 android:id="@+id/normalNavigation2"
                 android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index d6bfc1f5..4a4d5675 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    ext.kotlin_version = '1.1.3-2'
     repositories {
         jcenter()
     }
@@ -8,6 +9,7 @@ buildscript {
         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'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
diff --git a/test-module-1/build.gradle b/module-java/build.gradle
similarity index 100%
rename from test-module-1/build.gradle
rename to module-java/build.gradle
diff --git a/test-module-1/src/main/AndroidManifest.xml b/module-java/src/main/AndroidManifest.xml
similarity index 100%
rename from test-module-1/src/main/AndroidManifest.xml
rename to module-java/src/main/AndroidManifest.xml
diff --git a/test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestInterceptor90.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestInterceptor90.java
similarity index 100%
rename from test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestInterceptor90.java
rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestInterceptor90.java
diff --git a/test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestModule2Activity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestModule2Activity.java
similarity index 100%
rename from test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestModule2Activity.java
rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestModule2Activity.java
diff --git a/test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestModuleActivity.java b/module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestModuleActivity.java
similarity index 100%
rename from test-module-1/src/main/java/com/alibaba/android/arouter/demo/module1/TestModuleActivity.java
rename to module-java/src/main/java/com/alibaba/android/arouter/demo/module1/TestModuleActivity.java
diff --git a/test-module-1/src/main/res/layout/activity_test_module.xml b/module-java/src/main/res/layout/activity_test_module.xml
similarity index 100%
rename from test-module-1/src/main/res/layout/activity_test_module.xml
rename to module-java/src/main/res/layout/activity_test_module.xml
diff --git a/test-module-1/src/main/res/layout/activity_test_module2.xml b/module-java/src/main/res/layout/activity_test_module2.xml
similarity index 100%
rename from test-module-1/src/main/res/layout/activity_test_module2.xml
rename to module-java/src/main/res/layout/activity_test_module2.xml
diff --git a/test-module-1/src/main/res/values/dimens.xml b/module-java/src/main/res/values/dimens.xml
similarity index 100%
rename from test-module-1/src/main/res/values/dimens.xml
rename to module-java/src/main/res/values/dimens.xml
diff --git a/test-module-1/src/main/res/values/strings.xml b/module-java/src/main/res/values/strings.xml
similarity index 100%
rename from test-module-1/src/main/res/values/strings.xml
rename to module-java/src/main/res/values/strings.xml
diff --git a/module-kotlin/build.gradle b/module-kotlin/build.gradle
new file mode 100644
index 00000000..20819f4a
--- /dev/null
+++ b/module-kotlin/build.gradle
@@ -0,0 +1,42 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+
+kapt {
+    arguments {
+        arg("moduleName", project.getName())
+    }
+}
+
+dependencies {
+    compile project(':arouter-api')
+    compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    kapt 'com.alibaba:arouter-compiler:1.0.3'
+}
+android {
+    compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION)
+    buildToolsVersion BUILDTOOLS_VERSION
+
+    defaultConfig {
+        minSdkVersion Integer.parseInt(MIN_SDK_VERSION)
+        targetSdkVersion Integer.parseInt(TARGET_SDK_VERSION)
+    }
+
+    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-kotlin/src/main/AndroidManifest.xml b/module-kotlin/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..422d3664
--- /dev/null
+++ b/module-kotlin/src/main/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.alibaba.android.arouter.demo.kotlin">
+
+    <!-- 读写存储的权限 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <application>
+        <activity android:name=".KotlinTestActivity"/>
+        <activity android:name=".TestNormalActivity">
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/KotlinTestActivity.kt b/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/KotlinTestActivity.kt
new file mode 100644
index 00000000..374226fc
--- /dev/null
+++ b/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/KotlinTestActivity.kt
@@ -0,0 +1,26 @@
+package com.alibaba.android.arouter.demo.kotlin
+
+import android.app.Activity
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Autowired
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.alibaba.android.arouter.launcher.ARouter
+import kotlinx.android.synthetic.main.activity_kotlin_test.*
+
+@Route(path = "/test/kotlin")
+class KotlinTestActivity : Activity() {
+
+    @Autowired
+    @JvmField var name: String? = null
+    @Autowired
+    @JvmField var age: Int? = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        ARouter.getInstance().inject(this)  // Start auto inject.
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_kotlin_test)
+
+        content.text = "name = $name, age = $age"
+    }
+}
diff --git a/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/TestNormalActivity.java b/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/TestNormalActivity.java
new file mode 100644
index 00000000..d371abd5
--- /dev/null
+++ b/module-kotlin/src/main/java/com/alibaba/android/arouter/demo/kotlin/TestNormalActivity.java
@@ -0,0 +1,16 @@
+package com.alibaba.android.arouter.demo.kotlin;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+
+@Route(path = "/test/normal/activity")
+public class TestNormalActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test_normal);
+    }
+}
diff --git a/module-kotlin/src/main/res/layout/activity_kotlin_test.xml b/module-kotlin/src/main/res/layout/activity_kotlin_test.xml
new file mode 100644
index 00000000..23125775
--- /dev/null
+++ b/module-kotlin/src/main/res/layout/activity_kotlin_test.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".KotlinTestActivity">
+
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="Im kotlin activity."/>
+</LinearLayout>
diff --git a/module-kotlin/src/main/res/layout/activity_test_normal.xml b/module-kotlin/src/main/res/layout/activity_test_normal.xml
new file mode 100644
index 00000000..bed2cfe0
--- /dev/null
+++ b/module-kotlin/src/main/res/layout/activity_test_normal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.alibaba.android.arouter.demo.kotlin.TestNormalActivity">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/module-kotlin/src/main/res/values/dimens.xml b/module-kotlin/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..47c82246
--- /dev/null
+++ b/module-kotlin/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/module-kotlin/src/main/res/values/strings.xml b/module-kotlin/src/main/res/values/strings.xml
new file mode 100644
index 00000000..7abc06d3
--- /dev/null
+++ b/module-kotlin/src/main/res/values/strings.xml
@@ -0,0 +1 @@
+<resources></resources>
diff --git a/settings.gradle b/settings.gradle
index a7802481..22f175b2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,5 @@ include ':app'
 include ':arouter-api'
 include ':arouter-compiler'
 include ':arouter-annotation'
-include ':test-module-1'
\ No newline at end of file
+include ':module-java'
+include ':module-kotlin'
\ No newline at end of file
diff --git a/test-module-1/src/main/res/values-w820dp/dimens.xml b/test-module-1/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc8164..00000000
--- a/test-module-1/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>