Skip to content

D
DoraemonKit

DiDi / DoraemonKit
大约 1 年 前同步成功

通知 166
Star 19623
Fork 3062
D
DoraemonKit

体验新版 GitCode，发现更多精彩内容 >>

提交 a02853a6 编写于 作者: J jackjintai
浏览文件
操作

modify： 

[android]-add android dokitx v3.3.1
上级 7c1fa16f
隐藏空白更改
内联 并排
Showing with 32 addition and 35 deletion
Android/java/build.gradle
浏览文件 @ a02853a6
......@@ -14,7 +14,7 @@ buildscript {
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.2.0"
classpath "com.didichuxing.doraemonkit:dokitx-plugin:3.3.0"
classpath "com.didichuxing.doraemonkit:dokitx-plugin:3.3.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.ext.android["kotlin_version"]}"
}
}
......
Android/java/config.gradle
浏览文件 @ a02853a6
......@@ -19,13 +19,13 @@ ext {
minSdkVersion : 16,
targetSdkVersion : 29,
//app版本号
versionCode : 330,
versionCode : 331,
//dokit 插件版本号
pluginVersionName : "3.3.0",
pluginVersionName : "3.3.1",
//jcenter dokit版本号 打包上传时 dokit的版本名字
jcenterArchivesVersionName: "3.3.0",
jcenterArchivesVersionName: "3.3.1",
//didi内部仓库版本号
versionName : "3.3.0",
versionName : "3.3.1",
glide_version : "4.9.0",
kotlin_version : "1.3.72",
booster_version : "2.3.0",
......
Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/h5_help/DokitX5WebViewClient.kt
浏览文件 @ a02853a6
......@@ -127,7 +127,6 @@ class DokitX5WebViewClient(webViewClient: WebViewClient?, userAgent: String) : W
return null
}
// web 数据mock
return dealMock(requestBean, url, view, request)
}
......@@ -187,7 +186,7 @@ class DokitX5WebViewClient(webViewClient: WebViewClient?, userAgent: String) : W
try {
//构建okhttp用来抓包
val newRequest: Request =
JsHttpUtil.createOkHttpRequest(requestBean,mUserAgent)
JsHttpUtil.createOkHttpRequest(requestBean, mUserAgent)
if (JsHttpUtil.matchWhiteHost(newRequest)) {
//发送模拟请求
......@@ -201,7 +200,7 @@ class DokitX5WebViewClient(webViewClient: WebViewClient?, userAgent: String) : W
}
val newRequest: Request =
JsHttpUtil.createOkHttpRequest(requestBean,mUserAgent)
JsHttpUtil.createOkHttpRequest(requestBean, mUserAgent)
//发送模拟请求
val newResponse =
OkhttpClientUtil.okhttpClient.newCall(newRequest).execute()
......
Android/java/empey-app/build.gradle
浏览文件 @ a02853a6
......@@ -28,6 +28,4 @@ dependencies {
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation "com.didichuxing.doraemonkit:dokitx-okhttp-v3:${rootProject.ext.android["jcenterArchivesVersionName"]}"
implementation "com.didichuxing.doraemonkit:dokitx-okhttp-v4:${rootProject.ext.android["jcenterArchivesVersionName"]}"
}
\ No newline at end of file
Doc/android-ReleaseNotes.md
浏览文件 @ a02853a6
DoraemonKit-Android releases
===
## 3.3.0（dokit）
1、由于更新了库名称，等待jcenter审核中。
## 3.3.1（dokit 对应android support）
1、由于更新了库名称，等待jcenter审核中，请耐心等待。
## 3.3.0（dokitx）
1、为了更好的支持android官方androidx和support，dokit从3.3.0版本开始正式对sdk名字进行更新。具体如下：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.0; support===>com.didichuxing.doraemonkit:dokit:3.3.0;
## 3.3.1（dokitx 对应androidx）
1、为了更好的支持android官方androidx和support，dokit从3.3.1版本开始正式对sdk名字进行更新。具体如下：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.1; support===>com.didichuxing.doraemonkit:dokit:3.3.1;
2、新增H5助手功能:针对webview中的js请求进行数据Mock和抓包
3、新增三方库信息:将项目中依赖的三方库进行统一收集展现。
4、大量github issues 问题修复。
......
Doc/android_cn_guide.md
浏览文件 @ a02853a6
## 接入方式
**Tip:**
**1、为了更好的支持android官方androidx和support，dokit从3.3.0版本开始正式对sdk名字进行更新。具体如下：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.0; support===>com.didichuxing.doraemonkit:dokit:3.3.0;**
**1、为了更好的支持android官方androidx和support，dokit从3.3.1版本开始正式对sdk名字进行更新。具体如下：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.1; support===>com.didichuxing.doraemonkit:dokit:3.3.1;**
**下面所有的日志均用dokitx举例。要使用support版本请将dokitx改为dokit即可。**
|DoKit|最新版本|描述|
|-|-|-|
|支持Androidx|3.3.0|从v3.3.0版本开始更名为dokitx|
|支持Androidx|3.3.1|从v3.3.1版本开始更名为dokitx|
|支持android support|3.0.8.0|3.0.8.0版本对应3.2.0的功能，后期support将会不定期更新，主要还是看社区的反馈，请大家尽快升级和适配Androidx|
......@@ -17,8 +17,8 @@
```groovy
dependencies {
…
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.0'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.1'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.1'
…
}
```
......@@ -27,20 +27,20 @@ dependencies {
滴滴内部业务线接入请将
```
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.1'
```
替换为
```
debugImplementation 'com.didichuxing.doraemonkit:dokitx-rpc:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx-rpc:3.3.1'
```
**注意:**
假如你无法通过 jcenter 下载到依赖库并报了以下的错误
```
ERROR: Failed to resolve: com.didichuxing.doraemonkit:dokitx:3.3.0
ERROR: Failed to resolve: com.didichuxing.doraemonkit:dokitx:3.3.1
```
建议你可以尝试挂载VPN或通过命令行重试(以Mac系统为例 项目根目录下)
......@@ -69,7 +69,7 @@ DoraemonKit目前已支持Weex工具，包括
```groovy
dependencies {
…
debugImplementation 'com.didichuxing.doraemonkit:dokitx-weex:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx-weex:3.3.1'
…
}
```
......@@ -116,7 +116,7 @@ AOP包括以下几个功能:
buildscript {
dependencies {
…
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.0'
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.1'
…
}
}
......
Doc/android_en_guide.md
浏览文件 @ a02853a6
# Android Guide
**Tip:**
**1、In order to better support the official androidx and support of android, dokit has officially updated the sdk name from version 3.3.0. details as follows：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.0; support===>com.didichuxing.doraemonkit:dokit:3.3.0;**
**1、In order to better support the official androidx and support of android, dokit has officially updated the sdk name from version 3.3.1. details as follows：androidx===>com.didichuxing.doraemonkit:dokitx:3.3.1; support===>com.didichuxing.doraemonkit:dokit:3.3.1;**
**All the logs below use dokitx as an example. To use the support version, please change dokitx to dokit.**
|DoKit|new Version|Desc|
|- |- |- |
|support Androidx|3.3.0|support Androidx from v3.1.0|
|support Androidx|3.3.1|support Androidx from v3.1.0|
|supprot android support|3.0.8.0|Version 3.0.8.0 corresponds to the function of 3.2.0. Later support will be updated from time to time, mainly based on community feedback, please upgrade and adapt to Androidx as soon as possible|
......@@ -14,8 +14,8 @@
```groovy
dependencies {
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.0'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.1'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.1'
}
```
......@@ -25,7 +25,7 @@ dependencies {
If you cannot download the dependent library through jcenter and report the following error
```
ERROR: Failed to resolve: com.didichuxing.doraemonkit:dokitx:3.3.0
ERROR: Failed to resolve: com.didichuxing.doraemonkit:dokitx:3.3.1
```
You can try again from the command line (take Mac system as an example under the project root directory)
......@@ -51,7 +51,7 @@ If you need to support Weex, you can directly add the following dependencies
```groovy
dependencies {
…
debugImplementation 'com.didichuxing.doraemonkit:dokitx-weex:3.3.0'
debugImplementation 'com.didichuxing.doraemonkit:dokitx-weex:3.3.1'
…
}
```
......@@ -93,7 +93,7 @@ Plugin includes the following functions:
```groovy
buildscript {
dependencies {
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.0'
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.1'
}
}
```
......
README.md
浏览文件 @ a02853a6
......@@ -26,7 +26,7 @@
<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.3.0-blue.svg" align=left />
<img src="https://img.shields.io/badge/Android-3.3.1-blue.svg" align=left />
<img src="https://img.shields.io/badge/iOS-3.0.4-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 />
......
README_EN.md
浏览文件 @ a02853a6
<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.3.0-blue.svg" align=left />
<img src="https://img.shields.io/badge/Android-3.3.1-blue.svg" align=left />
<img src="https://img.shields.io/badge/iOS-3.0.4-yellow.svg" align=left />
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" align=left />
</div>
......@@ -122,7 +122,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.0'
classpath 'com.didichuxing.doraemonkit:dokitx-plugin:3.3.1'
}
}
......@@ -135,8 +135,8 @@ apply plugin: 'com.didi.dokit'
and then implementation DoKit SDK
```
debugImplementation "com.didichuxing.doraemonkit:dokitx:3.3.0"
releaseImplementation "com.didichuxing.doraemonkit:dokitx-no-op:3.3.0"
debugImplementation "com.didichuxing.doraemonkit:dokitx:3.3.1"
releaseImplementation "com.didichuxing.doraemonkit:dokitx-no-op:3.3.1"
```
#### 2、SDK Init
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或