kotlin

Author: wzbos

README.md

@@ -149,9 +149,9 @@ Rudolph.onNewIntent("myApp")
 
 ```java
 Rudolph.addRoute(new RouteInfo.Builder().routeType(RouteType.ACTIVITY)
-    .destination(KotlinActivity.class)
+    .target(KotlinActivity.class)
     .path("/kotlin/test")
     .tag("")
-    .putParam("userId",int.class)
-    .putParam("userName",String.class).build());
+    .extra("userId",int.class)
+    .extra("userName",String.class).build());
 ```

app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion versions.compileSdk
+    compileSdkVersion ANDROID_COMPILE_SDK
     defaultConfig {
         applicationId "cn.wzbos.android.rudolph.example"
-        minSdkVersion versions.minSdk
-        targetSdkVersion versions.targetSdk
+        minSdkVersion ANDROID_MIN_SDK
+        targetSdkVersion ANDROID_TARGET_SDK
         versionName "0.0.1"
         versionCode 1
     }
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:${versions.supportLib}"
+    implementation "com.android.support:appcompat-v7:${appcompat_v7_version}"
     implementation project(':rudolph')
     implementation project(':sampleA')
     implementation project(':sampleB')

app/src/main/java/cn/wzbos/android/rudolph/example/MyApplication.java

@@ -2,11 +2,17 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.widget.Toast;
 
+
+import org.jetbrains.annotations.NotNull;
+
+import cn.wzbos.android.rudolph.RouteType;
 import cn.wzbos.android.rudolph.Rudolph;
 import cn.wzbos.android.rudolph.Interceptor;
+import cn.wzbos.android.rudolph.router.ActivityRouter;
 import cn.wzbos.android.rudolph.router.Router;
+import cn.wzbos.samplea.AppUserRouter;
+import cn.wzbos.samplea.LoginActivityRouter;
 
 /**
  * Created by wuzongbo on 2017/4/11.
@@ -29,10 +35,22 @@ private void InitRouter() {
         Rudolph.init(this);
         Rudolph.addInterceptor(new Interceptor() {
             @Override
-            public boolean intercept(Context context, Router routeInfo) {
-                if ("/test4".equalsIgnoreCase(routeInfo.getRawUrl())) {
-                    Toast.makeText(MyApplication.this, "intercept,path:" + routeInfo.getRawUrl(), Toast.LENGTH_SHORT).show();
-                    return true;
+            public boolean intercept(Context context, @NotNull Router<?> router) {
+                if ("isNeedLogin".equals(router.getRouteTag()) && !AppUserRouter.get().isLogin()) {
+                    if (router.getRouteType() == RouteType.ACTIVITY) {
+                        ActivityRouter activityRouter = (ActivityRouter) router;
+                        LoginActivityRouter.builder()
+                                .to(activityRouter.getRawUrl())
+                                .toExtras(activityRouter.getExtras())
+                                .transition(activityRouter.getEnterAnim(), activityRouter.getExitAnim())
+                                .flags(activityRouter.getFlags())
+                                .options(activityRouter.getOptions())
+                                .build()
+                                .start(context);
+                        return true;
+
+                    }
+
                 }
                 return false;
             }

bintray.gradle

@@ -2,9 +2,10 @@ apply plugin: 'com.jfrog.bintray'
 
 version = rudolph_version
 
-if (project.hasProperty("android")) { // Android libraries
+if (project.hasProperty("android")) {
+    // Android libraries
     task sourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 
@@ -19,15 +20,16 @@ if (project.hasProperty("android")) { // Android libraries
         }
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     }
-} else { // Java libraries
+} else {
+    // Java libraries
     task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from sourceSets.main.allSource
     }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
@@ -43,7 +45,7 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
 bintray {
     user = properties.getProperty('bintray.user')
     key = properties.getProperty('bintray.apikey')
-//    userOrg = properties.getProperty("bintray.org")
+    //    userOrg = properties.getProperty("bintray.org")
 
     configurations = ['archives']
     override = true
@@ -54,7 +56,7 @@ bintray {
         desc = libraryDescription
         websiteUrl = siteUrl
         vcsUrl = gitUrl
-//        userOrg = userOrg
+        //        userOrg = userOrg
         licenses = ["Apache-2.0"]
         publish = true
         publicDownloadNumbers = true

build.gradle

@@ -2,25 +2,26 @@
 
 buildscript {
 
-    ext.versions = [
-            'compileSdk': 28,
-            'minSdk'    : 16,
-            'targetSdk' : 28,
-            'supportLib': '28.0.0',
-            'kotlin'    : '1.3.11',
-            'gson'      : '2.8.2'
-    ]
+    ext {
+        kotlin_version = '1.3.72'
+        ANDROID_COMPILE_SDK = 28
+        ANDROID_MIN_SDK = 16
+        ANDROID_TARGET_SDK = 28
+        appcompat_v7_version = '28.0.0'
+        gson_version = '2.8.2'
+    }
 
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+        mavenCentral()
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
     }
@@ -29,11 +30,23 @@ buildscript {
 allprojects {
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+        mavenCentral()
         google()
         jcenter()
     }
+
+
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            //Support @JvmDefault
+            freeCompilerArgs = ['-Xjvm-default=enable'] //enable or compatibility
+            jvmTarget = "1.8"
+        }
+    }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+

doc/activity.md

@@ -65,11 +65,11 @@ Rudolph.builder("/user?userId=11&userName=John").build().open(context,requestCod
 ## 传递扩展参数
 
 ```java
-UserActivityRouter.builder().userId(11).userName("John").extra("extra1","hello").build().start(context);
+UserActivityRouter.builder().userId(11).userName("John").putExtra("extra1","hello").build().start(context);
 ```
 
 ```java
-Rudolph.builder("/user?userId=11&userName=John").extra("extra1","hello").build().open(context);
+Rudolph.builder("/user?userId=11&userName=John").putExtra("extra1","hello").build().open(context);
 ```
 
 

gradle.properties

@@ -18,7 +18,7 @@ siteUrl=https://github.com/wzbos/Android-Rudolph-Router
 gitUrl=https://github.com/wzbos/Android-Rudolph-Router.git
 licenseName=The Apache Software License, Version 2.0
 licenseUrl=http://www.apache.org/licenses/LICENSE-2.0.txt
-rudolph_version=1.2.0
+rudolph_version=2.0.0-rc1
 developerId=wzbos
 developerName=zongbo.wu
 developerEmail=sckoo@163.com

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 11 16:52:49 CST 2020
+#Mon Jul 06 14:19:25 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

rudolph-annotations/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'java'
-
+apply plugin: 'kotlin'
 
 
 ext {
@@ -16,5 +16,10 @@ compileJava {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.72"
+}
+
 apply from: '../install.gradle'
 apply from: '../bintray.gradle'