From 588b60be435c60da422c7e67f15bec9ffe97cd51 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期三, 25 三月 2026 17:47:40 +0800
Subject: [PATCH] 替换亚马逊云为华为云
---
app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt | 49 ++++++++++++++++++++-----------------------------
1 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt b/app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt
index 4593e60..1c5455e 100644
--- a/app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt
+++ b/app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt
@@ -20,20 +20,17 @@
import android.widget.TextView
import androidx.loader.content.CursorLoader
import cn.sinata.xldutils.utils.sysErr
-import com.amazonaws.auth.BasicAWSCredentials
-import com.amazonaws.services.s3.AmazonS3Client
-import com.amazonaws.services.s3.model.CannedAccessControlList
-import com.amazonaws.services.s3.model.PutObjectRequest
import com.example.emanagercar.ui.base.Local.BaseLoginActivity
+import com.jxonlinecar.driver.R
+import com.jxonlinecar.driver.base.Const
+import com.jxonlinecar.driver.ui.DialogUtil
+import com.jxonlinecar.driver.utils.BitmapUtil
+import com.jxonlinecar.driver.utils.UploadManager
import com.tbruyelle.rxpermissions2.RxPermissions
import com.ypx.imagepicker.ImagePicker
import com.ypx.imagepicker.bean.MimeType
import com.ypx.imagepicker.bean.SelectMode
import com.ypx.imagepicker.builder.MultiPickerBuilder
-import com.jxonlinecar.driver.R
-import com.jxonlinecar.driver.base.Const
-import com.jxonlinecar.driver.ui.DialogUtil
-import com.jxonlinecar.driver.utils.BitmapUtil
import kotlinx.android.synthetic.main.dialog_phone.view.*
import org.jetbrains.anko.toast
import java.io.*
@@ -44,6 +41,7 @@
var phoneDialog: Dialog? = null
+ var uploadManager: UploadManager = UploadManager();
@SuppressLint("CheckResult")
fun showSelectPhone() {
@@ -60,6 +58,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
checkPermissions(*Const.PERMISSIONS_LIST_CARMER)
+ uploadManager.initHW()
}
override fun onPermissionsGranted(requestCode: Int, perms: MutableList<String>) {
@@ -98,9 +97,9 @@
phoneDialog = DialogUtil.getDialog(mContext, R.layout.dialog_phone)
phoneDialog?.let {
val view = DialogUtil.getView(phoneDialog!!)
- if (!title.isEmpty()){
+ if (!title.isEmpty()) {
view.btn_title.text = title
- }else{
+ } else {
view.btn_title.text = "选择照片"
}
view.button_cancel.setOnClickListener {
@@ -175,7 +174,7 @@
ImagePicker.takePhoto(this, name, isCopyInDCIM) {
showNum = 1
var pathItem = getRealPathFromUri(mContext, it[0].uri)
- var uri = it[0].uri
+ var uri = it[0].uri
pathItem?.let {
savePhone(pathItem, 2, uri)
}
@@ -215,29 +214,17 @@
// }
// }
}
-
- val ossClient = AmazonS3Client(
- BasicAWSCredentials(
- Const.accessKeyId,
- Const.accessKeySecret
- )
- )
- ossClient.setEndpoint(Const.end_point)
- val objectKey = UUID.randomUUID().toString()
- val req =
- PutObjectRequest(Const.bucketName, objectKey, File(copyFile)).withCannedAcl(
- CannedAccessControlList.PublicReadWrite
- )
- ossClient.putObject(req)
- val resourceUrl = ossClient.getResourceUrl(Const.bucketName, objectKey)
+ val resourceUrl = uploadManager.uploadHWSync(File(copyFile));
showNum--
Handler(mainLooper).post {
Log.d("showNum==", "showNum==========" + showNum.toString())
sysErr(resourceUrl)
if (showNum <= 0)
dismissDialog()
- getPhoneUrl(resourceUrl!!, type, copyFile)
- getPhoneUrl(resourceUrl, type)
+ resourceUrl?.also {
+ getPhoneUrl(it, type, copyFile)
+ getPhoneUrl(it, type)
+ }
}
// val ossUtil = OSSUtil(this)
@@ -336,7 +323,6 @@
}
return null
}
-
/**
@@ -548,6 +534,7 @@
return result
}
}
+
open fun compressImage(image: Bitmap): Bitmap? {
val baos = ByteArrayOutputStream()
image.compress(
@@ -632,4 +619,8 @@
}
}
+ override fun onDestroy() {
+ super.onDestroy()
+ uploadManager.release()
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1