feat(android):优化插件配置

RealOnlyone · RealOnlyone · commit 621ab1db0c81 · 2023-03-28T16:31:10.000+08:00
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -107,18 +107,22 @@ android {
 
 //dokit 扩展
 
-//dokitExt {
-//    //通用设置
-//    comm {
-//        //地图经纬度开关
-//        gpsSwitch true
-//        //网络开关
-//        networkSwitch true
-//        //大图开关
-//        bigImgSwitch true
-//        //webView js 抓包
-//        webViewSwitch true
-//    }
+
+dokit {
+    gpsEnable true
+    bigImageEnable true
+    webView {
+        network true
+        dokitWeb true
+        vConsole true
+    }
+    gps {
+        didi true
+        baidu true
+    }
+}
+
+//dokit {
 //
 //    slowMethod {
 //        //调用栈模式配置
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt
@@ -68,7 +68,8 @@ import org.gradle.api.Project
 class DoKitPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         //创建指定扩展 并将project 传入构造函数
-        val doKitExt = project.extensions.create("dokit", DoKitExtension::class.java)
+        val doKit = project.extensions.create("dokit", DoKitExtension::class.java)
+        "dokit plugin apply ${doKit}".println()
 
         project.gradle.addListener(DoKitTransformTaskExecutionListener(project))
 
@@ -134,6 +135,7 @@ class DoKitPlugin : Plugin<Project> {
                         //task依赖关系图建立完毕
                         project.gradle.taskGraph.whenReady {
                             "===taskGraph.whenReady===".println()
+                            "dokit config :: ${doKit}".println()
                         }
 
                     }
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/BigImageExtension.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/BigImageExtension.kt
@@ -12,14 +12,36 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class BigImageExtension(
+open class BigImageExtension(
     var glide: Boolean = true,
     var picasso: Boolean = true,
     var fresco: Boolean = true,
     var imageLoader: Boolean = true,
     var coil: Boolean = true
 ) {
 
+
+    fun glide(boolean: Boolean) {
+        glide = boolean
+    }
+
+    fun picasso(boolean: Boolean) {
+        picasso = boolean
+    }
+
+    fun fresco(boolean: Boolean) {
+        fresco = boolean
+    }
+
+    fun imageLoader(boolean: Boolean) {
+        imageLoader = boolean
+    }
+
+    fun coil(boolean: Boolean) {
+        coil = boolean
+    }
+
+
     override fun toString(): String {
         return "BigImageExtension(glide=$glide, picasso=$picasso, Fresco=$fresco, imageLoader=$imageLoader, coil=$coil)"
     }
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExtension.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExtension.kt
@@ -57,6 +57,10 @@ open class DoKitExtension(
     fun bigImage(action: Action<BigImageExtension>) {
         action.execute(bigImage)
     }
+    
+    fun webView(action: Action<WebViewExtension>) {
+        action.execute(webView)
+    }
 
     /**
      * 让slowMethod 支持 DSL 语法
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/GpsExtension.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/GpsExtension.kt
@@ -13,7 +13,7 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @see DoKitExtension
  */
 
-class GpsExtension(
+open class GpsExtension(
     var local: Boolean = true,
     var baidu: Boolean = true,
     var tencent: Boolean = true,
@@ -22,6 +22,26 @@ class GpsExtension(
 ) {
 
 
+    fun local(boolean: Boolean) {
+        local = boolean
+    }
+
+    fun baidu(boolean: Boolean) {
+        baidu = boolean
+    }
+
+    fun tencent(boolean: Boolean) {
+        tencent = boolean
+    }
+
+    fun amap(boolean: Boolean) {
+        amap = boolean
+    }
+
+    fun didi(boolean: Boolean) {
+        didi = boolean
+    }
+
     override fun toString(): String {
         return "GpsExtension(local=$local, baidu=$baidu, tencent=$tencent, didi=$didi)"
     }
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/NetworkExtension.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/NetworkExtension.kt
@@ -12,14 +12,35 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class NetworkExtension(
+open class NetworkExtension(
     var okHttp: Boolean = true,
     var urlConnect: Boolean = true,
     var didiHttp: Boolean = true,
     var didiSocket: Boolean = true,
     var didiDjSocket: Boolean = true
 ) {
 
+
+    fun okHttp(boolean: Boolean) {
+        okHttp = boolean
+    }
+
+    fun urlConnect(boolean: Boolean) {
+        urlConnect = boolean
+    }
+
+    fun didiHttp(boolean: Boolean) {
+        didiHttp = boolean
+    }
+
+    fun didiSocket(boolean: Boolean) {
+        didiSocket = boolean
+    }
+
+    fun didiDjSocket(boolean: Boolean) {
+        didiDjSocket = boolean
+    }
+
     override fun toString(): String {
         return "NetworkExtension(okHttp=$okHttp, urlConnect=$urlConnect, didiHttp=$didiHttp, didiSocket=$didiSocket, didiDjSocket=$didiDjSocket)"
     }
diff --git a/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/WebViewExtension.kt b/Android/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/WebViewExtension.kt
@@ -12,13 +12,27 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class WebViewExtension(
+open class WebViewExtension(
     var network: Boolean = true,
     var dokitWeb: Boolean = false,
     var vConsole: Boolean = false
 ) {
 
+    fun network(boolean: Boolean) {
+        network = boolean
+    }
+
+    fun dokitWeb(boolean: Boolean) {
+        dokitWeb = boolean
+    }
+
+    fun vConsole(boolean: Boolean) {
+        vConsole = boolean
+    }
+
     override fun toString(): String {
-        return "WebViewExtension(network=$network)"
+        return "WebViewExtension(network=$network, dokitWeb=$dokitWeb, vConsole=$vConsole)"
     }
+
+
 }
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt
@@ -68,7 +68,8 @@ import org.gradle.api.Project
 class DoKitPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         //创建指定扩展 并将project 传入构造函数
-        val doKitExt = project.extensions.create("dokit", DoKitExtension::class.java)
+        val doKit = project.extensions.create("dokit", DoKitExtension::class.java)
+        "dokit plugin apply ${doKit}".println()
 
         project.gradle.addListener(DoKitTransformTaskExecutionListener(project))
 
@@ -134,6 +135,7 @@ class DoKitPlugin : Plugin<Project> {
                         //task依赖关系图建立完毕
                         project.gradle.taskGraph.whenReady {
                             "===taskGraph.whenReady===".println()
+                            "dokit config :: ${doKit}".println()
                         }
 
                     }
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/BigImageExtension.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/BigImageExtension.kt
@@ -12,14 +12,36 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class BigImageExtension(
+open class BigImageExtension(
     var glide: Boolean = true,
     var picasso: Boolean = true,
     var fresco: Boolean = true,
     var imageLoader: Boolean = true,
     var coil: Boolean = true
 ) {
 
+
+    fun glide(boolean: Boolean) {
+        glide = boolean
+    }
+
+    fun picasso(boolean: Boolean) {
+        picasso = boolean
+    }
+
+    fun fresco(boolean: Boolean) {
+        fresco = boolean
+    }
+
+    fun imageLoader(boolean: Boolean) {
+        imageLoader = boolean
+    }
+
+    fun coil(boolean: Boolean) {
+        coil = boolean
+    }
+
+
     override fun toString(): String {
         return "BigImageExtension(glide=$glide, picasso=$picasso, Fresco=$fresco, imageLoader=$imageLoader, coil=$coil)"
     }
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExtension.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExtension.kt
@@ -57,6 +57,10 @@ open class DoKitExtension(
     fun bigImage(action: Action<BigImageExtension>) {
         action.execute(bigImage)
     }
+    
+    fun webView(action: Action<WebViewExtension>) {
+        action.execute(webView)
+    }
 
     /**
      * 让slowMethod 支持 DSL 语法
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/GpsExtension.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/GpsExtension.kt
@@ -13,7 +13,7 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @see DoKitExtension
  */
 
-class GpsExtension(
+open class GpsExtension(
     var local: Boolean = true,
     var baidu: Boolean = true,
     var tencent: Boolean = true,
@@ -22,6 +22,26 @@ class GpsExtension(
 ) {
 
 
+    fun local(boolean: Boolean) {
+        local = boolean
+    }
+
+    fun baidu(boolean: Boolean) {
+        baidu = boolean
+    }
+
+    fun tencent(boolean: Boolean) {
+        tencent = boolean
+    }
+
+    fun amap(boolean: Boolean) {
+        amap = boolean
+    }
+
+    fun didi(boolean: Boolean) {
+        didi = boolean
+    }
+
     override fun toString(): String {
         return "GpsExtension(local=$local, baidu=$baidu, tencent=$tencent, didi=$didi)"
     }
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/NetworkExtension.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/NetworkExtension.kt
@@ -12,14 +12,35 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class NetworkExtension(
+open class NetworkExtension(
     var okHttp: Boolean = true,
     var urlConnect: Boolean = true,
     var didiHttp: Boolean = true,
     var didiSocket: Boolean = true,
     var didiDjSocket: Boolean = true
 ) {
 
+
+    fun okHttp(boolean: Boolean) {
+        okHttp = boolean
+    }
+
+    fun urlConnect(boolean: Boolean) {
+        urlConnect = boolean
+    }
+
+    fun didiHttp(boolean: Boolean) {
+        didiHttp = boolean
+    }
+
+    fun didiSocket(boolean: Boolean) {
+        didiSocket = boolean
+    }
+
+    fun didiDjSocket(boolean: Boolean) {
+        didiDjSocket = boolean
+    }
+
     override fun toString(): String {
         return "NetworkExtension(okHttp=$okHttp, urlConnect=$urlConnect, didiHttp=$didiHttp, didiSocket=$didiSocket, didiDjSocket=$didiDjSocket)"
     }
diff --git a/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/WebViewExtension.kt b/Android/dokit-plugin/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/WebViewExtension.kt
@@ -12,13 +12,27 @@ package com.didichuxing.doraemonkit.plugin.extension
  * @Description 用一句话说明文件功能
  */
 
-class WebViewExtension(
+open class WebViewExtension(
     var network: Boolean = true,
     var dokitWeb: Boolean = false,
     var vConsole: Boolean = false
 ) {
 
+    fun network(boolean: Boolean) {
+        network = boolean
+    }
+
+    fun dokitWeb(boolean: Boolean) {
+        dokitWeb = boolean
+    }
+
+    fun vConsole(boolean: Boolean) {
+        vConsole = boolean
+    }
+
     override fun toString(): String {
-        return "WebViewExtension(network=$network)"
+        return "WebViewExtension(network=$network, dokitWeb=$dokitWeb, vConsole=$vConsole)"
     }
+
+
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ import org.gradle.api.Project`
`68`	`68`	`class DoKitPlugin : Plugin<Project> {`
`69`	`69`	`override fun apply(project: Project) {`
`70`	`70`	`//创建指定扩展并将project 传入构造函数`
`71`		`- val doKitExt = project.extensions.create("dokit", DoKitExtension::class.java)`
	`71`	`+ val doKit = project.extensions.create("dokit", DoKitExtension::class.java)`
	`72`	`+ "dokit plugin apply ${doKit}".println()`
`72`	`73`
`73`	`74`	`project.gradle.addListener(DoKitTransformTaskExecutionListener(project))`
`74`	`75`
`@@ -134,6 +135,7 @@ class DoKitPlugin : Plugin<Project> {`
`134`	`135`	`//task依赖关系图建立完毕`
`135`	`136`	`project.gradle.taskGraph.whenReady {`
`136`	`137`	`"===taskGraph.whenReady===".println()`
	`138`	`+ "dokit config :: ${doKit}".println()`
`137`	`139`	`}`
`138`	`140`
`139`	`141`	`}`