diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e768208a07..fd91e149ef 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -89,6 +89,7 @@ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java index a07b6c58b8..a4c4298fa7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java @@ -1,5 +1,6 @@ package com.mogo.module.service.network; +import com.mogo.commons.data.BaseData; import com.mogo.module.common.entity.MarkerResponse; import java.util.Map; @@ -17,5 +18,5 @@ public interface TimeDelayApiService { */ @FormUrlEncoded @POST("/yycp-computer-vision-service/mockEye/delayTimeCallBack") - Observable uploadDelayData(@FieldMap Map parameters); + Observable uploadDelayData(@FieldMap Map parameters); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index 67e952d195..99c4110213 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -1,27 +1,38 @@ package com.mogo.module.service.timedelay; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.Message; +import androidx.annotation.RequiresApi; + +import com.mogo.commons.data.BaseData; +import com.mogo.commons.network.SubscribeImpl; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.uploadintime.SnapshotLocationController; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.network.TimeDelayApiService; import com.mogo.module.service.network.bean.MockSocketReceiverData; import com.mogo.realtime.api.MoGoAiCloudRealTime; +import com.mogo.realtime.entity.CloudRoadData; import com.mogo.realtime.entity.MogoSnapshotSetData; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.RequestOptions; import org.json.JSONException; import org.json.JSONObject; -import io.reactivex.schedulers.Schedulers; -import rx.android.schedulers.AndroidSchedulers; +import java.util.HashMap; +import java.util.Map; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.schedulers.Schedulers; + +import static com.mogo.commons.AbsMogoApplication.getApp; import static com.mogo.module.service.network.bean.MockSocketReceiverData.MOCK_RECEIVER_STATUS_START; /** @@ -123,15 +134,37 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener cloudRoadData.getUuid().equals("")) + .findAny() + .orElse(null); + if (result == null) { + return; + } + Map map = new HashMap<>(); + map.put("systemTime", System.currentTimeMillis()); + map.put("uuid", result.getUuid()); + map.put("satelliteTime", result.getSatelliteTime()); + timeDelayApiService.uploadDelayData(map) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new SubscribeImpl(RequestOptions.create(getApp())) { + @Override + public void onNext(BaseData o) { + super.onNext(o); + } -// timeDelayApiService.uploadDelayData() -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe() + @Override + public void onError(Throwable e) { + super.onError(e); + } + }); } } }