yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt

Browse Source
This commit is contained in:
lixiaopeng
2021-01-26 19:44:08 +08:00
parent b5ef638e74
commit c3797591c7
8 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
View File

@@ -79,9 +79,12 @@ public class NetworkActivity extends AppCompatActivity {
MogoRoadSearchManager.getInstance(NetworkActivity.this).init();
MogoRoadSearchManager.getInstance(NetworkActivity.this).queryRoadInfo(null , new IRoadInfoSearchCallback() {
@Override
public void onSuccess(RoadInfos result) {
if (result != null && result.getData() != null) {
Log.d(TAG, "NetworkActivity queryRoad size() = " + result.getData().size());
public void onSuccess(BaseData<RoadInfos> result) {
if (result != null && result.getResult() != null) {
Log.d(TAG, "msg = " + result.getMsg() + " --code =" + result.getCode());
if (result.getResult().getData() != null) {
Log.d(TAG, "NetworkActivity queryRoad size() = " + result.getResult().getData().size());
}
tvResult.setText(new Gson().toJson(result));
}
}
@@ -101,21 +104,22 @@ public class NetworkActivity extends AppCompatActivity {
public void uploadRoadInfo() {
// MogoUploadManager.getInstance(NetworkActivity.this).init();
UploadInfo info = new UploadInfo();
List<String> 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(filePath);
info.setAddr("北京市东城区小黄庄北街2号靠近中国银行");
info.setLongitude(116.410892);
info.setLatitude(39.968317);
info.setPoiType("10007");
info.setDirection(0);
info.setAreaCode("110101");
info.setCityCode("010");
// UploadInfo info = new UploadInfo();
//
// List<String> 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(filePath);
//
// info.setAddr("北京市东城区小黄庄北街2号靠近中国银行");
// info.setLongitude(116.410892);
// info.setLatitude(39.968317);
// info.setPoiType("10007");
// info.setDirection(0);
// info.setAreaCode("110101");
// info.setCityCode("010");
// info.setSn("F803EB2046PZD00228");
//
// MogoUploadManager.getInstance(NetworkActivity.this).uploadInfo(info, new ITanluUploadCallback() {
// @Override
// public void onSuccess(UploadResult result) {
@@ -137,9 +141,9 @@ public class NetworkActivity extends AppCompatActivity {
UploadManager.getInstance(NetworkActivity.this).init();
UploadManager.getInstance(NetworkActivity.this).loadUpload(null,new ITanluUploadCallback() {
@Override
public void onSuccess(UploadResult result) {
Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.id);
tvResult.setText("onSuccess - " + result.id + "");
public void onSuccess(BaseData<UploadResult> result) {
Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.getResult().id);
tvResult.setText(result.getResult().id + "");
}
@Override

15
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/CosUpload.java
View File

@@ -5,6 +5,7 @@ import android.util.Log;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.tanlu.api.ITanluUploadCallback;
import com.mogo.cloud.tanlu.bean.InformationBody;
import com.mogo.cloud.tanlu.bean.UploadInfo;
@@ -14,6 +15,8 @@ import com.zhidao.cosupload.callback.CosStatusCallback;
import com.zhidao.cosupload.callback.CosStatusCallbackManager;
import com.zhidao.cosupload.manager.CosUploadManagerImpl;
import static com.mogo.cloud.tanlu.utils.TanluUtils.isVideo;
/**
* @author lixiaopeng
* @description
@@ -85,10 +88,16 @@ public class CosUpload implements CosStatusCallback {
// Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType");
// }
if (isVideo(localPath)) { //如果是视频 TODO
} else {
sendInformation();
}
//TODO
mCosVideoUrl = downloadUrl;
sendInformation();
}
@Override
@@ -105,8 +114,8 @@ public class CosUpload implements CosStatusCallback {
private void sendInformation() {
UploadManager.getInstance(mContext.getApplicationContext()).loadUpload(getInformation(), new ITanluUploadCallback() {
@Override
public void onSuccess(UploadResult result) {
Log.d(TAG, "uploadRoadInfo result.id = " + result.id);
public void onSuccess(BaseData<UploadResult> result) {
Log.d(TAG, "uploadRoadInfo result.id = " + result.getResult().id);
mCallback.onSuccess(result);
}

7
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/MogoRoadSearchManager.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import android.util.Log;
import com.google.gson.Gson;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.commons.network.RetrofitFactory;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
@@ -84,15 +85,15 @@ public class MogoRoadSearchManager {
apiService.queryRoadInfos(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<RoadInfos>() {
.subscribe(new Observer<BaseData<RoadInfos>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
Log.d(TAG, "queryRoadInfos onSubscribe ");
}
@Override
public void onNext(@NonNull RoadInfos roadInfos) {
Log.d(TAG, "queryRoadInfos onNext roadInfos = " + roadInfos.getData());
public void onNext(@NonNull BaseData<RoadInfos> roadInfos) {
Log.d(TAG, "queryRoadInfos onNext roadInfos = " + roadInfos.getResult().getData());
callback.onSuccess(roadInfos);
}

7
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import android.util.Log;
import com.google.gson.Gson;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.commons.network.RetrofitFactory;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
@@ -84,15 +85,15 @@ public class UploadManager {
apiService.uploadInformation(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<UploadResult>() {
.subscribe(new Observer<BaseData<UploadResult>>() {
@Override
public void onSubscribe(Disposable d) {
Log.d(TAG, "onSubscribe -----> ");
}
@Override
public void onNext(UploadResult result) {
Log.d(TAG, "onNext id = -----> " + result.id);
public void onNext(BaseData<UploadResult> result) {
Log.d(TAG, "onNext id = -----> " + result.getResult().id);
callback.onSuccess(result);
}

3
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/IRoadInfoSearchCallback.java
View File

@@ -1,5 +1,6 @@
package com.mogo.cloud.tanlu.api;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.tanlu.bean.RoadInfos;
/**
@@ -8,7 +9,7 @@ import com.mogo.cloud.tanlu.bean.RoadInfos;
* @since 2021/1/20
*/
public interface IRoadInfoSearchCallback {
void onSuccess(RoadInfos result);
void onSuccess(BaseData<RoadInfos> result);
void onFailure(int code);
void onError(Throwable e);
}

3
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/api/ITanluUploadCallback.java
View File

@@ -1,5 +1,6 @@
package com.mogo.cloud.tanlu.api;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.tanlu.bean.UploadResult;
/**
@@ -8,7 +9,7 @@ import com.mogo.cloud.tanlu.bean.UploadResult;
* @since 2021/1/20
*/
public interface ITanluUploadCallback {
void onSuccess(UploadResult result);
void onSuccess(BaseData<UploadResult> result);
void onFailure(int code);
void onError(Throwable e);
}

5
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/net/TanluApiService.java
View File

@@ -1,5 +1,6 @@
package com.mogo.cloud.tanlu.net;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.tanlu.bean.RoadInfos;
import com.mogo.cloud.tanlu.bean.UploadResult;
@@ -25,11 +26,11 @@ public interface TanluApiService {
@FormUrlEncoded
@POST("/yycp-launcherSnapshot/launcherSnapshot/searchRoadEventsSync")
// Observable<BaseDataCompat<RoadInfos>> queryRoadInfos(@FieldMap Map<String, Object> params);
Observable<RoadInfos> queryRoadInfos(@FieldMap Map<String, Object> params);
Observable<BaseData<RoadInfos>> queryRoadInfos(@FieldMap Map<String, Object> params);
//上报情报数据
@FormUrlEncoded
@POST("/deva/car/path/no/addInfomation/v2")
Observable<UploadResult> uploadInformation(@FieldMap Map<String, String> information);
Observable<BaseData<UploadResult>> uploadInformation(@FieldMap Map<String, String> information);
}

9
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/utils/TanluUtils.java
View File

@@ -1,5 +1,7 @@
package com.mogo.cloud.tanlu.utils;
import java.util.regex.Pattern;
/**
* @author lixiaopeng
* @description
@@ -7,4 +9,11 @@ package com.mogo.cloud.tanlu.utils;
*/
public class TanluUtils {
public static boolean isVideo(String path) {
String reg = "(mp4|flv|avi|rm|rmvb|wmv)";
Pattern p = Pattern.compile(reg);
return p.matcher(path).find();
}
}