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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
#	foudations/mogo-commons/build.gradle
This commit is contained in:
wujifei
2021-01-27 16:32:04 +08:00
parent a356490cb6 9c1f40f9ad
commit aa3569e5af
126 changed files with 19866 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/mogo/cloud/RealTimeActivity.java
View File

@@ -1,24 +1,25 @@
package com.mogo.cloud;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.realtime.core.SnapshotUploadInTime;
import com.mogo.realtime.Interface.MoGoAiCloudRealTime;
import com.mogo.realtime.entity.MogoSnapshotSetData;
import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import java.nio.Buffer;
/**
* @author liujing
* @description 描述
* @since: 2021/1/21
*/
public class RealTimeActivity extends AppCompatActivity {
public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnMsgListener {
private static final String TAG = "RealTimeActivity";
private Button snapshotStartButton;
private Button snapshotStopButton;
@@ -32,18 +33,14 @@ public class RealTimeActivity extends AppCompatActivity {
snapshotStartButton = findViewById(R.id.snapshotStart);
snapshotStartButton.setOnClickListener(view -> {
if (MoGoAiCloudClient.getInstance().getAiCloudClientConfig().isNeedUploadCoordinatesDurationInTime()) {
// SnapshotUploadInTime.getInstance().start(getApplicationContext(), "com.mogo.launcher", new IMogoCloudOnMsgListener() {
// @Override
// public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
//
// }
// });
MoGoAiCloudRealTime.startRealTime(this, "com.mogo.launcher");
MoGoAiCloudRealTime.registerOnMsgListener(this);
}
});
snapshotStopButton = findViewById(R.id.snapshotStart);
snapshotStopButton = findViewById(R.id.snapshotStop);
snapshotStopButton.setOnClickListener(view -> {
// SnapshotUploadInTime.getInstance().stop();
stopRealTimeService();
});
}
@@ -51,7 +48,26 @@ public class RealTimeActivity extends AppCompatActivity {
private void setConfig() {
MoGoAiCloudClient.getInstance().getAiCloudClientConfig().setIsUseExternalLocation(false);
MoGoAiCloudClient.getInstance().getAiCloudClientConfig().setNeedUploadCoordinatesDurationInTime(true);
}
public void stopRealTimeService() {
MoGoAiCloudRealTime.unRegisterOnMsgListener(this);
MoGoAiCloudRealTime.stopRealTime();
}
@Override
protected void onDestroy() {
super.onDestroy();
stopRealTimeService();
}
@Override
public void onMsgSend(long id) {
Log.i(TAG, "send msg id : " + id);
}
@Override
public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
Log.i(TAG, "onMsgReceived ： " + mogoSnapshotSetData);
}
}

16
app/src/main/java/com/mogo/cloud/SPIRealTimeTestClass.java
View File

@@ -5,7 +5,9 @@ import com.mogo.realtime.Interface.RealTimeProvider;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.realtime.entity.CloudLocationInfo;
import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
import com.zhidao.utils.common.SystemUtils;
import java.util.ArrayList;
import java.util.List;
/**
@@ -18,7 +20,7 @@ class SPIRealTimeTestClass implements RealTimeProvider {
@Override
public List<ADASRecognizedResult> getLastADASRecognizedResult() {
List<ADASRecognizedResult> list = null;
List<ADASRecognizedResult> list = new ArrayList<>();
ADASRecognizedResult recognizedResult = new ADASRecognizedResult();
recognizedResult.lat = 39.968309;
recognizedResult.lon = 116.410871;
@@ -31,6 +33,16 @@ class SPIRealTimeTestClass implements RealTimeProvider {
@Override
public List<CloudLocationInfo> getLocationMsg() {
return null;
List<CloudLocationInfo> list = new ArrayList<>();
CloudLocationInfo info = new CloudLocationInfo();
info.setAlt(55);
info.setLat(39.968309);
info.setLon(116.410871);
info.setSatelliteTime(System.currentTimeMillis());
info.setSystemTime(System.currentTimeMillis());
info.setHeading(120);
info.setSpeed(7.0);
list.add(info);
return list;
}
}

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

@@ -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;
@@ -45,7 +39,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
@@ -99,48 +93,29 @@ public class NetworkActivity extends AppCompatActivity {
}
public void uploadRoadInfo() {
// MogoUploadManager.getInstance(NetworkActivity.this).init();
UploadInfo info = new UploadInfo();
// info.setFilePath("/storage/emulated/0/Movies/compress_video_20210127112035.mp4");
// info.setFilePath("/storage/emulated/0/Movies/2222.png");
// 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) {
// Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.id);
// tvResult.setText("onSuccess - " + result.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);
// }
// });
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");
info.setType(0); //0为图片， 1为视频
UploadManager.getInstance(NetworkActivity.this).init();
UploadManager.getInstance(NetworkActivity.this).loadUpload(null, new ITanluUploadCallback() {
MogoUploadManager.getInstance(NetworkActivity.this).uploadInfo(info, new ITanluUploadCallback() {
@Override
public void onSuccess(BaseData<UploadResult> result) {
Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.getResult().id);
tvResult.setText(result.getResult().id + "");
if (result != null && result.getResult() != null) {
Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.getResult().id);
tvResult.setText(result.getResult().id + "");
} else {
Log.e(TAG, "NetworkActivity uploadRoadInfo result == null");
}
}
@Override