remix the aiCloudSocketData

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java

@@ -6,18 +6,18 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.live.impl.AbsCameraScenario;
-import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 
 /**
  * 路边摄像头直播控制  V2XPushLiveCarScenario
  */
-public class CameraLiveManager extends AbsCameraScenario<CloudRoadData> implements IMogoTopViewStatusListener {
+public class CameraLiveManager extends AbsCameraScenario<SocketDownData.CloudRoadDataProto> implements IMogoTopViewStatusListener {
     private static final String TAG = "CameraLiveManager";
     private static CameraLiveManager mCameraLiveManager;
     private boolean isShowWindow;
@@ -38,7 +38,7 @@ public class CameraLiveManager extends AbsCameraScenario<CloudRoadData> implemen
     }
 
     @Override
-    public void init(@Nullable CloudRoadData cloudRoadData) {
+    public void init(@Nullable SocketDownData.CloudRoadDataProto cloudRoadData) {
         Log.d(TAG, "CameraLiveManager init -----> isShowWindow = " + isShowWindow);
         if (isShowWindow) {
             close();

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java

@@ -9,10 +9,10 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.live.impl.ICameraWindow;
-import com.mogo.realtime.entity.CloudRoadData;
 import com.mogo.service.imageloader.MogoImageView;
 import com.mogo.utils.logger.Logger;
 
@@ -21,7 +21,7 @@ import com.mogo.utils.logger.Logger;
  * 点击摄像头 marker
  * vr路边摄像头弹窗 V2XPushLiveCarWindow
  */
-public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindow<CloudRoadData> {
+public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindow<SocketDownData.CloudRoadDataProto> {
     private static final String TAG = "PushCameraLiveWindow";
     private CameraLiveGSYVideoView mLiveGSYVideoView;
     private MogoImageView mIvReportHead;
@@ -65,7 +65,7 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
      * 展示直播Windows
      */
     @Override
-    public void show(CloudRoadData entity) {
+    public void show(SocketDownData.CloudRoadDataProto entity) {
         if (entity != null) {
             Logger.w(TAG, "更新直播信息 show entity = " + entity);
             if (!TextUtils.isEmpty(entity.getRtmpUrl())) {
@@ -76,7 +76,7 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
                 mLiveGSYVideoView.startLive(entity.getRtmpUrl());
             }
 
-            countDownV2XEvent(entity);
+            countDownV2XEvent();
         }
     }
 
@@ -99,7 +99,7 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
     /**
      * 窗体倒计时
      */
-    public void countDownV2XEvent(CloudRoadData data) {
+    public void countDownV2XEvent() {
         // 倒计时
         if (runnableV2XEvent == null) {
             runnableV2XEvent = () -> {

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/impl/AbsCameraScenario.java

@@ -2,15 +2,15 @@ package com.mogo.module.extensions.live.impl;
 
 import androidx.annotation.Nullable;
 
-import com.mogo.realtime.entity.CloudRoadData;
+import com.mogo.cloud.socket.entity.SocketDownData;
 
 
 public abstract class AbsCameraScenario<T> implements ICameraScenario {
     protected String TAG = "AbsCameraScenario";
     private ICameraWindow mV2XWindow;
-    private CloudRoadData mCloudRoadData;
+    private SocketDownData.CloudRoadDataProto mCloudRoadData;
 
-    public abstract void init(@Nullable CloudRoadData cloudRoadData);
+    public abstract void init(@Nullable SocketDownData.CloudRoadDataProto cloudRoadData);
 
     @Override
     public void close() {
@@ -27,11 +27,11 @@ public abstract class AbsCameraScenario<T> implements ICameraScenario {
         this.mV2XWindow = mV2XWindow;
     }
 
-    public CloudRoadData getmCloudRoadData() {
+    public SocketDownData.CloudRoadDataProto getmCloudRoadData() {
         return mCloudRoadData;
     }
 
-    public void setmCloudRoadData(CloudRoadData mCloudRoadData) {
+    public void setmCloudRoadData(SocketDownData.CloudRoadDataProto mCloudRoadData) {
         this.mCloudRoadData = mCloudRoadData;
     }
 

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java

@@ -7,12 +7,11 @@ import android.content.IntentFilter;
 import android.os.Handler;
 import android.os.Message;
 
+import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.navi.VrModeNavInfoView;
-import com.mogo.realtime.api.MoGoAiCloudRealTime;
-import com.mogo.realtime.entity.MogoSnapshotSetData;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.service.adas.IMogoAdasWarnMessageCallback;
 import com.mogo.service.adas.MogoADASWarnType;
@@ -41,7 +40,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca
     private static final long STRATEGY_DELAY = 1000L;
 
     private Context context;
-    private AdasNoticeReceiver adasReceiver = new AdasNoticeReceiver();
+    private final AdasNoticeReceiver adasReceiver = new AdasNoticeReceiver();
 
     private volatile boolean isVrMode = false;
 
@@ -203,7 +202,8 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca
     }
 
     @Override
-    public void onMsgReceived(MogoSnapshotSetData obj) {
+    public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
 
     }
+
 }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java

@@ -6,6 +6,7 @@ import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
@@ -16,8 +17,6 @@ import com.mogo.module.extensions.live.CameraLiveManager;
 import com.mogo.module.extensions.live.CameraWindow3DAdapter;
 import com.mogo.module.extensions.live.PushDataType;
 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.utils.TipToast;
 import com.mogo.utils.logger.Logger;
@@ -30,7 +29,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
     private static final String TAG = "CameraLiveNoticeHelper";
     private Context mContext;
     private static IMogoMarker mMogoMarker;
-    private CloudRoadData mCloudRoadData;
+    private SocketDownData.CloudRoadDataProto mCloudRoadData;
     private volatile boolean isVrMode;
     private volatile boolean isVrModeMarker;
     private volatile String mCurrentUuid;
@@ -81,7 +80,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
      *
      * @param roadData 道路数据
      */
-    private void addVrCameraMarker(CloudRoadData roadData) {
+    private void addVrCameraMarker(SocketDownData.CloudRoadDataProto roadData) {
         Log.e(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
         if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
             removeCameraMarker();
@@ -108,7 +107,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
      *
      * @param roadData 道路数据
      */
-    private void addNormalCameraMarker(CloudRoadData roadData) {
+    private void addNormalCameraMarker(SocketDownData.CloudRoadDataProto roadData) {
         Log.e(TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
         if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
             removeCameraMarker();
@@ -137,7 +136,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
         }
     }
 
-    private void renderMarker(MogoSnapshotSetData obj) {
+    private void renderMarker(SocketDownData.LauncherSnapshotProto  obj) {
         if (obj != null) {
             if (obj.getCamera() != null && !TextUtils.isEmpty(obj.getCamera().getRtmpUrl())) {
                 mCloudRoadData = obj.getCamera();
@@ -189,8 +188,8 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
     }
 
     @Override
-    public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
-        //Logger.d(TAG, "onMsgReceived mogoSnapshotSetData ： " + mogoSnapshotSetData);
+    public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
         renderMarker(mogoSnapshotSetData);
     }
+
 }