Skip to content

D
DoraemonKit

DiDi / DoraemonKit
10 个月 前同步成功

通知 166
Star 19623
Fork 3062
D
DoraemonKit

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

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

android:新增install方法重载

上级 0c1ef5f4
隐藏空白更改
内联 并排
Showing with 77 addition and 28 deletion
Android/java/build.gradle
浏览文件 @ 6a2ad20b
......@@ -4,10 +4,10 @@ buildscript {
repositories {
google()
jcenter()
// maven {
// //本地插件地址
// url uri(rootProject.ext.config["localRepoURL"])
// }
maven {
//本地插件地址
url uri(rootProject.ext.config["localRepoURL"])
}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
......@@ -22,10 +22,10 @@ allprojects {
repositories {
google()
jcenter()
// maven {
// //本地插件地址
// url uri(rootProject.ext.config["localRepoURL"])
// }
maven {
//本地插件地址
url uri(rootProject.ext.config["localRepoURL"])
}
}
}
......
Android/java/config.gradle
浏览文件 @ 6a2ad20b
......@@ -4,7 +4,7 @@ ext {
// 线上包不会接入DoraemonKit，测试包会自动接入
applyPlugin : true,
//上传到仓库时需要打开
uploadArchives : false,
uploadArchives : true,
//是否发布插件到远程仓库
publishPluginToRemote: false,
localRepoURL : "/Users/didi/project/dokit_repo"
......@@ -15,15 +15,13 @@ ext {
minSdkVersion : 16,
targetSdkVersion : 29,
//app版本号
versionCode : 317,
versionCode : 319,
//dokit 插件版本号
pluginVersionName : "3.1.7",
//jcenter dokit版本号 打包上传时 dokit的版本名字
jcenterArchivesVersionName: "3.1.7",
jcenterArchivesVersionName: "3.1.9",
//didi内部仓库版本号
//didiArchivesVersionName : "1000.0.22",
didiArchivesVersionName : "3.1.9",
versionName : "3.1.7",
versionName : "3.1.9",
glide_version : "4.9.0",
kotlin_version : "1.3.72",
booster_version : "2.3.0"
......
Android/java/doraemonkit-leakcanary/upload.gradle
浏览文件 @ 6a2ad20b
......@@ -7,7 +7,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
......@@ -43,7 +43,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
def node = it.asElement()
......
Android/java/doraemonkit-no-op/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.kt
浏览文件 @ 6a2ad20b
......@@ -16,10 +16,18 @@ object DoraemonKit {
fun install(app: Application, productId: String) {
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>) {
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>, productId: String) {
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>) {
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>, productId: String) {
}
......
Android/java/doraemonkit-no-op/src/main/java/com/didichuxing/doraemonkit/DoraemonKitRpc.kt
浏览文件 @ 6a2ad20b
......@@ -19,10 +19,18 @@ object DoraemonKitRpc {
fun install(app: Application, productId: String) {
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>) {
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>, productId: String) {
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>) {
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>, productId: String) {
}
......
Android/java/doraemonkit-no-op/upload.gradle
浏览文件 @ 6a2ad20b
......@@ -7,7 +7,7 @@ if(isRemote){
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
......@@ -43,7 +43,7 @@ if(isRemote){
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
def node = it.asElement()
......
Android/java/doraemonkit-rpc/src/main/java/com/didichuxing/doraemonkit/DoraemonKitRpc.kt
浏览文件 @ 6a2ad20b
......@@ -23,11 +23,21 @@ object DoraemonKitRpc {
install(app, linkedMapOf(), mutableListOf(), productId)
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>) {
install(app, mapKits, mutableListOf(), "")
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>, productId: String) {
install(app, mapKits, mutableListOf(), productId)
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>) {
install(app, linkedMapOf(), listKits, "")
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>, productId: String) {
install(app, linkedMapOf(), listKits, productId)
......
Android/java/doraemonkit-rpc/upload.gradle
浏览文件 @ 6a2ad20b
......@@ -7,7 +7,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
......@@ -43,7 +43,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
def node = it.asElement()
......
Android/java/doraemonkit-weex/upload.gradle
浏览文件 @ 6a2ad20b
......@@ -7,7 +7,7 @@ if(isRemote){
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
......@@ -43,7 +43,7 @@ if(isRemote){
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
def node = it.asElement()
......
Android/java/doraemonkit/build.gradle
浏览文件 @ 6a2ad20b
......@@ -79,7 +79,9 @@ dependencies {
//ktor
implementation rootProject.ext.dependencies["ktor-core"]
implementation rootProject.ext.dependencies["ktor-cio"]
implementation rootProject.ext.dependencies["ktor-jackson"]
//会合滴滴内部的spi-plugin冲突
// implementation rootProject.ext.dependencies["ktor-serialization"]
// implementation rootProject.ext.dependencies["ktor-gson"]
kapt rootProject.ext.dependencies["room_compile"]
......
Android/java/doraemonkit/src/main/AndroidManifest.xml
浏览文件 @ 6a2ad20b
......@@ -32,7 +32,7 @@
android:networkSecurityConfig="@xml/dokit_network_config"
-->
<!-- android:requestLegacyExternalStorage="true" 解决sd卡没有权限的问题-->
<application android:requestLegacyExternalStorage="true">
<application>
<activity
android:name=".kit.core.UniversalActivity"
android:screenOrientation="portrait"
......
Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.kt
浏览文件 @ 6a2ad20b
......@@ -24,11 +24,22 @@ object DoraemonKit {
install(app, linkedMapOf(), mutableListOf(), productId)
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>) {
install(app, mapKits, mutableListOf(), "")
}
@JvmStatic
fun install(app: Application, mapKits: LinkedHashMap<String, MutableList<AbstractKit>>, productId: String) {
install(app, mapKits, mutableListOf(), productId)
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>) {
install(app, linkedMapOf(), listKits, "")
}
@JvmStatic
fun install(app: Application, listKits: MutableList<AbstractKit>, productId: String) {
install(app, linkedMapOf(), listKits, productId)
......
Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/FileManagerUtil.kt
浏览文件 @ 6a2ad20b
......@@ -20,7 +20,7 @@ object FileManagerUtil {
private val internalAppRootPath by lazy { PathUtils.getInternalAppDataPath() }
private val internalAppRootReplacePath by lazy { FileUtils.getFileName(PathUtils.getInternalAppDataPath()) }
private val externalStorageRootPath by lazy { PathUtils.getExternalStoragePath() }
public val externalStorageRootPath by lazy { PathUtils.getExternalStoragePath() }
private val externalStorageRootReplacePath by lazy { "external" }
......
Android/java/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/filemanager/action/file/FileListAction.kt
浏览文件 @ 6a2ad20b
......@@ -3,7 +3,9 @@ package com.didichuxing.doraemonkit.kit.filemanager.action.file
import com.blankj.utilcode.util.ConvertUtils
import com.blankj.utilcode.util.FileUtils
import com.blankj.utilcode.util.PathUtils
import com.didichuxing.doraemonkit.R as DoKitR
import com.didichuxing.doraemonkit.kit.filemanager.FileManagerUtil
import com.didichuxing.doraemonkit.util.DokitUtil
import java.io.File
/**
......@@ -31,7 +33,12 @@ object FileListAction {
//not root path
val data = mutableMapOf<String, Any>().apply {
this["dirPath"] = FileManagerUtil.relativeRootPath(dirPath)
this["fileList"] = traverseDir(dirPath)
val fileInfos = traverseDir(dirPath)
if (dirPath == FileManagerUtil.externalStorageRootPath && fileInfos.isEmpty()) {
this["code"] = 0
this["message"] = DokitUtil.getString(DoKitR.string.dk_file_manager_sd_permission_tip)
}
this["fileList"] = fileInfos
}
params["data"] = data
}
......
Android/java/doraemonkit/src/main/res/values-en-rUS/strings.xml
浏览文件 @ 6a2ad20b
......@@ -349,4 +349,5 @@
</string>
<string name="dk_file_manager_tip_bottom">Please connect through the current ip:port on the web</string>
<string name="dk_file_manager_sd_permission_tip">Your current targetSdkVersion>=29, please add android:requestLegacyExternalStorage="true" under the application of AndroidManifest.xml to solve the problem that the SD card does not have permission</string>
</resources>
Android/java/doraemonkit/src/main/res/values-zh-rCN/strings.xml
浏览文件 @ 6a2ad20b
......@@ -346,4 +346,5 @@
</string>
<string name="dk_file_manager_tip_bottom">请在web端通过当前ip:port进行连接</string>
<string name="dk_file_manager_sd_permission_tip">你当前的targetSdkVersion>=29,请在AndroidManifest.xml的application下添加android:requestLegacyExternalStorage="true" 解决sd卡没有权限的问题</string>
</resources>
Android/java/doraemonkit/src/main/res/values-zh-rTW/strings.xml
浏览文件 @ 6a2ad20b
......@@ -346,4 +346,5 @@
</string>
<string name="dk_file_manager_tip_bottom">请在web端通过当前ip:port进行连接</string>
<string name="dk_file_manager_sd_permission_tip">你当前的targetSdkVersion>=29,请在AndroidManifest.xml的application下添加android:requestLegacyExternalStorage="true" 解决sd卡没有权限的问题</string>
</resources>
\ No newline at end of file
Android/java/doraemonkit/src/main/res/values/strings.xml
浏览文件 @ 6a2ad20b
......@@ -387,4 +387,6 @@
</string>
<string name="dk_file_manager_tip_bottom">请在web端通过当前ip:port进行连接</string>
<string name="dk_file_manager_sd_permission_tip">你当前的targetSdkVersion>=29,请在AndroidManifest.xml的application下添加android:requestLegacyExternalStorage="true" 解决sd卡没有权限的问题</string>
</resources>
Android/java/doraemonkit/upload.gradle
浏览文件 @ 6a2ad20b
......@@ -7,7 +7,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
......@@ -43,7 +43,7 @@ if (isRemote) {
pom.project {
groupId project.GROUP_ID
artifactId project.ARTIFACT_ID
version rootProject.ext.android["didiArchivesVersionName"]
version rootProject.ext.android["jcenterArchivesVersionName"]
}
pom.withXml {
def node = it.asElement()
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或