Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/java/com/mogo/cloud/network/NetworkActivity.java # foudations/mogo-commons/build.gradle
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user