diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml index 1d5b878f9a..212cf333c6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml @@ -136,7 +136,7 @@ android:layout_marginEnd="155dp" android:layout_marginBottom="231dp" android:orientation="vertical" - app:bgColor="@color/transparent_white_30" + app:bgColor="@color/color_B3FFFFFF" app:blurRadius="@dimen/dp_60" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 472d250d3e..03546930cc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -105,17 +105,17 @@ class AutoPilotStatusView @JvmOverloads constructor( when (autopilotStatus) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常 setBackgroundResource(R.drawable.module_hmi_autopilot_status_disabled_bg) - tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_disable)) + tvStatusDes.setTextColor(resources.getColor(R.color.color_4DFFFFFF)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status_disabled) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// 可自动驾驶，目前处于人工干预状态 setBackgroundResource(R.drawable.module_hmi_autopilot_status_enable_bg) - tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) + tvStatusDes.setTextColor(resources.getColor(R.color.color_white)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status) } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {// 自动驾驶中 setBackgroundResource(R.drawable.module_hmi_autopilot_status_checked_bg) - tvStatusDes.setTextColor(resources.getColor(R.color.module_mogo_autopilot_status_enable)) + tvStatusDes.setTextColor(resources.getColor(R.color.color_white)) ivStatusIcon.setImageResource(R.drawable.icon_autopilot_status) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml index a71a8d7f20..216285d585 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_perspective_switch.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:paddingLeft="@dimen/module_switch_margin_left" android:text="@string/module_map_model_normal" - android:textColor="@color/module_ext_color_voice_text" + android:textColor="@color/color_white" android:textSize="@dimen/module_switch_text_size" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index dc735bb312..574b9fc2f3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -39,17 +39,7 @@ #FF333333 #FFCCCCCC - #FF2966EC - #FFA7B6F0 - #B3FFFFFF - #99000000 - #E63B4577 - #3E7BFE - #1F9BFE - #8E9DD4 - #4D000000 - #66B8BFE8 - #AFB3C7 + #6D7BAF diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java index acb38623e6..7fdf5de722 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/TestPanelBroadcastReceiver.java @@ -76,24 +76,10 @@ public class TestPanelBroadcastReceiver extends BroadcastReceiver { // 存储本地，出行动态作展示 saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, v2XMessageEntity.getContent().getNoveltyInfo()); - } else if (sceneType == 9) {//触发他人发起道路求助事件 - V2XMessageEntity> v2XMessageEntity = - TestOnLineCarUtils.getV2XScenarioSeekHelpData(); - - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); } else if (sceneType == 10) {//触发事件UGC V2XMessageEntity v2XMessageEntity = TestOnLineCarUtils.getV2XScenarioRoadEventUGCData(); - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); - } else if (sceneType == 11) {//触发违章停车事件 - V2XMessageEntity> v2XMessageEntity = - TestOnLineCarUtils.getV2XIllegalParkData(); - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/TestOnLineCarUtils.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/TestOnLineCarUtils.java index 65b023b98d..fc0edf6041 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/TestOnLineCarUtils.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/TestOnLineCarUtils.java @@ -28,40 +28,6 @@ import java.util.List; */ public class TestOnLineCarUtils { - - /** - * 获取测试的违章停车数据 - */ - public static V2XMessageEntity> getV2XIllegalParkData() { - try { - InputStream inputStream = Utils.getApp().getResources().openRawResource(R.raw.illegal_park_data); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] buffer = new byte[1024]; - while ((len = inputStream.read(buffer)) != -1) { - baos.write(buffer, 0, len); - } - inputStream.close(); - - // 加载数据源 - MarkerResponse markerResponse = GsonUtil.objectFromJson(baos.toString(), MarkerResponse.class); - - V2XMessageEntity> v2xMessageEntity = new V2XMessageEntity<>(); - // 控制类型 - v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING); - // 设置数据 - v2xMessageEntity.setContent(markerResponse.getResult().getExploreWay()); - // 控制展示状态 - v2xMessageEntity.setShowState(true); - return v2xMessageEntity; - - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** * 模拟道路事件测试数据 */ @@ -183,76 +149,6 @@ public class TestOnLineCarUtils { return null; } - - /** - * 模拟 道路求助 - */ - public static V2XMessageEntity> getV2XScenarioSeekHelpData() { - try { - InputStream inputStream = Utils.getApp() - .getResources() - .openRawResource(R.raw.scenario_seek_help); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] buffer = new byte[1024]; - while ((len = inputStream.read(buffer)) != -1) { - baos.write(buffer, 0, len); - } - inputStream.close(); - - // 加载数据源 - V2XSpecialCarRes v2xRoadEventEntity = - GsonUtil.objectFromJson(baos.toString(), V2XSpecialCarRes.class); - - V2XMessageEntity> v2xMessageEntity = new V2XMessageEntity<>(); - // 控制类型 - v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING); - // 设置数据 - v2xMessageEntity.setContent(v2xRoadEventEntity.getCoordinates()); - // 控制展示状态 - v2xMessageEntity.setShowState(true); - return v2xMessageEntity; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** - * 模拟 后方VIP - */ - public static V2XMessageEntity> getV2XScenarionVRBehindVIPData() { - try { - InputStream inputStream = Utils.getApp() - .getResources() - .openRawResource(R.raw.scenario_push_vr_hehind_vip_data); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] buffer = new byte[1024]; - while ((len = inputStream.read(buffer)) != -1) { - baos.write(buffer, 0, len); - } - inputStream.close(); - - // 加载数据源 - V2XSpecialCarRes v2xRoadEventEntity = - GsonUtil.objectFromJson(baos.toString(), V2XSpecialCarRes.class); - - V2XMessageEntity> v2xMessageEntity = new V2XMessageEntity<>(); - // 控制类型 - v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING); - // 设置数据 - v2xMessageEntity.setContent(v2xRoadEventEntity.getCoordinates()); - // 控制展示状态 - v2xMessageEntity.setShowState(true); - return v2xMessageEntity; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - /** * 模拟最优路线推送 */ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java deleted file mode 100644 index 8f9c8a2494..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java +++ /dev/null @@ -1,266 +0,0 @@ -package com.mogo.eagle.core.function.v2x.events.view; - -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; -import static com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer.PLAY_EVT_PLAY_BEGIN; -import static com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer.PLAY_EVT_PLAY_LOADING; - -import android.content.Context; -import android.content.Intent; -import android.graphics.PorterDuff; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.widget.ProgressBar; -import android.widget.TextView; - -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.core.content.ContextCompat; - -import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack; -import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive; -import com.mogo.commons.voice.AIAssist; -import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.data.map.entity.MarkerCarInfo; -import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; -import com.mogo.eagle.core.function.v2x.R; -import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; -import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; -import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceManager; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.util.Utils; -import com.mogo.eagle.core.widget.RoundLayout; -import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer; -import com.shuyu.gsyvideoplayer.GSYVideoManager; -import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; -import com.shuyu.gsyvideoplayer.cache.CacheFactory; -import com.shuyu.gsyvideoplayer.cache.ProxyCacheManager; -import com.shuyu.gsyvideoplayer.model.VideoOptionModel; -import com.shuyu.gsyvideoplayer.player.IjkPlayerManager; -import com.shuyu.gsyvideoplayer.player.PlayerFactory; -import com.shuyu.gsyvideoplayer.utils.GSYVideoType; - -import java.util.ArrayList; -import java.util.List; - -import tv.danmaku.ijk.media.player.IjkMediaPlayer; - -/** - * author : donghongyu - * e-mail : 1358506549@qq.com - * date : 2020-02-06 23:07 - * update : 2021-04-01 17:30 - * version: 1.0 - */ -public class V2XCrossRoadVideoView extends RoundLayout { - - private static final String TAG = "CrossRoadVideo"; - - private SimpleVideoPlayer mTxcVideoView; - private final GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder(); - private ProgressBar mLoading; - private ConstraintLayout mClLoadError; - private boolean init = false; - - private MarkerCarInfo.CarLiveInfo mCarLiveInfo; - // 重新刷新直播流 - private final V2XVoiceCallbackListener v2XVoiceCallbackRefreshListener = new V2XVoiceCallbackListener() { - @Override - public void onCallback(String command, Intent intent) { - mLoading.setVisibility(VISIBLE); - mClLoadError.setVisibility(GONE); - if (mCarLiveInfo != null) { - startLive(mCarLiveInfo); - } - } - }; - - public V2XCrossRoadVideoView(Context context) { - this(context, null); - } - - public V2XCrossRoadVideoView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public V2XCrossRoadVideoView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - CallerLogger.INSTANCE.d(M_V2X + TAG, "constructor invoke initView"); - initView(context); - } - - private void initView(Context context) { - if (init) { - return; - } - CallerLogger.INSTANCE.d(M_V2X + TAG, "V2X===初始化语音呼叫路口直播视图"); - LayoutInflater.from(context) - .inflate(R.layout.view_video_layout_see_crossroad, this); - //mPlayerView 即 step1 中添加的界面 view - mTxcVideoView = findViewById(R.id.txcVideoView); - initGSYVideoConfig(); - - mLoading = findViewById(R.id.loading); - mLoading.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(context, R.color.live_video_progress_bar_loading_color), PorterDuff.Mode.MULTIPLY); - - mClLoadError = findViewById(R.id.clLoadError); - TextView mTvRefreshButton = findViewById(R.id.tvRefreshButton); - mTvRefreshButton.setOnClickListener(v -> { - mLoading.setVisibility(VISIBLE); - mClLoadError.setVisibility(GONE); - if (mCarLiveInfo != null) { - startLive(mCarLiveInfo); - } - }); - init = true; - } - - private void initGSYVideoConfig() { - PlayerFactory.setPlayManager(IjkPlayerManager.class); - CacheFactory.setCacheManager(ProxyCacheManager.class); - List list = new ArrayList<>(); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "rtsp_transport", "tcp")); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "rtsp_flags", "prefer_tcp")); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "allowed_media_types", "video")); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "timeout", 20000)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "buffer_size", 1316)); - - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "infbuf", 1)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzeduration", 1)); - - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "probesize", 10240)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "flush_packets", 1)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_clear", 1)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "dns_cache_timeout", -1)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzeduration", 1)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "packet-buffering", 0)); - list.add(new VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "reconnect", 10)); - - GSYVideoManager.instance().setOptionModelList(list); - GSYVideoType.enableMediaCodec(); - GSYVideoType.enableMediaCodecTexture(); - GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL); - } - - /** - * 设置直播信息 - */ - public void setCarLiveInfo(MarkerCarInfo.CarLiveInfo carLiveInfo) { - mCarLiveInfo = carLiveInfo; - } - - /** - * 开始直播 - * - * @param carLiveInfo 要直播的设备信息，如果没有直播的地址需要重新获取最新的直播地址 - */ - public void startLive(MarkerCarInfo.CarLiveInfo carLiveInfo) { - // 进行直播播放 - if (mTxcVideoView != null - && carLiveInfo != null) { - if (!TextUtils.isEmpty(carLiveInfo.getVideoUrl())) { - setCarLiveInfo(carLiveInfo); - playLiveVideo(carLiveInfo); - } - //重新获取直播流地址 - else { - MogoLocation mogoLocation = CallerMapLocationListenerManager.INSTANCE.getCurrentLocation(); - if (mogoLocation == null) { - return; - } - MoGoAiCloudTrafficLive.viewFrontIntersectionLive(mogoLocation.getLatitude(), mogoLocation.getLongitude(), ((int) mogoLocation.getBearing()), new ITrafficIntersectionLiveCallBack() { - @Override - public void liveUrlResult(String liveUrl) { - if (!TextUtils.isEmpty(liveUrl)) { - MarkerCarInfo.CarLiveInfo carLiveInfo = new MarkerCarInfo.CarLiveInfo(); - carLiveInfo.setVideoUrl(liveUrl); - setCarLiveInfo(carLiveInfo); - playLiveVideo(carLiveInfo); - } else { - CallerLogger.INSTANCE.d(M_V2X + TAG, "startLive 路口实况直播地址为空"); - } - } - - @Override - public void onError(String errorMsg) { - CallerLogger.INSTANCE.d(M_V2X + TAG, "获取路口实况失败"); - } - }); - } - } - } - - /** - * 播放直播流，且开始心跳 - */ - private void playLiveVideo(MarkerCarInfo.CarLiveInfo carLiveInfo) { - if (mTxcVideoView != null) { - mTxcVideoView.setPlayListener(event -> { - CallerLogger.INSTANCE.d(M_V2X + TAG, "播放器：onPlayEvent==" + event); - if (event == PLAY_EVT_PLAY_LOADING) { - mLoading.setVisibility(VISIBLE); - mClLoadError.setVisibility(GONE); - } else if (event == PLAY_EVT_PLAY_BEGIN) { - refreshStatusToListener(true); - mLoading.setVisibility(GONE); - mClLoadError.setVisibility(GONE); - } else if (event < 0) { - refreshStatusToListener(false); - AIAssist.getInstance(Utils.getApp()).speakTTSVoiceWithLevel("直播获取识败，可以对我说重试", AIAssist.LEVEL3); - stopLive(); - mLoading.setVisibility(GONE); - mClLoadError.setVisibility(VISIBLE); - // 注册语音交互 - V2XVoiceManager.INSTANCE - .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP, - v2XVoiceCallbackRefreshListener); - } - }); - gsyVideoOptionBuilder.setUrl(carLiveInfo.getVideoUrl()).setCacheWithPlay(false).setPlayTag(TAG) - .build(mTxcVideoView); - mTxcVideoView.getStartButton().performClick(); - } - } - - public void stopLive() { - try { - CallerLogger.INSTANCE.d(M_V2X + TAG, "关闭直播..."); - GSYVideoManager.releaseAllVideos(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - if (mCarLiveInfo != null) { - startLive(mCarLiveInfo); - } - } - - @Override - protected void onDetachedFromWindow() { - stopLive(); - mLoading.setVisibility(VISIBLE); - // 反注册语音交互 - V2XVoiceManager.INSTANCE - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_REFRESH_LIVE_UN_WAKEUP); - super.onDetachedFromWindow(); - } - - private void refreshStatusToListener(boolean videoPlaying) { - if (onVideoStatusChange != null) { - onVideoStatusChange.videoPlaying(videoPlaying); - } - } - - private OnVideoStatusChange onVideoStatusChange; - - public void addOnVideoStatusChangeListener(OnVideoStatusChange onVideoStatusChange) { - this.onVideoStatusChange = onVideoStatusChange; - } - - public interface OnVideoStatusChange { - void videoPlaying(boolean videoPlaying); - } -} diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml deleted file mode 100644 index 383effa7da..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/color/radiobutton_textcolor.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/color/radiobutton_textcolor.xml deleted file mode 100644 index 8c93dd733b..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/color/radiobutton_textcolor.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png deleted file mode 100644 index e02a57044f..0000000000 Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png deleted file mode 100644 index a1da551655..0000000000 Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png deleted file mode 100644 index dabf25dbbb..0000000000 Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/icon_live_load_error.png b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/icon_live_load_error.png deleted file mode 100644 index a1da551655..0000000000 Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/icon_live_load_error.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/v2x_refresh_button_bg.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/v2x_refresh_button_bg.xml deleted file mode 100644 index 0fcf244473..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable/v2x_refresh_button_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_video_layout_see_crossroad.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_video_layout_see_crossroad.xml deleted file mode 100644 index 925f9fea29..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_video_layout_see_crossroad.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json new file mode 100644 index 0000000000..93e2047777 --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json @@ -0,0 +1,45 @@ +{ + "distance":494.7102966308594, + "expireTime":20000, + "isShowEventButton":false, + "location":{ + "address":"北三环环球贸易中心", + "angle":270, + "lat":39.969055, + "lon":116.410811 + }, + "noveltyInfo":{ + "addr":"北三环环球贸易中心", + "canLive":false, + "cityName":"", + "direction":0, + "distance":670, + "fileType":1, + "generateTime":1593587904096, + "infoId":"72790596316958720000", + "items":[ + { + "illegalCount":0, + "thumbnail":"http://yycp-beijing.myqcloud.com/sso-server-image/1592473692394.jpeg", + "url":"http://yycp-static-1255510688.coom/sso-server-image/1592473692394.jpeg" + } + ], + "location":{ + "address":"北三环环球贸易中心", + "angle":270, + "lat":39.969055, + "lon":116.410811 + }, + "poiType":"10024", + "type":"CARD_TYPE_ROAD_CONDITION", + "uploadType":"2", + "userInfo":{ + "safeLabelType":0, + "sn":"ZD801B1932L00041", + "userHead":"http:\/\/yycp-static-1255510688.cos.ap-beijing.myqcloud.com\/sso-server-image\/1592473692394.jpeg", + "userId":0, + "userName":"零下的雨" + } + }, + "poiType":"10024" +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json new file mode 100644 index 0000000000..81d56ce14b --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -0,0 +1,21 @@ +{ + "type": 2, + "lat": 26.879024, + "lon": 112.568783, + "distance": 2.234, + "collisionLat": 26.8791769, + "collisionLon": 112.56896496, + "stopLines": [ + + ], + "from": 1, + "angle": 220, + "direction": 2, + "speed": 11.108121, + "targetColor": "#FF4040", + "stopLineDistance": 60, + "warningContent": "注意自行车", + "heading": 0, + "showTime": 3, + "roadwidth": 4.0 +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json new file mode 100644 index 0000000000..b4ecc975bb --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -0,0 +1,19 @@ +{ + "type": 1, + "lat": 26.851909, + "lon": 112.571751, + "distance": 40.119, + "collisionLat": 26.85198163866211, + "collisionLon": 112.57059540184451, + "stopLines": [ + ], + "from": 1, + "angle": 240, + "direction": 3, + "speed": 11.108121, + "stopLineDistance": 60, + "warningContent": "小心行人", + "heading": 76, + "showTime": 3, + "roadwidth": 4.0 +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json new file mode 100644 index 0000000000..f7a4f98d26 --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -0,0 +1,20 @@ +{ + "type": 4, + "lat": 26.879339, + "lon": 112.568933, + "distance": 2.845, + "collisionLat": 26.8791769, + "collisionLon": 112.56896496, + "stopLines": [ + ], + "from": 1, + "angle": 260, + "direction": 4, + "speed": 11.108121, + "targetColor": "#FF4040", + "stopLineDistance": 60, + "warningContent": "注意摩托车", + "heading": 0, + "showTime": 3, + "roadwidth": 4.0 +} diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json new file mode 100644 index 0000000000..ddbe44c4da --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json @@ -0,0 +1,94 @@ +[ + { + "lon": 116.417695, + "lat": 39.976655 + }, + { + "lon": 116.417636, + "lat": 39.977925 + }, + { + "lon": 116.417577, + "lat": 39.97876 + }, + { + "lon": 116.417545, + "lat": 39.979578 + }, + { + "lon": 116.417475, + "lat": 39.981111 + }, + { + "lon": 116.417443, + "lat": 39.981933 + }, + { + "lon": 116.4174, + "lat": 39.982718 + }, + { + "lon": 116.417341, + "lat": 39.98398 + }, + { + "lon": 116.417293, + "lat": 39.984999 + }, + { + "lon": 116.417266, + "lat": 39.98583 + }, + { + "lon": 116.417228, + "lat": 39.986697 + }, + { + "lon": 116.417169, + "lat": 39.987844 + }, + { + "lon": 116.417164, + "lat": 39.988312 + }, + { + "lon": 116.417164, + "lat": 39.988916 + }, + { + "lon": 116.417164, + "lat": 39.989956 + }, + { + "lon": 116.417185, + "lat": 39.990914 + }, + { + "lon": 116.417175, + "lat": 39.991654 + }, + { + "lon": 116.417148, + "lat": 39.992952 + }, + { + "lon": 116.417159, + "lat": 39.993783 + }, + { + "lon": 116.41718, + "lat": 39.994843 + }, + { + "lon": 116.417191, + "lat": 39.99557 + }, + { + "lon": 116.417234, + "lat": 39.996577 + }, + { + "lon": 116.417362, + "lat": 39.997641 + } +] \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json new file mode 100644 index 0000000000..d3c95b323c --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json @@ -0,0 +1,52 @@ +{ + "current_lane_id": "010", + "current_lane_num": -2, + "gd_locus_list": [ + { + "lat": 39.976285, + "lon": 116.417649 + }, + { + "lat": 39.976341, + "lon": 116.417642 + }, + { + "lat": 39.97637, + "lon": 116.417639 + }, + { + "lat": 39.976397, + "lon": 116.417638 + }, + { + "lat": 39.976428, + "lon": 116.417637 + } + ], + "locus_list": [ + { + "lat": 39.974879535063, + "lon": 116.411399349271 + }, + { + "lat": 39.974936309753, + "lon": 116.411392282881 + }, + { + "lat": 39.974965397592, + "lon": 116.411389554398 + }, + { + "lat": 39.974992457492, + "lon": 116.411388118996 + }, + { + "lat": 39.975023263289, + "lon": 116.41138715302 + } + ], + "most_lane_num": -1, + "most_speed": 9.0, + "road_id": "400140", + "sn": "F803EB2046PZD00207" +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml deleted file mode 100644 index 162b8df252..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 445dp - - 18dp - 20dp - - 190dp - 210dp - - - 82dp - - - - 34dp - 22dp - - 40dp - - 6dp - - 550dp - 200dp - 200dp - 100dp - 50dp - 90dp - 36dp - 40dp - 15dp - 150dp - 48dp - 32dp - 28dp - 28dp - 190dp - 238dp - 170dp - 43dp - 26dp - 12dp - 8dp - 2dp - 30dp - 22dp - - 12dp - 16dp - - 24dp - 18dp - 20dp - 16dp - 28dp - - 82dp - 16dp - 117dp - 50dp - 17dp - 14dp - 36dp - 22dp - 16dp - 20dp - 15dp - 34dp - 15dp - 29dp - -8dp - 84dp - - 16dp - 20dp - 6dp - - - 10dp - 20dp - 16dp - 31dp - 20dp - 150dp - 54dp - 64dp - - - 190dp - 250dp - 156dp - 234dp - - - 136dp - - 41dp - 18dp - 14dp - 44dp - 19dp - - - 100dp - 32dp - - - - 572dp - 480dp - 384dp - - - 460dp - 370dp - 380dp - 84dp - 26dp - 14dp - - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml deleted file mode 100644 index cd4b17da43..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 445dp - - 18dp - 20dp - - 190dp - 210dp - - - 82dp - - - - - 34dp - 22dp - - 40dp - - 6dp - - 550dp - 200dp - 200dp - 100dp - 50dp - 90dp - 36dp - 40dp - 15dp - 150dp - 48dp - 32dp - 28dp - 28dp - 190dp - 238dp - 170dp - 43dp - 26dp - 12dp - 8dp - 2dp - 30dp - 22dp - 14dp - 12dp - 16dp - - 24dp - 18dp - 20dp - 16dp - 28dp - - 82dp - 16dp - 117dp - 50dp - 17dp - 14dp - 36dp - 22dp - 16dp - 20dp - 34dp - 16dp - 29dp - -8dp - 84dpw - - 16dp - 20dp - 3dp - - - 10dp - 20dp - 16dp - 31dp - 20dp - 150dp - 54dp - 64dp - - - 190dp - 250dp - 156dp - 234dp - - - 136dp - - 41dp - 18dp - 14dp - 44dp - 19dp - - - 100dp - 32dp - - - - 572dp - 486dp - 384dp - - - 460dp - 370dp - 380dp - 84dp - 26dp - 14dp - - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml deleted file mode 100644 index 55d6d11077..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - 800dp - - 32dp - 32dp - - 390dp - 410dp - - - 160dp - - - 60dp - 40dp - - 80dp - - 15dp - 550dp - 200dp - 200dp - 100dp - 90dp - 162dp - 64dp - 80dp - 26dp - 270dp - 86dp - 58dp - 48dp - 48dp - 349dp - 465dp - 306dp - 77dp - 50dp - 28dp - 16dp - 5dp - 80dp - 22dp - - 20dp - 30dp - - 42dp - 30dp - 36dp - 30dp - 50dp - - 120dp - - 158dp - - - 20dp - 36dp - 28dp - 55dp - 36dp - 310dp - 110dp - 120dp - - - 270dp - 480dp - 330dp - 450dp - - - 200dp - - 75dp - 32dp - 26dp - 80dp - 34dp - - - 100dp - 32dp - - - - 940dp - 701dp - 150dp - 46dp - 26dp - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml deleted file mode 100644 index 8fa468641c..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 1100dp - 227dp - 187dp - 30dp - 133dp - 133dp - 38dp - 42dp - 12dp - 40dp - - 778dp - 687dp - 200dp - 10dp - 487dp - 778dp - - 234dp - 1067dp - 187dp - 28dp - - 107dp - 47dp - - 35dp - 48dp - 35dp - 36dp - 80dp - 108dp - - 53dp - - 200dp - 854dp - 187dp - 133dp - 133dp - 480dp - 42dp - 40dp - - - 133dp - 42dp - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index d24085079b..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - 800dp - - 615dp - 32dp - 32dp - 1060dp - 583dp - 366dp - 160dp - 0dp - 32dp - 0dp - 390dp - 410dp - - 670dp - 526dp - 20dp - - 147dp - 60dp - 40dp - - 80dp - - 15dp - 550dp - 200dp - 200dp - 100dp - 90dp - 168dp - 68dp - 80dp - 26dp - 270dp - 86dp - 58dp - 20dp - 48dp - 349dp - 465dp - 306dp - 77dp - 50dp - 28dp - 16dp - 5dp - 80dp - 22dp - - 20dp - 30dp - - 42dp - 30dp - 36dp - 30dp - 50dp - - 30dp - 140dp - 219dp - 100dp - 28dp - 26dp - 64dp - 48dp - 28dp - 40dp - 30dp - 60dp - 22dp - 54dp - -10dp - 114dp - 158dp - 26dp - 25dp - 2dp - 82dp - 55dp - 95dp - - - - 16dp - 36dp - 28dp - 55dp - 36dp - 310dp - 98dp - 130dp - - - 80dp - 882dp - 182dp - 64dp - 60dp - - - 330dp - 450dp - 280dp - 421dp - - - 234dp - - 75dp - 32dp - 26dp - 80dp - 34dp - - - 100dp - 32dp - - - - 940dp - 940dp - 701dp - 32dp - - - 830dp - 662dp - 674dp - 150dp - 46dp - 26dp - - 140dp - 20dp - 100dp - 100dp - 30dp - 32dp - 8dp - 30dp - - 800dp - 140dp - 20dp - - 80dp - 35dp - - 27dp - 40dp - 27dp - 24dp - 42dp - 80dp - 40dp - 150dp - 640dp - 140dp - 100dp - 100dp - 480dp - 32dp - 30dp - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/colors.xml deleted file mode 100644 index 12770aec47..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/colors.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - #256BFF - #B3FFFFFF - #4BFFFFFF - #FFFFFF - #FFFFFF - #ff616381 - #555A75 - #000000 - #FFF - #4DFFFFFF - #4C83FF - - #FF3036 - #F63A35 - - #D6D7D9 - #FFFFFF - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml deleted file mode 100644 index cc4bd70221..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 445dp - - 18dp - 20dp - 642dp - 190dp - 210dp - - 670dp - - 82dp - - - 34dp - 22dp - - 40dp - - 6dp - - 550dp - 200dp - 200dp - 100dp - 50dp - 168dp - 68dp - 40dp - 15dp - 150dp - 48dp - 32dp - 28dp - 28dp - 190dp - 170dp - 43dp - 26dp - 12dp - 8dp - 2dp - 30dp - 22dp - - 24dp - 30dp - 20dp - 16dp - 28dp - - - 82dp - 16dp - 117dp - 200dp - 17dp - 14dp - 36dp - 22dp - 16dp - 20dp - 20dp - 34dp - 15dp - 29dp - -8dp - 84dp - 67dp - 45dp - 52dp - - - 8dp - 20dp - 16dp - 31dp - 20dp - 150dp - 54dp - 64dp - - - 190dp - 250dp - 156dp - 234dp - - - 136dp - - 41dp - 18dp - 14dp - 44dp - 34dp - - - 150dp - 46dp - 26dp - 574dp - 480dp - 384dp - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml deleted file mode 100644 index a6837f423e..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - mogo-module-v2x - 车速 - 已提交 - 感谢已送达 - 周边5公里，共 %d 条交通信息 - 周边5公里，共 %d 条 - 去分享 - 刷新 - 小智已为您查询到前方最近车辆直播视频，请查看 - 诶呀呀，没有查到前方车辆直播视屏，过一会再试试吧 - 已为您打开路口直播实况 - 诶呀呀，周围没有可用路口实况直播 - 停车场推荐 - 线路推荐 - 26dp - 前方路口暂无直播 - 此摄像头暂无直播 - - diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/values/style.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/values/style.xml deleted file mode 100644 index aeb69f9da5..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/values/style.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml index 42243b1d96..231bb20ea0 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml @@ -9,7 +9,7 @@ android:useLevel="false"> - + diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml index 284844ec7c..0c8fef57d6 100644 --- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml +++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml @@ -8,7 +8,7 @@ android:useLevel="false"> - + diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml index 9e148a32fd..b10969f33a 100644 --- a/core/mogo-core-res/src/main/res/values/color.xml +++ b/core/mogo-core-res/src/main/res/values/color.xml @@ -1,13 +1,25 @@ - #FFFFFF - #4DFFFFFF + #FFFFFF + #4DFFFFFF - #323C6F - - #FFFFFF #FFED6515 #0F7F2503 + #4D000000 + #99000000 + #66B8BFE8 + #AFB3C7 + #FFA7B6F0 + #B3FFFFFF + + #E63B4577 + #FF2966EC + #1F9BFE + #256BFF + #3E7BFE + #323C6F + #8E9DD4 + \ No newline at end of file