From f9e3f6a887956faad937a5375f4ba2a9d9d95710 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 27 Jan 2021 14:11:27 +0800 Subject: [PATCH] opt --- .../mogo/cloud/network/NetworkActivity.java | 35 ++--------------- .../java/com/mogo/cloud/tanlu/CosUpload.java | 39 +++++++++++-------- 2 files changed, 26 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java index a07172f..99fbdd0 100644 --- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java +++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java @@ -14,20 +14,14 @@ import com.mogo.cloud.commons.network.BaseData; import com.mogo.cloud.commons.network.RetrofitFactory; import com.mogo.cloud.tanlu.MogoRoadSearchManager; import com.mogo.cloud.tanlu.MogoUploadManager; -import com.mogo.cloud.tanlu.UploadManager; import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback; import com.mogo.cloud.tanlu.api.ITanluUploadCallback; -import com.mogo.cloud.tanlu.bean.InformationBody; import com.mogo.cloud.tanlu.bean.RoadInfos; import com.mogo.cloud.tanlu.bean.UploadInfo; import com.mogo.cloud.tanlu.bean.UploadResult; - -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -42,7 +36,7 @@ public class NetworkActivity extends AppCompatActivity { private Button btn; private TextView tvResult; private ApiService apiService; - private static final String TAG = "liyz"; + private static final String TAG = "NetworkActivity"; @Override @@ -62,7 +56,7 @@ public class NetworkActivity extends AppCompatActivity { // queryHelpSignal("ZD802C1938L10797"); //上报路况到服务端 - // uploadRoadInfo(); + uploadRoadInfo(); //查询路况 // queryRoad(); } @@ -98,13 +92,8 @@ public class NetworkActivity extends AppCompatActivity { public void uploadRoadInfo() { UploadInfo info = new UploadInfo(); - -// List filePath = new ArrayList<>(); -// filePath.add("/storage/emulated/0/Movies/compress_video_20210126174432.mp4"); -// filePath.add("/data/user/0/com.mogo.launcher.f/Thumbnail1611654285824.jpg"); - // info.setFilePath("/storage/emulated/0/Movies/compress_video_20210127112035.mp4"); - info.setFilePath("/storage/emulated/0/Movies/2222.png"); +// info.setFilePath("/storage/emulated/0/Movies/2222.png"); info.setAddr("北京市东城区小黄庄北街2号靠近中国银行"); info.setLongitude(116.410892); @@ -138,24 +127,6 @@ public class NetworkActivity extends AppCompatActivity { } }); -// UploadManager.getInstance(NetworkActivity.this).init(); -// UploadManager.getInstance(NetworkActivity.this).loadUpload(null,new ITanluUploadCallback() { -// @Override -// public void onSuccess(BaseData result) { -// Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.getResult().id); -// tvResult.setText(result.getResult().id + ""); -// } -// -// @Override -// public void onFailure(int code) { -// Log.d(TAG, "NetworkActivity uploadRoadInfo code = " + code); -// } -// -// @Override -// public void onError(Throwable e) { -// Log.d(TAG, "NetworkActivity uploadRoadInfo onError e = " + e); -// } -// }); } public void queryRoadData(String sn) { diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/CosUpload.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/CosUpload.java index e7b3e0d..de98653 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/CosUpload.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/CosUpload.java @@ -1,6 +1,7 @@ package com.mogo.cloud.tanlu; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import com.google.gson.JsonArray; @@ -62,24 +63,30 @@ public class CosUpload implements CosStatusCallback { } public void uploadInfo(UploadInfo info, ITanluUploadCallback callback) { - Log.d(HttpConstant.TANLU, "videoPath = " + info.getFilePath()); - if (isVideo(info.getFilePath())) { - videoCoverImage = getVideoPicPath(); - Log.d(HttpConstant.TANLU, "videoCoverImage = " + videoCoverImage); - boolean isSuccess = getVideoThumbnail(info.getFilePath(), videoCoverImage); - Log.d(HttpConstant.TANLU, "isSuccess = " + isSuccess); - filePath.add(info.getFilePath()); - filePath.add(videoCoverImage); - } else { - videoCoverImage = null; - filePath.add(info.getFilePath()); - } - - Log.e(HttpConstant.TANLU, "filePath.size() = " + filePath.size()); - CosUploadManagerImpl.getInstance(mContext.getApplicationContext()) - .upload(filePath, mPicEventId, DbPriorityConfig.PRIORITY_HIGH); mCallback = callback; mUploadInfo = info; + + Log.d(HttpConstant.TANLU, "videoPath = " + info.getFilePath()); + if (!TextUtils.isEmpty(info.getFilePath())) { //不传路径 + if (isVideo(info.getFilePath())) { + videoCoverImage = getVideoPicPath(); + Log.d(HttpConstant.TANLU, "videoCoverImage = " + videoCoverImage); + boolean isSuccess = getVideoThumbnail(info.getFilePath(), videoCoverImage); + Log.d(HttpConstant.TANLU, "isSuccess = " + isSuccess); + filePath.add(info.getFilePath()); + filePath.add(videoCoverImage); + } else { + videoCoverImage = null; + filePath.add(info.getFilePath()); + } + + Log.e(HttpConstant.TANLU, "filePath.size() = " + filePath.size()); + CosUploadManagerImpl.getInstance(mContext.getApplicationContext()) + .upload(filePath, mPicEventId, DbPriorityConfig.PRIORITY_HIGH); + } else { + //直接上报 + sendInformation(); + } } @Override