add kotlin demo

mrzhang · mrzhang · commit f45027b5c3fe · 2018-01-03T13:12:51.000+08:00
diff --git a/UIRouterTable/ShareRouterTable.txt b/UIRouterTable/ShareRouterTable.txt
@@ -2,11 +2,6 @@ auto generated, do not change !!!!
 
 HOST : share
 
-分享杂志页面
-/shareMagazine
-author:com.luojilab.componentservice.share.bean.Author
-bookName:String
-
 分享书籍页面
 /shareBook
 author:com.luojilab.componentservice.share.bean.Author
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.dd.comgradle'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.luojilab.androidcomponent"
         minSdkVersion 15
@@ -11,10 +11,6 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        dataBinding {
-            enabled = true
-        }
-
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [host: "app"]
diff --git a/basicres/build.gradle b/basicres/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 14
         versionCode 1
         versionName "1.0"
 
diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,31 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.1.3-2'
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.luojilab.ddcomponent:build-gradle:1.0.0'
         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"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
diff --git a/componentservice/build.gradle b/componentservice/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 15
diff --git a/readercomponent/build.gradle b/readercomponent/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.dd.comgradle'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 14
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,5 @@
 include ':app',
+        ':sharecomponentkotlin',
         ':componentlib',
         ':readercomponent',
         ':sharecomponent',
diff --git a/sharecomponent/build.gradle b/sharecomponent/build.gradle
@@ -1,18 +1,16 @@
 apply plugin: 'com.dd.comgradle'
 
+
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 14
         versionCode 1
         versionName "1.0"
 
-        dataBinding {
-            enabled = true
-        }
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -41,9 +39,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 
 combuild {
     applicationName = 'com.luojilab.share.runalone.application.ShareApplication'
     isRegisterCompoAuto = true
 }
+repositories {
+    mavenCentral()
+}
diff --git a/sharecomponent/src/main/AndroidManifest.xml b/sharecomponent/src/main/AndroidManifest.xml
@@ -6,17 +6,13 @@
     <application
         android:allowBackup="true"
         android:label="@string/share_app_name"
-        tools:replace="android:label"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:replace="android:label">
 
         <activity android:name="com.luojilab.share.ShareActivity">
 
         </activity>
 
-        <activity android:name="com.luojilab.share.Share2Activity">
-
-        </activity>
-
 
     </application>
 
diff --git a/sharecomponent/src/main/java/com/luojilab/share/Share2Activity.java b/sharecomponent/src/main/java/com/luojilab/share/Share2Activity.java
diff --git a/sharecomponent/src/main/java/com/luojilab/share/ShareActivity.java b/sharecomponent/src/main/java/com/luojilab/share/ShareActivity.java
@@ -1,16 +1,15 @@
 package com.luojilab.share;
 
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.widget.TextView;
 
 import com.luojilab.component.componentlib.service.AutowiredService;
 import com.luojilab.componentservice.share.bean.Author;
 import com.luojilab.router.facade.annotation.Autowired;
 import com.luojilab.router.facade.annotation.RouteNode;
-import com.luojilab.share.databinding.ShareActivityShareBinding;
 
 /**
  * Created by mrzhang on 2017/6/20.
@@ -24,28 +23,33 @@ public class ShareActivity extends AppCompatActivity {
     @Autowired
     Author author;
 
-    private AutowiredService autowiredService = AutowiredService.Factory.getInstance().create();
-
-    ShareActivityShareBinding binding;
+    private TextView tvShareTitle;
+    private TextView tvShareBook;
+    private TextView tvAuthor;
+    private TextView tvCounty;
 
     private final static int RESULT_CODE = 8888;
 
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = DataBindingUtil.setContentView(this, R.layout.share_activity_share);
-        autowiredService.autowire(this);
+        AutowiredService.Factory.getInstance().create().autowire(this);
+        setContentView(R.layout.share_activity_share);
+
+        tvShareTitle =  findViewById(R.id.share_title);
+        tvShareBook =  findViewById(R.id.share_tv_tag);
+        tvAuthor =  findViewById(R.id.share_tv_author);
+        tvCounty =  findViewById(R.id.share_tv_county);
 
-        binding.shareTitle.setText("Book");
+        tvShareTitle.setText("Book");
 
         if (bookName != null) {
-            binding.shareTvTag.setText(bookName);
+            tvShareBook.setText(bookName);
         }
 
         if (author != null) {
-            binding.shareTvAuthor.setText(author.getName());
-            binding.shareTvCounty.setText(author.getCounty());
+            tvAuthor.setText(author.getName());
+            tvCounty.setText(author.getCounty());
         }
 
         Intent intent = new Intent();
diff --git a/sharecomponent/src/main/res/layout/share_activity_share.xml b/sharecomponent/src/main/res/layout/share_activity_share.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
-
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -43,4 +41,3 @@
             android:textSize="16sp" />
 
     </RelativeLayout>
-</layout>
diff --git a/sharecomponent/src/main/runalone/AndroidManifest.xml b/sharecomponent/src/main/runalone/AndroidManifest.xml
@@ -18,9 +18,5 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.luojilab.share.Share2Activity">
-
-        </activity>
-
     </application>
 </manifest>
diff --git a/sharecomponentkotlin/.gitignore b/sharecomponentkotlin/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/sharecomponentkotlin/build.gradle b/sharecomponentkotlin/build.gradle
@@ -0,0 +1,42 @@
+apply plugin: 'com.dd.comgradle'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+
+kapt {
+    arguments {
+        arg(host: "kotlin")
+    }
+}
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 14
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    resourcePrefix "kotlin_"
+
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':componentservice')
+    kapt 'com.luojilab.ddcomponent:router-anno-compiler:1.0.0'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+}
diff --git a/sharecomponentkotlin/gradle.properties b/sharecomponentkotlin/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+isRunAlone=true
diff --git a/sharecomponentkotlin/proguard-rules.pro b/sharecomponentkotlin/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/sharecomponentkotlin/src/androidTest/java/com/luojilab/share/kotlin/ExampleInstrumentedTest.java b/sharecomponentkotlin/src/androidTest/java/com/luojilab/share/kotlin/ExampleInstrumentedTest.java
diff --git a/sharecomponentkotlin/src/main/AndroidManifest.xml b/sharecomponentkotlin/src/main/AndroidManifest.xml
diff --git a/sharecomponentkotlin/src/main/java/com/luojilab/share/kotlin/ShareMessageActivity.kt b/sharecomponentkotlin/src/main/java/com/luojilab/share/kotlin/ShareMessageActivity.kt
diff --git a/sharecomponentkotlin/src/main/res/layout/kotlin_activity_share.xml b/sharecomponentkotlin/src/main/res/layout/kotlin_activity_share.xml
diff --git a/sharecomponentkotlin/src/main/res/values/strings.xml b/sharecomponentkotlin/src/main/res/values/strings.xml
diff --git a/sharecomponentkotlin/src/main/runalone/AndroidManifest.xml b/sharecomponentkotlin/src/main/runalone/AndroidManifest.xml
diff --git a/sharecomponentkotlin/src/test/java/com/luojilab/share/kotlin/ExampleUnitTest.java b/sharecomponentkotlin/src/test/java/com/luojilab/share/kotlin/ExampleUnitTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`include ':app',`
	`2`	`+ ':sharecomponentkotlin',`
`2`	`3`	`':componentlib',`
`3`	`4`	`':readercomponent',`
`4`	`5`	`':sharecomponent',`