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

Merge branch 'master' of http://gitlab.zhidaoauto.com/ecos/app/MoGoAiCloudSdk

Browse Source
This commit is contained in:
zhongchao
2021-01-27 10:38:07 +08:00
parent 97c778a14e 73c7867d4c
commit 8a38d2b624
17 changed files with 202 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}

37
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;
@@ -64,35 +65,35 @@ public class MogoRoadSearchManager {
* @param callback
*/
public void queryRoadInfo(RoadInfoRequest roadInfoRequest, IRoadInfoSearchCallback callback) {
ArrayList list = new ArrayList();
list.add("10007");
//北京市朝阳区小黄庄北街2号
Location location = new Location();
location.setLatitude(39.968139);
location.setLongitude(116.411468);
RoadInfoRequest request = new RoadInfoRequest(location, "", list, false, false);
Map<String, Object> map = new HashMap<>();
map.put("sn", "F803EB2046PZD00228");
map.put("data", GsonUtil.jsonFromObject(request));
// ArrayList list = new ArrayList();
// list.add("10007");
//
// //北京市朝阳区小黄庄北街2号
// Location location = new Location();
// location.setLatitude(39.968139);
// location.setLongitude(116.411468);
// RoadInfoRequest request = new RoadInfoRequest(location, "", list, false, false);
//
// Map<String, Object> map = new HashMap<>();
// map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn());
// map.put("data", GsonUtil.jsonFromObject(roadInfoRequest));
// map.put("sn", "F803EB2046PZD00228");
// map.put("data", GsonUtil.jsonFromObject(request));
Map<String, Object> map = new HashMap<>();
map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn());
map.put("data", GsonUtil.jsonFromObject(roadInfoRequest));
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);
}

3
modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/constant/HttpConstant.java
View File

@@ -7,4 +7,7 @@ package com.mogo.cloud.tanlu.constant;
*/
public class HttpConstant {
public static final String DZT_HOTS = "http://dzt-deva.zhidaozhixing.com";
public static final String LAUNCHER_HOTS = "http://dzt-launcherSnapshot.zhidaozhixing.com";
}

9
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;
@@ -20,16 +21,16 @@ public interface TanluApiService {
* 查询（搜索）道路事件信息
* 接口文档：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42305842
* 文档中有些参数暂时没有用到，包括radius,limit
* @return
* @return dzt-launcherSnapshot.zhidaozhixing.com
*/
@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);
//上报情报数据
//上报情报数据 dzt-deva.zhidaozhixing.com
@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();
}
}