diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapCameraInfoView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapCameraInfoView.java new file mode 100644 index 0000000000..d6f3990014 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapCameraInfoView.java @@ -0,0 +1,66 @@ +package com.mogo.module.common.drawer.marker; + +import android.content.Context; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.mogo.map.marker.MogoMarkerOptions; +import com.mogo.module.common.ModuleNames; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.R; +import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.common.entity.MarkerShareMusic; +import com.mogo.module.common.entity.MarkerShowEntity; +import com.mogo.module.common.marker.PoiWrapper; +import com.mogo.module.common.utils.CloudPoiManager; +import com.mogo.utils.logger.Logger; + +/** + * author : donghongyu + * e-mail : 1358506549@qq.com + * date : 2020-01-0619:55 + * desc : 地图Marker图标带文本信息 + * version: 1.0 + */ +public class MapCameraInfoView extends MapMarkerBaseView { + private String TAG = "MapCameraInfoView"; + + private ImageView mCameraImage; + + + public MapCameraInfoView(Context context ) { + super( context ); + } + + public MapCameraInfoView(Context context, @Nullable AttributeSet attrs ) { + super( context, attrs ); + } + + public MapCameraInfoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { + super( context, attrs, defStyleAttr ); + } + + public MapCameraInfoView(Context context, MogoMarkerOptions options ) { + super( context ); + mOptions = options; + } + + @Override + protected void initView( Context context ) { + LayoutInflater.from( context ).inflate( R.layout.modudle_camera_layout_info, this ); + mCameraImage = findViewById( R.id.iv_camera_traffic); + } + + @Override + public void updateView( MarkerShowEntity markerShowEntity ) { + + } + +} diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png new file mode 100644 index 0000000000..3f41ce4252 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png differ diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml new file mode 100644 index 0000000000..360fbb6d4a --- /dev/null +++ b/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java new file mode 100644 index 0000000000..d87fcb9e0f --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java @@ -0,0 +1,33 @@ +package com.mogo.module.extensions.live; + +import android.content.Context; +import android.view.View; + +import com.mogo.map.marker.IMogoInfoWindowAdapter; +import com.mogo.map.marker.IMogoMarker; +import com.mogo.map.marker.MogoMarkerOptions; +import com.mogo.module.common.drawer.marker.IMarkerView; +import com.mogo.module.common.drawer.marker.MapCameraInfoView; +import com.mogo.module.common.drawer.marker.MapMarkerAdapter; +import com.mogo.module.common.drawer.marker.MapMarkerView; +import com.mogo.module.common.entity.MarkerShowEntity; + +/** + * @author lixiaopeng + * @since 2020/12/16 + * 描述 + */ +public class CameraWindow3DAdapter implements IMogoInfoWindowAdapter { + private Context mContext; + private MogoMarkerOptions mOptions; + + public CameraWindow3DAdapter(Context context, MogoMarkerOptions options) { + this.mContext = context; + this.mOptions = options; + } + + @Override + public View getInfoWindow(IMogoMarker marker) { + return new MapCameraInfoView(mContext, mOptions); + } +} 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 ea620b0f1f..5e985d205c 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 @@ -4,15 +4,20 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.util.Log; +import android.view.View; +import com.mogo.commons.AbsMogoApplication; +import com.mogo.map.marker.IMogoInfoWindowAdapter; 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.drawer.marker.RoadConditionInfoWindow3DAdapter; import com.mogo.module.common.entity.CloudRoadData; import com.mogo.module.common.entity.MogoSnapshotSetData; import com.mogo.module.extensions.R; import com.mogo.module.extensions.live.CameraLiveManager; +import com.mogo.module.extensions.live.CameraWindow3DAdapter; import com.mogo.module.extensions.live.ExtensionServiceManager; import com.mogo.module.extensions.live.PushDataType; import com.mogo.service.connection.IMogoOnWebSocketMessageListener; @@ -23,7 +28,6 @@ import com.mogo.utils.logger.Logger; /** * vr模式下,红绿灯消息 AdasNoticeHelper - * */ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { private static final String TAG = "liyz"; @@ -35,16 +39,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { -// 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); -// addCameraMarker(mCloudRoadData); -// }, 2_000 ); + } public void enterVrMode() { @@ -64,6 +59,16 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { +// 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); +// addCameraMarker(mCloudRoadData); +// }, 2_000); + } @@ -74,6 +79,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener { + Logger.e(TAG, "onMsgReceived mCloudRoadData == null "); + UiThreadHandler.postDelayed(() -> { removeCameraMarker(); - }, 1_000 ); + }, 1_000); } } else { Log.e(TAG, "onMsgReceived obj == null ");