opt

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -676,6 +676,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         TopViewNoLinkageAnimHelper.getInstance().clear();
         NoMapTopViewShaderHelper.getInstance().release();
         EntranceViewHolder.getInstance().release();
+        mCameraLiveNoticeHelper.release();
     }
 
     @Override

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

@@ -91,7 +91,6 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin
         });
     }
 
-
     /**
      * 开始直播
      *
@@ -113,7 +112,7 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin
     private void playLiveVideo(String liveUrl) {
         try {
             if (mLivePlayer != null) {
-                mLivePlayer.startPlay(liveUrl, TXLivePlayer.PLAY_TYPE_LIVE_FLV);
+                mLivePlayer.startPlay(liveUrl, TXLivePlayer.PLAY_TYPE_LIVE_RTMP);
                 mLivePlayer.setPlayListener(new ITXLivePlayListener() {
                     @Override
                     public void onPlayEvent(int event, Bundle bundle) {
@@ -129,16 +128,9 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin
                             mLoading.setVisibility(GONE);
                             mClLoadError.setVisibility(GONE);
                         } else if (event < 0) {
-//                            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("直播获取失败，可以对我说重试", null);
                             stopLive(mLiveUrl);
                             mLoading.setVisibility(GONE);
                             mClLoadError.setVisibility(VISIBLE);
-//                            // 注册语音交互
-//                            V2XVoiceManager.INSTANCE
-//                                    .registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_CAR_LIVE,
-//                                            v2XVoiceCallbackRefreshListener)
-//                                    .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP,
-//                                            v2XVoiceCallbackRefreshListener);
                         }
                     }
 
@@ -164,21 +156,6 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin
             // true 代表清除最后一帧画面
             mLivePlayer.stopPlay(true);
             mTxcVideoView.onDestroy();
-            // 停止推流
-//            V2XServiceManager
-//                    .getV2XRefreshModel()
-//                    .livePush(new V2XRefreshCallback<V2XLivePushVoRes>() {
-//                        @Override
-//                        public void onSuccess(V2XLivePushVoRes result) {
-//                            Logger.d(TAG, "播放器：" + result);
-//                        }
-//
-//                        @Override
-//                        public void onFail(String msg) {
-//                            Logger.e(TAG, "播放器：" + msg);
-//                        }
-//                    }, carLiveInfo.getVideoSn(), 1);
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -196,10 +173,6 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin
     protected void onDetachedFromWindow() {
         stopLive(mLiveUrl);
         mLoading.setVisibility(VISIBLE);
-        // 反注册语音交互
-//        V2XVoiceManager.INSTANCE
-//                .unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_CAR_LIVE)
-//                .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP);
         super.onDetachedFromWindow();
     }
 

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

@@ -22,6 +22,8 @@ import com.mogo.module.extensions.live.ExtensionServiceManager;
 import com.mogo.module.extensions.live.PushDataType;
 import com.mogo.service.connection.IMogoOnWebSocketMessageListener;
 import com.mogo.service.connection.WebSocketMsgType;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 
@@ -34,17 +36,15 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
     private Context mContext;
     private static IMogoMarker mMogoMarker;
     private CloudRoadData mCloudRoadData;
-    private boolean isFirst;
+    private boolean isVrMode;
+
 
     public void init(Context context) {
         Logger.d(TAG, "init ======= ");
         mContext = context;
 
-    }
-
-    public void enterVrMode() {
-        Logger.d(TAG, "enterVrMode===");
         MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).registerOnWebSocketMessageListener(this);
+
         ExtensionServiceManager
                 .getMogoRegisterCenter().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() {
             @Override
@@ -59,39 +59,32 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
                 return false;
             }
         });
+    }
 
-//        if (!isFirst) {
-//            isFirst = true;
-//            UiThreadHandler.postDelayed(() -> {
-//                mCloudRoadData = new CloudRoadData();
-////                mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
-//                mCloudRoadData.setRtmpUrl("http://video.zhidaozhixing.com/live/rec_12_22.flv");
-//
-//                mCloudRoadData.setLat(39.969089);
-//                mCloudRoadData.setLon(116.418009);
-//
-////            CameraLiveManager.getInstance().init(mCloudRoadData);
-//                addCameraMarker(mCloudRoadData);
-//            }, 2_000);
-//        }
+    public void release() {
+        MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).unregisterOnWebSocketMessageListener(this);
+    }
 
+    public void enterVrMode() {
+        Logger.d(TAG, "enterVrMode===");
+        isVrMode = true;
     }
 
 
     public void exitVrMode() {
         Logger.d(TAG, "退出vr模式===");
-//        removeCameraMarker();
-//        isFirst = false;
-        MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).unregisterOnWebSocketMessageListener(this);
+        isVrMode = false;
     }
 
     /**
      * PushRoadConditionDrawer
+     * vr模式
      *
      * @param roadData
      */
-    private void addCameraMarker(CloudRoadData roadData) {
-        Logger.d(TAG, "addCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
+    private void addVrCameraMarker(CloudRoadData roadData) {
+        Logger.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
+        removeCameraMarker();
         MogoMarkerOptions options = new MogoMarkerOptions()
                 .object(roadData)
                 .latitude(roadData.getLat())
@@ -109,6 +102,29 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         }
     }
 
+    /**
+     * 普通模式
+     *
+     * @param roadData
+     */
+    private void addNormalCameraMarker(CloudRoadData roadData) {
+        Logger.d(TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon());
+        removeCameraMarker();
+        MogoMarkerOptions options = new MogoMarkerOptions()
+                .object(roadData)
+                .latitude(roadData.getLat())
+                .longitude(roadData.getLon());
+        options.anchor(0.5f, 0.5f);
+
+        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
+        options.icon(bitmap);
+        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+        if (mMogoMarker != null) {
+            mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), mMogoMarker.getMogoMarkerOptions()));
+        }
+    }
+
     private void removeCameraMarker() {
         if (mMogoMarker != null) {
             mMogoMarker.remove();
@@ -125,37 +141,55 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         return MogoSnapshotSetData.class;
     }
 
-    private double mCurrentlat;
-    private double mCurrentlon;
+    private volatile boolean isLoadVr;
+    private volatile boolean isLoadNormal;
+
+    private String mCurretnUuid;
 
     /**
      * @param obj
      */
     @Override
     public void onMsgReceived(MogoSnapshotSetData obj) {
-//        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
-        if (obj != null) { //如果多个点，如何处理，点击的时候
+        Logger.d(TAG, "onMsgReceived  cameralive : " + obj);
+        if (obj != null) {
             mCloudRoadData = obj.getCamera();
             if (mCloudRoadData != null) {
-                Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl());
-                Log.d(TAG, "mCurrentlat = " + mCurrentlat + "--mCurrentlon = " + mCurrentlon + "---mCloudRoadData.getLat() = " + mCloudRoadData.getLat() + "--mCloudRoadData.getLon() = " + mCloudRoadData.getLon());
-                if (mCurrentlat == mCloudRoadData.getLat() && mCurrentlon == mCloudRoadData.getLon()) {
-                    //TODO
+                Log.e(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurretnUuid = " + mCurretnUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
+                if (mCurretnUuid != null && mCurretnUuid.equals(mCloudRoadData.getUuid())) {
+                    Log.d(TAG, "isLoadVr = " + isLoadVr + "....isLoadNormal = " + isLoadNormal);
+                    if (isVrMode) {
+                        if (!isLoadVr) {
+                            addVrCameraMarker(mCloudRoadData);
+                            isLoadVr = true;
+                            isLoadNormal = false;
+                        }
+                    } else {
+                        if (!isLoadNormal) {
+                            addNormalCameraMarker(mCloudRoadData);
+                            isLoadNormal = true;
+                            isLoadVr = false;
+                        }
+                    }
                 } else {
-                    removeCameraMarker();
-                    addCameraMarker(mCloudRoadData);
-                    mCurrentlat = mCloudRoadData.getLat();
-                    mCurrentlon = mCloudRoadData.getLon();
+                    if (isVrMode) {
+                        addVrCameraMarker(mCloudRoadData);
+                    } else {
+                        addNormalCameraMarker(mCloudRoadData);
+                    }
+                    mCurretnUuid = mCloudRoadData.getUuid();
                 }
             } else {
                 //删除marker
-                Logger.e(TAG, "onMsgReceived mCloudRoadData == null ");
-                UiThreadHandler.postDelayed(() -> {
-                    removeCameraMarker();
-                }, 1_000);
+                removeCameraMarker();
+
+//                Log.e(TAG, "onMsgReceived mCloudRoadData == null ");
+//                UiThreadHandler.postDelayed(() -> {
+//
+//                }, 1_000);
             }
         } else {
-            Log.e(TAG, "onMsgReceived  obj == null ");
+            Logger.e(TAG, "onMsgReceived  obj == null ");
         }
     }