diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java index e52b8e2..55266d5 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/RequestLiveManager.java @@ -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>() { + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { } @Override - public void onNext(@NonNull BaseData baseData) { + public void onNext(@NonNull BaseData 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 { diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/LiveRoadCamera.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/Camera.java similarity index 92% rename from foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/LiveRoadCamera.java rename to foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/Camera.java index 8d6c6d6..ec69199 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/LiveRoadCamera.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/model/Camera.java @@ -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; diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java index 794da92..f9e2197 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/network/LiveApiServer.java @@ -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> getDesignativeIntersectionLive(@QueryMap Map parameters); + Observable> getDesignativeIntersectionLive(@QueryMap Map parameters); /** * 上传摄像头状态 diff --git a/gradle.properties b/gradle.properties index a001990..5456fb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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