modify:

[Android]-release v3.5.0
didi · Sep 10, 2021 · 3a6b130 · 3a6b130
1 parent 21811d8
commit 3a6b130
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 21 deletions.
diff --git a/Android/README.md b/Android/README.md
@@ -3,8 +3,8 @@
 ## DoKit Android 最新版本
 **由于jcenter事件的影响，我们需要将DoKit For Android迁移到mavenCentral()，但是需要更改groupId.所以大家要注意一下，具体的更新信息如下：**
 
-**lastversion:3.5.0-beta01；kotlin编译插件为1.4.32 ；支持Gradle 6.8及以上**
-**lastversion:3.5.0.1-beta01； kotlin编译插件为1.3.72； 支持Gradle 6.8及以下**
+**lastversion:3.5.0；kotlin编译插件为1.4.32 ；支持Gradle 6.8及以上**
+**lastversion:3.5.0.1； kotlin编译插件为1.3.72； 支持Gradle 6.8及以下**
 
 |DoKit|最新版本|描述|
 |-|-|-|
@@ -370,6 +370,13 @@ public class DoKit private constructor() {
             param: Map<String, String>? = null
         ) {
         }
+        /**
+         * 获取一机多控类型
+         */
+        @JvmStatic
+        fun mcMode(): WSMode {
+            return WSMode.UNKNOW
+        }
     }
 
 

diff --git a/Android/build.gradle b/Android/build.gradle
@@ -14,11 +14,11 @@ buildscript {
         maven {
             url "https://oss.sonatype.org/content/groups/public"
         }
-        maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
-        maven {
-            //本地插件地址
-            url uri('/Users/didi/project/dokit_repo')
-        }
+//        maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
+//        maven {
+//            //本地插件地址
+//            url uri('/Users/didi/project/dokit_repo')
+//        }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$gradlePluginVersion"
@@ -44,11 +44,11 @@ allprojects {
         maven {
             url "https://oss.sonatype.org/content/groups/public"
         }
-        maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
-        maven {
-            //本地插件地址
-            url uri('/Users/didi/project/dokit_repo')
-        }
+//        maven { url 'https://artifactory.intra.xiaojukeji.com/artifactory/public' }
+//        maven {
+//            //本地插件地址
+//            url uri('/Users/didi/project/dokit_repo')
+//        }
     }
 }
 

diff --git a/Android/config.gradle b/Android/config.gradle
@@ -8,7 +8,7 @@ ext {
             //1:依赖dokit远程aar运行
             run_type     : 0,
             group_id     : 'io.github.didi.dokit',
-            version      : '3.4.3.109'
+            version      : '3.5.0'
     ]
 
     android = [compileSdkVersion         : 29,
@@ -21,12 +21,12 @@ ext {
                versionCode               : 1,
                versionName               : "1.0.0",
                glide_version             : "4.9.0",
-               kotlin_version            : "1.3.72",
+//               kotlin_version            : "1.3.72",
 //           kotlin_version               : "1.4.20",
-//               kotlin_version               : "1.4.32",
-               kotlinx_coroutines_version: "1.3.7",
+               kotlin_version               : "1.4.32",
+//               kotlinx_coroutines_version: "1.3.7",
 //               kotlinx_coroutines_version   : "1.4.2",
-//               kotlinx_coroutines_version   : "1.4.3",
+               kotlinx_coroutines_version   : "1.4.3",
                booster_version           : "4.0.0",
                agp_module_verson         : "7.0.0",
                agp_plugin_verson         : "4.2.2",

diff --git a/Android/settings.gradle b/Android/settings.gradle
@@ -9,5 +9,5 @@ include ':dokit-okhttp-api'
 include ':dokit-weex'
 include ':dokit-no-op'
 include ':dokit-plugin'
-include ':dokit-rpc'
-include ':dokit-rpc-mc'
+//include ':dokit-rpc'
+//include ':dokit-rpc-mc'
diff --git a/Doc/android-ReleaseNotes.md b/Doc/android-ReleaseNotes.md
@@ -1,5 +1,21 @@
 DoraemonKit-Android releases
 ===
+
+## 3.5.0.1
+
+1、bug fixed
+
+2、DoKit For Android Kotlin 编译插件版本为1.3.72，支持Gradle 6.8及以下版本
+
+3、相关功能对应3.5.0
+
+## 3.5.0
+
+1、bug fixed
+
+2、DoKit For Android Kotlin 编译插件版本为1.4.32，支持Gradle 6.8及以上版本
+
+
 ## 3.5.0.1-beta01
 
 1、Support AGP 7.0

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 <div align="center">    
  <img src="https://pt-starimg.didistatic.com/static/starimg/img/J0WO7tUi9U1616143930629.png" width = "250"  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.5.0_beta01-blue.svg" align=left />
+ <img src="https://img.shields.io/badge/Android-3.5.0-blue.svg" align=left />
  <img src="https://img.shields.io/badge/iOS-3.0.7-yellow.svg" align=left />
  <img src="https://img.shields.io/badge/Flutter-0.6.0-blue.svg" align=left />
  <img src="https://img.shields.io/badge/miniapp-0.0.1-red.svg" align=left />

diff --git a/README_EN.md b/README_EN.md
@@ -1,7 +1,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.5.0-beta01-blue.svg" align=left />
+ <img src="https://img.shields.io/badge/Android-3.5.0.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>