| app/src/main/java/com/jxonlinecar/driver/base/Const.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/netUtls/Api.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| app/src/main/java/com/jxonlinecar/driver/utils/UploadManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
app/src/main/java/com/jxonlinecar/driver/base/Const.java
@@ -15,10 +15,10 @@ // public static String endpoint = "oss-cn-shenzhen.aliyuncs.com"; public static String oss_domain = "https://zion.obs-helf.cucloud.cn/"; public static String accessKeyId = "IWZDAITHHVYR4W3BBPFM"; public static String accessKeySecret = "YnGQmmTds5asKMqPkO2GqGDtwT7LP9bS40lYRkMv"; public static String bucketName="jixichuxing"; public static String end_point = "obs.cn-east-3.myhuaweicloud.com"; public static String accessKeyId = "HPUAU60WPTG0TMGK0SW2"; public static String accessKeySecret = "PVmiIOsuvBgpWaXNWiYVOiGfhI3kptz10pvNcBcF"; public static String bucketName="jxcz001"; public static String end_point = "https://obs.cn-east-3.myhuaweicloud.com"; //语音单提示音 public static String voiceOrder = "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/e9f21e157c1446b3ab2cfcb37cd1e554.mp3"; app/src/main/java/com/jxonlinecar/driver/base/local/BasePhotoActivity.kt
@@ -13,7 +13,9 @@ import android.graphics.Matrix import android.media.ExifInterface import android.net.Uri import android.os.* import android.os.Build import android.os.Bundle import android.os.Environment import android.provider.DocumentsContract import android.provider.MediaStore import android.util.Log @@ -34,14 +36,13 @@ import kotlinx.android.synthetic.main.dialog_phone.view.* import org.jetbrains.anko.toast import java.io.* import java.util.* abstract class BasePhotoActivity : BaseLoginActivity() { var phoneDialog: Dialog? = null var uploadManager: UploadManager = UploadManager(); var uploadManager: UploadManager = UploadManager(); @SuppressLint("CheckResult") fun showSelectPhone() { @@ -91,7 +92,11 @@ return } val rxPermissions = RxPermissions(this) rxPermissions.request(Manifest.permission.CAMERA) rxPermissions.request( Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE ) .subscribe { aBoolean -> if (aBoolean) { phoneDialog = DialogUtil.getDialog(mContext, R.layout.dialog_phone) @@ -186,10 +191,10 @@ */ open fun savePhone(filePath: String, type: Int, uri: Uri) { showDialog() var copyFile = "" Thread( Runnable { var copyFile = "" if (filePath.endsWith("png") || filePath.endsWith("jpg")) { getCameraPhotoOrientation(filePath) try { @@ -198,11 +203,11 @@ e.printStackTrace() } if (copyFile.isNullOrEmpty()) { Handler(Looper.getMainLooper()).post { runOnUiThread { showNum-- dismissDialog() toast("文件已损坏,无法上传") } showNum-- return@Runnable } // val bitmap = getBitmapFormUri(this,uri) @@ -214,9 +219,10 @@ // } // } } val resourceUrl = uploadManager.uploadHWSync(File(copyFile)); showNum-- Handler(mainLooper).post { val file = File(copyFile.ifEmpty { filePath }); val resourceUrl = uploadManager.uploadHWSync(file); runOnUiThread { showNum-- Log.d("showNum==", "showNum==========" + showNum.toString()) sysErr(resourceUrl) if (showNum <= 0) app/src/main/java/com/jxonlinecar/driver/netUtls/Api.java
@@ -9,7 +9,7 @@ public class Api { // http://120.220.4.60:8190/user/base/taxi/udeskTaxiOrder http://120.220.4.60:8190/user/base/taxi/udeskTaxiOrder // public static final String BASE_URL = "http://192.168.110.111:7777/driver-server/"; public static final String BASE_URL = "https://www.ljcx168.com/driver-server/"; public static final String BASE_URL = "https://www.ljcx168.com/api/driver-server/"; // public static final String SOCKET_SERVER = "192.168.110.111"; public static final String SOCKET_SERVER = "8.131.157.137"; app/src/main/java/com/jxonlinecar/driver/utils/UploadManager.java
@@ -7,10 +7,12 @@ import com.jxonlinecar.driver.base.Const; import com.obs.services.ObsClient; import com.obs.services.exception.ObsException; import com.obs.services.model.AccessControlList; import com.obs.services.model.PutObjectRequest; import com.obs.services.model.PutObjectResult; import java.io.File; import java.io.FileInputStream; import java.util.UUID; /** @@ -42,15 +44,15 @@ return null; } try { // 文件上传 // localfile 为待上传的本地文件路径,需要指定到具体的文件名 PutObjectRequest request = new PutObjectRequest(); request.setBucketName(Const.bucketName); String objectKey = UUID.randomUUID().toString(); String bucketName = Const.bucketName; PutObjectRequest request = new PutObjectRequest(); request.setBucketName(bucketName); request.setObjectKey(objectKey); request.setFile(file); request.setInput(new FileInputStream(file)); PutObjectResult putObjectResult = obsClient.putObject(request); if (putObjectResult.getStatusCode() == 200) { obsClient.setObjectAcl(bucketName, objectKey, AccessControlList.REST_CANNED_PUBLIC_READ_WRITE); Log.d(TAG, "putObject successfully"); return putObjectResult.getObjectUrl(); } @@ -65,6 +67,9 @@ // 请求失败,打印请求id Log.d(TAG, "Request ID:" + e.getErrorRequestId()); Log.d(TAG, "Host ID:" + e.getErrorHostId()); Log.d(TAG, "Indicator:" + e.getErrorIndicator()); Log.d(TAG, "XmlMessage:" + e.getXmlMessage()); Log.d(TAG, "Response Headers:" + e.getResponseHeaders()); e.printStackTrace(); } catch (Exception e) { Log.d(TAG, "putObject failed");