From 4d6bdd372aab6205cae9385fa74a56b548865317 Mon Sep 17 00:00:00 2001
From: xingxing <xxx823952375@gmail.com>
Date: Sun, 12 May 2019 10:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90doraemonkit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                 |  5 +++++
 .../main/java/org/houxg/leamonax/Leamonax.java   | 16 ++++++++++++++--
 .../org/houxg/leamonax/network/ApiProvider.java  |  2 +-
 build.gradle                                     |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 67896da..47e54a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,6 +14,7 @@ repositories {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'android-aspectjx'
 
 def dbflow_version = "4.0.0-beta2"
 def ciName = isEmpty(System.getenv("TRAVIS_TAG")) ? "Staging" : System.getenv("TRAVIS_TAG")
@@ -42,6 +43,7 @@ android {
         versionName ciName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "BUGLY_KEY", String.format("\"%s\"", buglyPrdKey)
+        multiDexEnabled true
     }
 
     lintOptions {
@@ -111,4 +113,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     testImplementation "org.mockito:mockito-core:2.+"
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:1.1.6'
+    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:1.1.6'
+    implementation "com.android.support:multidex:1.0.2"
 }
diff --git a/app/src/main/java/org/houxg/leamonax/Leamonax.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java
index 1298410..a1e041b 100644
--- a/app/src/main/java/org/houxg/leamonax/Leamonax.java
+++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java
@@ -1,13 +1,15 @@
 package org.houxg.leamonax;
 
 
-import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
+import android.support.multidex.MultiDexApplication;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.didichuxing.doraemonkit.DoraemonKit;
+import com.didichuxing.doraemonkit.kit.webdoor.WebDoorManager;
 import com.elvishew.xlog.LogLevel;
 import com.elvishew.xlog.XLog;
 import com.facebook.stetho.Stetho;
@@ -25,7 +27,7 @@ import net.danlew.android.joda.JodaTimeAndroid;
 import org.greenrobot.eventbus.EventBus;
 import org.houxg.leamonax.ui.MainActivity;
 
-public class Leamonax extends Application {
+public class Leamonax extends MultiDexApplication {
 
     private static Context mContext;
 
@@ -58,6 +60,16 @@ public class Leamonax extends Application {
                 Glide.with(context).load(path).into(imageView);
             }
         });
+
+        DoraemonKit.install(this);
+
+        // H5任意门功能需要，非必须
+        DoraemonKit.setWebDoorCallback(new WebDoorManager.WebDoorCallback() {
+            @Override
+            public void overrideUrlLoading(Context context, String s) {
+                // 使用自己的H5容器打开这个链接
+            }
+        });
     }
 
     private void initBugly() {
diff --git a/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java b/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java
index 892a4ab..b41ac4a 100644
--- a/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java
+++ b/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java
@@ -48,7 +48,7 @@ public class ApiProvider {
     }
 
     public void init(String host) {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+        OkHttpClient.Builder builder = new OkHttpClient().newBuilder()
                 .addNetworkInterceptor(new Interceptor() {
                     @Override
                     public Response intercept(Chain chain) throws IOException {
diff --git a/build.gradle b/build.gradle
index 6f13e6c..354e907 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files