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

fix bug of road data

Browse Source
This commit is contained in:
zhongchao
2021-04-28 16:52:22 +08:00
parent dcaf3ae37e
commit 4ecd920624
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java
View File

@@ -6,7 +6,7 @@ import com.mogo.cloud.live.listener.IRequestLiveListener;
import com.mogo.cloud.live.model.BaseData;
import com.mogo.cloud.live.model.LivePush;
import com.mogo.cloud.live.model.LiveReceive;
import com.mogo.cloud.live.model.LiveRoadCamera;
import com.mogo.cloud.live.model.Camera;
import com.mogo.cloud.live.network.LiveApiServer;
import com.mogo.cloud.network.NetConstants;
import com.mogo.cloud.network.RetrofitFactory;
@@ -214,16 +214,16 @@ public class RequestLiveManager {
liveApiServer.getDesignativeIntersectionLive(map)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseData<LiveRoadCamera>>() {
.subscribe(new Observer<BaseData<Camera>>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BaseData<LiveRoadCamera> baseData) {
public void onNext(@NonNull BaseData<Camera> baseData) {
if (requestLiveListener != null && baseData != null) {
LiveRoadCamera liveRoadCamera = baseData.result;
Camera liveRoadCamera = baseData.result;
if (liveRoadCamera != null && liveRoadCamera.getRtmpUrl() != null) {
requestLiveListener.onSuccess(liveRoadCamera.getRtmpUrl());
} else {

4
foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/LiveRoadCamera.java → foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/Camera.java
View File

@@ -1,6 +1,6 @@
package com.mogo.cloud.live.model;
public class LiveRoadCamera {
public class Camera {
/**
* 摄像头id
@@ -27,7 +27,7 @@ public class LiveRoadCamera {
*/
private String state;
public LiveRoadCamera(int id, double lat, double lon, String rtmpUrl, String state) {
public Camera(int id, double lat, double lon, String rtmpUrl, String state) {
this.id = id;
this.lat = lat;
this.lon = lon;

6
foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java
View File

@@ -1,9 +1,8 @@
package com.mogo.cloud.live.network;
import com.mogo.cloud.live.model.BaseData;
import com.mogo.cloud.live.model.CameraStatusModel;
import com.mogo.cloud.live.model.LiveReceive;
import com.mogo.cloud.live.model.LiveRoadCamera;
import com.mogo.cloud.live.model.Camera;
import java.util.Map;
@@ -13,7 +12,6 @@ import retrofit2.http.Body;
import retrofit2.http.FieldMap;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.QueryMap;
@@ -57,7 +55,7 @@ public interface LiveApiServer {
* @return {@link BaseData}
*/
@GET("mec-etl-server/device/unit/camera/live")
Observable<BaseData<LiveRoadCamera>> getDesignativeIntersectionLive(@QueryMap Map<String, Object> parameters);
Observable<BaseData<Camera>> getDesignativeIntersectionLive(@QueryMap Map<String, Object> parameters);
/**
* 上传摄像头状态

18
gradle.properties
View File

@@ -30,20 +30,20 @@ PASSWORD=xintai2018
RELEASE=true
# AI CLOUD 云平台
# 工具类
MOGO_UTILS_VERSION=1.0.78
MOGO_UTILS_VERSION=1.0.79
# 网络请求
MOGO_NETWORK_VERSION=1.0.78
MOGO_NETWORK_VERSION=1.0.79
# 网络DNS
MOGO_HTTPDNS_VERSION=1.0.78
MOGO_HTTPDNS_VERSION=1.0.79
# 鉴权
MOGO_PASSPORT_VERSION=1.0.78
MOGO_PASSPORT_VERSION=1.0.79
# 常链接
MOGO_SOCKET_VERSION=1.0.78
MOGO_SOCKET_VERSION=1.0.79
# 数据采集
MOGO_REALTIME_VERSION=1.0.78
MOGO_REALTIME_VERSION=1.0.79
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.0.78
MOGO_TANLU_VERSION=1.0.79
# 直播推流
MOGO_LIVE_VERSION=1.0.78
MOGO_LIVE_VERSION=1.0.79
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.0.78
MOGO_TRAFFICLIVE_VERSION=1.0.79