fixed conflict

This commit is contained in:
lixiaopeng
2021-01-27 12:25:38 +08:00
parent 410d566095
commit 98301d9ab6
9 changed files with 280 additions and 145 deletions

View File

@@ -97,48 +97,34 @@ public class NetworkActivity extends AppCompatActivity {
}
public void uploadRoadInfo() {
// MogoUploadManager.getInstance(NetworkActivity.this).init();
UploadInfo info = new UploadInfo();
// 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);
// }
// });
UploadManager.getInstance(NetworkActivity.this).init();
UploadManager.getInstance(NetworkActivity.this).loadUpload(null, new ITanluUploadCallback() {
// info.setFilePath("/storage/emulated/0/Movies/compress_video_20210127112035.mp4");
info.setFilePath("/storage/emulated/0/Movies/2222.png");
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为视频
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
@@ -151,6 +137,25 @@ public class NetworkActivity extends AppCompatActivity {
Log.d(TAG, "NetworkActivity uploadRoadInfo onError e = " + e);
}
});
// UploadManager.getInstance(NetworkActivity.this).init();
// UploadManager.getInstance(NetworkActivity.this).loadUpload(null,new ITanluUploadCallback() {
// @Override
// public void onSuccess(BaseData<UploadResult> 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) {