diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b892d6479b..cfc605c98e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -84,6 +84,7 @@ diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index 81cacb5570..69b1640fab 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -183,7 +183,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin WebSocketData webSocketData = GsonUtil.objectFromJson(message, WebSocketData.class); int msgType = webSocketData.getMsgType(); Logger.d(TAG, "websocket received msg type = " + msgType); - +// Logger.d("liyz", "websocket received msg = " + message + "----type = " + msgType); //服务端下发数据返回，上传数据回执默认不返回 if (msgType == MSG_TYPE_DOWNLINK_CAR_DATA.getMsgType()) { List listeners = mListeners.get(msgType); @@ -192,6 +192,7 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin while (iterator.hasNext()) { IMogoOnWebSocketMessageListener listener = iterator.next(); if (listener != null) { +// Logger.d("liyz", "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData()); Logger.d(TAG, "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData()); Object receiveObj = GsonUtil.objectFromJson(webSocketData.getData(),listener.target()); listener.onMsgReceived(receiveObj); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java index 60f7f59746..c76f444a51 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java @@ -34,7 +34,6 @@ public class EntranceProvider implements IMogoModuleProvider { public Fragment createFragment( Context context, Bundle data ) { mFragment = new EntranceFragment(); mFragment.setArguments( data ); - Log.d("liyz", " createFragment ------> "); ExtensionServiceManager.init(context); return mFragment; } @@ -77,7 +76,6 @@ public class EntranceProvider implements IMogoModuleProvider { @Override public void init( Context context ) { - Log.d("liyz", " EntranceProvider init ------> "); ExtensionServiceManager.init(context); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java index 601f041786..19c37173f7 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java @@ -28,7 +28,7 @@ import com.tencent.rtmp.ui.TXCloudVideoView; * V2XLiveGSYVideoView */ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkinCompatSupportable { - private static final String TAG = "CameraLiveGSYVideoView"; + private static final String TAG = "liyz"; private TXCloudVideoView mTxcVideoView; private ProgressBar mLoading; @@ -150,6 +150,7 @@ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkin } } catch (Exception e) { e.printStackTrace(); + Logger.w(TAG, "播放器：onNetStatus e = " + e); mLoading.setVisibility(GONE); mClLoadError.setVisibility(VISIBLE); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java index 4debd09358..60285cc361 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java @@ -17,28 +17,28 @@ import com.mogo.utils.logger.Logger; * 路边摄像头直播控制 V2XPushLiveCarScenario */ public class CameraLiveManager extends AbsCameraScenario implements IMogoTopViewStatusListener { - private static final String TAG = "CameraLiveManager"; - private static CameraLiveManager mCameraLiveCarScenario; + private static final String TAG = "liyz"; + private static CameraLiveManager mCameraLiveManager; private boolean isShowWindow; private CameraLiveManager() { } public static CameraLiveManager getInstance() { - if (mCameraLiveCarScenario == null) { + if (mCameraLiveManager == null) { synchronized (CameraLiveManager.class) { - if (mCameraLiveCarScenario == null) { - mCameraLiveCarScenario = new CameraLiveManager(); - mCameraLiveCarScenario.setV2XWindow(new PushCameraLiveWindow()); + if (mCameraLiveManager == null) { + mCameraLiveManager = new CameraLiveManager(); + mCameraLiveManager.setV2XWindow(new PushCameraLiveWindow()); } } } - return mCameraLiveCarScenario; + return mCameraLiveManager; } @Override public void init(@Nullable CloudRoadData cloudRoadData) { - Log.d(TAG, "CameraLiveManager init -----> "); + Log.d(TAG, "CameraLiveManager init -----> isShowWindow = " + isShowWindow); if (isShowWindow) { close(); } @@ -54,11 +54,10 @@ public class CameraLiveManager extends AbsCameraScenario implemen @Override public void showWindow() { - Log.d(TAG, "CameraLiveManager showWindow --------"); + Log.d(TAG, "CameraLiveManager showWindow getV2XWindow = " + getV2XWindow()); if (getV2XWindow() != null) { ViewGroup.LayoutParams layoutParams = - new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, + new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) AbsMogoApplication.getApp().getResources() .getDimension(R.dimen.module_video_window_height_content)); @@ -67,7 +66,6 @@ public class CameraLiveManager extends AbsCameraScenario implemen .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this); getV2XWindow().show(getmCloudRoadData()); isShowWindow = true; -// ExtensionServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, true); } } @@ -77,7 +75,6 @@ public class CameraLiveManager extends AbsCameraScenario implemen getV2XWindow().close(); } isShowWindow = false; -// ExtensionServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false); } @Override diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java index 70c79b5528..f408132cbe 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java @@ -77,7 +77,7 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo Logger.w(TAG, "更新直播信息 show entity = " + entity); if (!TextUtils.isEmpty(entity.getRtmpUrl())) { Logger.w(TAG, "entity.getRtmpUrl() = " + entity.getRtmpUrl()); - mIvReportHead.setVisibility(VISIBLE); + mIvReportHead.setVisibility(INVISIBLE); ExtensionServiceManager.getImageLoader() .displayImage(entity.getRtmpUrl(), mIvReportHead); mLiveGSYVideoView.startLive(entity.getRtmpUrl()); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java index 2449ff7ebf..40de273e4a 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java @@ -3,16 +3,12 @@ package com.mogo.module.extensions.utils; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.text.TextUtils; import android.util.Log; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.network.Utils; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.constants.DataTypes; import com.mogo.module.common.entity.CloudRoadData; import com.mogo.module.common.entity.MogoSnapshotSetData; import com.mogo.module.extensions.R; @@ -30,15 +26,25 @@ import com.mogo.utils.logger.Logger; * */ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { - private static final String TAG = "CameraLiveNoticeHelper"; + private static final String TAG = "liyz"; private Context mContext; private static IMogoMarker mMogoMarker; private CloudRoadData mCloudRoadData; public void init(Context context) { - Logger.d(TAG, "init===="); + Logger.d(TAG, "init ======= "); mContext = context; + + //test +// UiThreadHandler.postDelayed( () -> { +// mCloudRoadData = new CloudRoadData(); +// mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv"); +// mCloudRoadData.setLat(40.200353); +// mCloudRoadData.setLon(116.745467); +// CameraLiveManager.getInstance().init(mCloudRoadData); +// }, 2_000 ); + ExtensionServiceManager .getMogoRegisterCenter().registerMogoMarkerClickListener(PushDataType.TYPE_PUSH_CAMERA_DATA, new IMogoMarkerClickListener() { @Override @@ -70,23 +76,19 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener @@ -32,6 +31,6 @@ app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" app:miv_shapeBorderWidth="@dimen/dp_4" - tools:visibility="visible" /> + tools:visibility="invisible" /> \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml b/modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml index a444b15a4a..56e9b73045 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/camera_push_live_video.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/rlRoadEventDetail" android:layout_width="match_parent" - android:layout_height="@dimen/v2x_video_window_height_content" + android:layout_height="@dimen/module_video_window_height_content" android:clipToPadding="false"> 0px -6px 20px - 370px + 300px + 400px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index 286f0b120f..b268db611b 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -14,6 +14,6 @@ -1 0px 20px - 370px - + 300px + 400px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 9d0821625b..ca06e7f314 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -161,5 +161,6 @@ 0px 36px - 664px + 393px + 700px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index f35e24782f..ca44fd8dcb 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -178,6 +178,7 @@ 20px 36px - 664px + 393px + 700px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 173e3fb522..30d6518fb6 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -238,7 +238,8 @@ 36px 21px 21px + 400px + 300px - 370px \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index c3f8748bea..1959a9947e 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -122,6 +122,10 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { } if (descriptor == StatusDescriptor.VR_MODE) { + if (mWindowView == null) { + return; + } + ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView); mHasAddWindow = false; addWindowView();