moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]网易云信适配安卓10.0

Browse Source
This commit is contained in:
wushaocheng
2022-12-09 16:19:23 +08:00
parent 5ac0b66c9b
commit d81ee7ef16
6 changed files with 115 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt
View File

@@ -1,10 +1,15 @@
package com.netease.nim.uikit.business.session.actions
import android.content.Intent
import android.text.TextUtils
import com.netease.nim.uikit.R
import com.netease.nim.uikit.business.session.helper.SendImageHelper
import com.yizhuan.xchat_android_library.common.application.BaseApp
import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment
import com.yizhuan.xchat_android_library.common.photo.PhotoProviderNew
import com.yizhuan.xchat_android_library.common.util.PhotoCompressUtil
import com.yizhuan.xchat_android_library.common.util.PhotosCompressCallback
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.SingleToastUtil
import java.io.File
@@ -45,29 +50,28 @@ abstract class PickImageActionNew protected constructor(
if (paths.isEmpty()) {
SingleToastUtil.showToastShort(R.string.picker_image_error)
} else {
sendImageAfterSelfImagePicker(paths)
// PhotoCompressUtil.compress(
// BaseApp.getContext(),
// paths,
// PhotoCompressUtil.getCompressCachePath(),
// object : PhotosCompressCallback {
// override fun onSuccess(compressedImgList: ArrayList<String>) {
PhotoCompressUtil.compress(
BaseApp.getContext(),
paths,
PhotoCompressUtil.getCompressCachePath(),
object : PhotosCompressCallback {
override fun onSuccess(compressedImgList: ArrayList<String>) {
// sendImageAfterSelfImagePicker(compressedImgList)
//// for (path in compressedImgList) {
//// val file = File(path)
//// if (TextUtils.isEmpty(path) || !file.exists()) {
//// SingleToastUtil.showToastShort(path + ResUtil.getString(R.string.xchat_android_core_file_filemodel_01))
//// return
//// }
//// onPicked(file)
//// }
// }
//
// override fun onFail(e: Throwable) {
// SingleToastUtil.showToastShort(R.string.picker_image_error)
// }
//
// })
for (path in compressedImgList) {
val file = File(path)
if (TextUtils.isEmpty(path) || !file.exists()) {
SingleToastUtil.showToastShort(path + ResUtil.getString(R.string.xchat_android_core_file_filemodel_01))
return
}
onPicked(file)
}
}
override fun onFail(e: Throwable) {
SingleToastUtil.showToastShort(R.string.picker_image_error)
}
})
}
}
}

8
nim_uikit/src/com/netease/nim/uikit/common/util/storage/ExternalStorage.java
View File

@@ -8,6 +8,8 @@ import android.os.StatFs;
import android.text.TextUtils;
import android.util.Log;
import com.yizhuan.xchat_android_library.common.file.FileHelper;
import java.io.File;
import java.io.IOException;
@@ -65,7 +67,8 @@ public class ExternalStorage {
}
private void loadStorageState(Context context) {
String externalPath = Environment.getExternalStorageDirectory().getPath();
// String externalPath = Environment.getExternalStorageDirectory().getPath();
String externalPath = FileHelper.getRootCacheDir().getPath();
this.sdkStorageRoot = externalPath + "/" + context.getPackageName() + "/";
}
@@ -173,7 +176,8 @@ public class ExternalStorage {
}
public boolean isSdkStorageReady() {
String externalRoot = Environment.getExternalStorageDirectory().getAbsolutePath();
// String externalRoot = Environment.getExternalStorageDirectory().getAbsolutePath();
String externalRoot = FileHelper.getRootCacheDir().getPath();
if (this.sdkStorageRoot.startsWith(externalRoot)) {
return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
} else {