android:add dokit android sdk v3.1.3

Android/app/build.gradle

@@ -71,7 +71,7 @@ dokitExt {
     thresholdTime = 200
     packageNames = ["com.didichuxing.doraemondemo"]
     //慢函数 黑名单 可以是包名 也可以是全路径的类名
-    //methodBlacklist = ["com.didichuxing.doraemondemo.dokit"]
+    methodBlacklist = ["com.didichuxing.doraemondemo.dokit"]
 }
 
 dependencies {

Android/app/doraemonkit.gradle

@@ -5,10 +5,9 @@ if (rootProject.ext.config["applyPlugin"]) {
     dependencies {
         //外部平台依赖
         debugImplementation project(":doraemonkit")
-//        debugImplementation project(":doraemonkit-leakcanary")
-        debugImplementation project(":doraemonkit-weex")
+        //debugImplementation project(":doraemonkit-weex")
         releaseImplementation project(":doraemonkit-no-op")
-        releaseImplementation project(":doraemonkit-weex-no-op")
+        //releaseImplementation project(":doraemonkit-weex-no-op")
         //新版线上包
 //        debugImplementation "com.didichuxing.doraemonkit:doraemonkit:${rootProject.ext.android["jcenterArchivesVersionName"]}"
 //        debugImplementation "com.didichuxing.doraemonkit:doraemonkit-leakcanary:${rootProject.ext.android["jcenterArchivesVersionName"]}"

Android/build.gradle

@@ -6,9 +6,10 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.novoda:bintray-release:0.9.2'
         classpath "com.didichuxing.doraemonkit:doraemonkit-plugin:${rootProject.ext.android["pluginVersionName"]}"
+//        classpath "com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.ext.android["kotlin_version"]}"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Android/config.gradle

@@ -15,14 +15,14 @@ ext {
                minSdkVersion             : 16,
                targetSdkVersion          : 29,
                //app版本号
-               versionCode               : 312,
+               versionCode               : 313,
                //dokit 插件版本号
-               pluginVersionName         : "3.1.2",
+               pluginVersionName         : "3.1.3",
                //jcenter dokit版本号 打包上传时 dokit的版本名字
-               jcenterArchivesVersionName: "3.1.2",
+               jcenterArchivesVersionName: "3.1.3",
                //didi内部仓库版本号
                didiArchivesVersionName   : "1000.0.22",
-               versionName               : "3.1.2",
+               versionName               : "3.1.3",
                glide_version             : "4.9.0",
                kotlin_version            : "1.3.61"
     ]

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/aop/urlconnection/HttpUrlConnectionProxyUtil.java

@@ -4,9 +4,11 @@ import com.didichuxing.doraemonkit.kit.network.okhttp.interceptor.DoraemonInterc
 import com.didichuxing.doraemonkit.kit.network.okhttp.interceptor.DoraemonWeakNetworkInterceptor;
 import com.didichuxing.doraemonkit.kit.network.okhttp.interceptor.LargePictureInterceptor;
 import com.didichuxing.doraemonkit.kit.network.okhttp.interceptor.MockInterceptor;
+import com.didichuxing.doraemonkit.okgo.DokitOkGo;
 
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
@@ -44,12 +46,12 @@ public class HttpUrlConnectionProxyUtil {
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
         //不需要再重复添加拦截器 因为已经通过字节码主如果拦截器了
         //addInterceptor(builder);
-        OkHttpClient mClient = builder.
-                   .retryOnConnectionFailure(true)
+        OkHttpClient mClient = builder
+                .retryOnConnectionFailure(true)
                 .readTimeout(DokitOkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS)
                 .writeTimeout(DokitOkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS)
                 .connectTimeout(DokitOkGo.DEFAULT_MILLISECONDS, TimeUnit.MILLISECONDS)
-                build();
+                .build();
 
         String strUrl = urlConnection.getURL().toString();
         URL url = new URL(strUrl);

Doc/android-ReleaseNotes.md

 DoraemonKit-Android releases
 ===
+## 3.1.3
+1.DoKit项目结构调整,对外暴露的api已全部移到com.didichuxing.doraemonkit.kit.core包名下,如果你有自定义Kit，请重新引入一下包名
+2.DoKit数据Mock模块支持post模式匹配
+3.github issues fixed
+
 ## 3.1.2
 1.安卓版本DoKit从3.1.0版本开始全面拥抱Androidx,假如你的项目还没有升级到androidx你可以选择依赖3.0.3版本
 2.修复大图检测圆角失效的问题

Doc/android_cn_guide.md

@@ -4,15 +4,15 @@
 
 |DoKit|最新版本|描述|
 |-|-|-|-|
-|支持Androidx|3.1.2|从v3.1.0版本开始支持androidx
+|支持Androidx|3.1.3|从v3.1.0版本开始支持androidx
 |支持android support|3.0.3|support 支持还会维护一到两个版本，请大家尽快拥抱androidx吧
 
 
 ```groovy
 dependencies {
     …
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:3.1.2'
-    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:3.1.3'
+    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.3'
     …
 }
 ```
@@ -20,7 +20,7 @@ dependencies {
  假如你无法通过 jcenter 下载到依赖库并报了以下的错误 
 
 ```
-ERROR: Failed to resolve: com.didichuxing.doraemonkit:doraemonkit:3.1.2
+ERROR: Failed to resolve: com.didichuxing.doraemonkit:doraemonkit:3.1.3
 ```
 
 建议你可以尝试挂载VPN或通过命令行重试(以Mac系统为例 项目根目录下)
@@ -44,8 +44,8 @@ DoraemonKit目前已支持Weex工具，包括
 ```groovy
 dependencies {
     …
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex:3.1.2'
-    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex-no-op:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex:3.1.3'
+    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex-no-op:3.1.3'
     …
 }
 ```
@@ -55,7 +55,7 @@ dependencies {
 ```groovy
 dependencies {
     …
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-leakcanary:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-leakcanary:3.1.3'
     …
 }
 ```
@@ -97,7 +97,7 @@ AOP包括以下几个功能:
 buildscript {
     dependencies {
         …
-        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.2'
+        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.3'
         …
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Doc/android_en_guide.md

@@ -2,7 +2,7 @@
 
 |DoKit|new Version|Desc|
 |-    |-      |-  |
-|support Androidx|3.1.2|support Androidx from v3.1.0|
+|support Androidx|3.1.3|support Androidx from v3.1.0|
 |supprot android support|3.0.3|For support Android support, one or two versions will be maintained, please hug Androidx as soon as possible|
 
 
@@ -10,8 +10,8 @@
 
 ```groovy
 dependencies {
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:3.1.2'
-    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:3.1.3'
+    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.3'
 }
 ```
 
@@ -21,7 +21,7 @@ dependencies {
 If you cannot download the dependent library through jcenter and report the following error
 
 ```
-ERROR: Failed to resolve: com.didichuxing.doraemonkit:doraemonkit:3.1.2
+ERROR: Failed to resolve: com.didichuxing.doraemonkit:doraemonkit:3.1.3
 ```
 
 You can try again from the command line (take Mac system as an example under the project root directory)
@@ -47,8 +47,8 @@ If you need to support Weex, you can directly add the following dependencies
 ```groovy
 dependencies {
     …
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex:3.1.2'
-    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex-no-op:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex:3.1.3'
+    releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-weex-no-op:3.1.3'
     …
 }
 ```
@@ -58,7 +58,7 @@ If you need to integrate LeakCanary, you can directly add the following dependen
 ```groovy
 dependencies {
     …
-    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-leakcanary:3.1.2'
+    debugImplementation 'com.didichuxing.doraemonkit:doraemonkit-leakcanary:3.1.3'
     …
 }
 ```
@@ -90,7 +90,7 @@ Plugin includes the following functions:
 ```groovy
 buildscript {
     dependencies {
-        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.2'
+        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.3'
 
     }
 }

README.md

 <div align="center">    
  <img src="https://javer.oss-cn-shanghai.aliyuncs.com/doraemon/github/DoraemonKit_github.png" width = "150" height = "150" alt="DoraemonKit" align=left />
  <img src="https://img.shields.io/github/license/didi/DoraemonKit.svg" align=left />
- <img src="https://img.shields.io/badge/Android-3.1.2-blue.svg" align=left />
+ <img src="https://img.shields.io/badge/Android-3.1.3-blue.svg" align=left />
  <img src="https://img.shields.io/badge/iOS-3.0.0-yellow.svg" align=left />
  <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" align=left />
 </div>
@@ -112,7 +112,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.2'
+        classpath 'com.didichuxing.doraemonkit:doraemonkit-plugin:3.1.3'
     }
 }
 
@@ -125,8 +125,8 @@ apply plugin: 'com.didi.dokit'
 
 and then implementation DoKit SDK
 ```
-debugImplementation "com.didichuxing.doraemonkit:doraemonkit:3.1.2"
-releaseImplementation "com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.2"
+debugImplementation "com.didichuxing.doraemonkit:doraemonkit:3.1.3"
+releaseImplementation "com.didichuxing.doraemonkit:doraemonkit-no-op:3.1.3"
 ```
 
 #### 2、SDK Init

README_CN.md

 <div align="center">    
  <img src="https://javer.oss-cn-shanghai.aliyuncs.com/doraemon/github/DoraemonKit_github.png" width = "150" height = "150" alt="DoraemonKit" align=left />
  <img src="https://img.shields.io/github/license/didi/DoraemonKit.svg" align=left />
- <img src="https://img.shields.io/badge/Android-3.1.2-blue.svg" align=left />
+ <img src="https://img.shields.io/badge/Android-3.1.3-blue.svg" align=left />
  <img src="https://img.shields.io/badge/iOS-3.0.0-yellow.svg" align=left />
  <img src="https://img.shields.io/badge/miniapp-0.0.1-red.svg" align=left />
  <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" align=left />