From 183c5b806f3d2c2c00fd2559d3642d708536b5a1 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 13 Jan 2023 15:18:21 +0800 Subject: [PATCH] [2.13.2-arch-opt] remove unuse res of v2x --- .../layout/taxi_p_passenger_check_panel.xml | 2 +- .../hmi/ui/widget/AutoPilotStatusView.kt | 6 +- .../res/layout/view_perspective_switch.xml | 2 +- .../src/main/res/values/color.xml | 12 +- .../receiver/TestPanelBroadcastReceiver.java | 14 - .../v2x/events/utils/TestOnLineCarUtils.java | 104 ------- .../events/view/V2XCrossRoadVideoView.java | 266 ------------------ .../anim/v2x_unlike_heart_scale_ani_vr.xml | 16 -- .../main/res/color/radiobutton_textcolor.xml | 4 - .../res/drawable-mdpi/v2x_icon_live_logo.png | Bin 12253 -> 0 bytes .../icon_live_load_error.png | Bin 6309 -> 0 bytes .../v2x_icon_live_logo.png | Bin 11251 -> 0 bytes .../drawable-xhdpi/icon_live_load_error.png | Bin 6309 -> 0 bytes .../res/drawable/v2x_refresh_button_bg.xml | 9 - .../view_video_layout_see_crossroad.xml | 70 ----- .../res/raw/scenario_road_event_data.json | 45 +++ .../raw/scenario_warning_event_data_left.json | 21 ++ ...enario_warning_event_data_pedestrians.json | 19 ++ .../scenario_warning_event_data_right.json | 20 ++ .../src/main/res/raw/test_coordinates.json | 94 +++++++ .../res/raw/test_data_v2x_zuiyouluxian.json | 52 ++++ .../src/main/res/values-ldpi/dimens.xml | 121 -------- .../src/main/res/values-mdpi/dimens.xml | 121 -------- .../res/values-xhdpi-1920x1000/dimens.xml | 95 ------- .../res/values-xhdpi-2560x1440/dimens.xml | 51 ---- .../src/main/res/values-xhdpi/dimens.xml | 170 ----------- .../src/main/res/values/colors.xml | 20 -- .../src/main/res/values/dimens.xml | 106 ------- .../src/main/res/values/strings.xml | 20 -- .../src/main/res/values/style.xml | 8 - .../drawable/module_ext_check.xml | 2 +- .../drawable/module_switch_map_bg.xml | 2 +- .../src/main/res/values/color.xml | 22 +- 33 files changed, 276 insertions(+), 1218 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/color/radiobutton_textcolor.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_load_error.png delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_live_logo.png delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/icon_live_load_error.png delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/drawable/v2x_refresh_button_bg.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_video_layout_see_crossroad.xml create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values-ldpi/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values-mdpi/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values-xhdpi/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values/colors.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values/strings.xml delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/res/values/style.xml 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 e02a57044feda0f5a025acd98906c3623b67a37f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12253 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 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 a1da551655536f62ce8eaa5454c3f9e30500f702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6309 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 bJJtWc1%85!Qn2Qr00000NkvXXu0mjfv0E2y 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 dabf25dbbb0f0e88dce1b50178e924de851ecf55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11251 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 WMB&2n@0(#>K=+BEX3b-Vi2ng-qw_ET 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 a1da551655536f62ce8eaa5454c3f9e30500f702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6309 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 bJJtWc1%85!Qn2Qr00000NkvXXu0mjfv0E2y 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