Merge branch 'dev' into dev_1.1.2

This commit is contained in:
董宏宇
2020-08-05 17:01:43 +08:00
2 changed files with 2 additions and 3 deletions

View File

@@ -36,7 +36,7 @@ public interface V2XApiService {
*/
@FormUrlEncoded
@POST("/dataService/integratedServices/app/push/no/heartbeat/v1")
Observable<BaseData> refreshHeartBeat(@FieldMap Map<String, String> liveBroadcast);
Observable<BaseData> refreshHeartBeat(@FieldMap Map<String, Object> liveBroadcast);
/**
* 刷新地图气泡点

View File

@@ -106,10 +106,9 @@ public class V2XRefreshModel {
*/
public void refreshHeartBeat(String sn, String videoChannel, final V2XRefreshCallback callback) {
if (mV2XApiService != null) {
Map<String, String> liveBroadcast = new HashMap<>();
final Map<String, Object> liveBroadcast = new ParamsProvider.Builder(mContext).build();
liveBroadcast.put("sn", sn);
liveBroadcast.put("data", GsonUtil.getGson().toJson(new V2XLiveCarBroadcastReq(sn, videoChannel)));
mV2XApiService.refreshHeartBeat(liveBroadcast)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())