diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index e082ea7475..a2da5c6cd8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3173447fb9..276f5f39c8 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -21,6 +21,7 @@ import com.mogo.module.main.service.MogoMainService; import com.mogo.module.media.MediaConstants; import com.mogo.module.push.base.PushUIConstants; import com.mogo.module.service.ServiceConst; +import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.v2x.V2XConst; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; @@ -74,7 +75,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); } -// MogoModulePaths.addBaseModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) ); + MogoModulePaths.addBaseModule( new MogoModule( ShareConstants.TAG, ShareConstants.MODEL_NAME ) ); MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_TANLU_API, "TanluApi" ) ); MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) ); diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png deleted file mode 100644 index 7fc320c21f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_choose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png deleted file mode 100644 index 71f17bcc7e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_second.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png deleted file mode 100644 index c7ee647c81..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_heart_unchoose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png deleted file mode 100644 index 7fc320c21f..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png deleted file mode 100644 index 71f17bcc7e..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png deleted file mode 100644 index c7ee647c81..0000000000 Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png and /dev/null differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png rename to modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png 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 fcf04ade3f..fbcc5e2099 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -60,7 +60,7 @@ 32px 32px - 78px + 0px 22px 28px diff --git a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png index 67d93590b3..0974829ddb 100644 Binary files a/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png and b/modules/mogo-module-guide/src/main/res/mipmap-mdpi/module_guide_item_stage_three_launcher.png differ diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 775862dce9..c569c45d27 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -134,34 +134,6 @@ public class TanluManager implements IMogoMarkerClickListener, initListener(); } -// @Override -// public void init(Context context) { -// -// } - -// @Override -// public void searchRoadCondition(String intentStr, String data, String city, String keywords) { -// Disposable disposable = Single.create((SingleOnSubscribe) emitter -> { -// Logger.d(TAG, "searchRoadCondition---> intentStr: " + intentStr + " data: " + data + " " + -// "city: " + city + " keywords: " + keywords); -// Intent intent = new Intent(intentStr); -// intent.putExtra("data", data); -// intent.putExtra("city", city); -// intent.putExtra("keywords", keywords); -// Thread.sleep(3000); -// emitter.onSuccess(intent); -// }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(intent -> { -// Logger.d(TAG, "searchRoadCondition---go real share"); -// realShare(intentStr, intent); -// }); -// } -// -// @Override -// public void shareSuccess(String poiType, MogoLatLng location) { -// MarkerInfo markerInfo = new MarkerInfo(poiType, "", location.lon, location.lat, true, "1"); -// EventBus.getDefault().post(markerInfo); -// } - private void initInterface() { //地图marker，地图操作 mMarkerManager = TanluServiceManager.getMapService().getMarkerManager(mContext); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index eb0c2dc0d9..81c452acbf 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -135,7 +135,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService // 超过阈值，准备判断是否拥堵 startRecordDistanceTime = 0L if (tripDistance < 1000 && isClose() && currentSpeed < 40) { - Logger.d(TAG, "根据距离，判定为拥堵，准备上报") + Logger.d(TAG, "根据距离，判定为拥堵，准备上报, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed") val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO) val latLon = MogoLatLng(lat, lon) p.location = latLon @@ -144,6 +144,8 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService Logger.d(TAG, "根据距离，没有判定为拥堵, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed") } tripDistance = 0 + lastLat = 0.0 + lastLon = 0.0 } } } @@ -152,7 +154,9 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService * 没有有效前车距离或者前车距离小于5m */ private fun isClose(): Boolean { - return frontDistance in 1..4 + val r = (frontDistance in 1..4) || (frontDistance == -1) + Logger.d(TAG,"r: $r") + return r } private fun uploadAverageSpeed(average: Float) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index 7f97170eda..b2366f3acb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -25,6 +25,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.common.entity.MarkerExploreWayItem; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.V2XMessageEntity; @@ -50,7 +51,7 @@ import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; - +import static com.mogo.module.v2x.VideoInitKt.initVideo; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -229,6 +230,12 @@ public class V2XModuleProvider implements Log.d(TAG,"onMarkerClicked2222"); //点击的marker的具体数据 MarkerExploreWay exploreWay = extractFromMarker(marker); + MarkerExploreWayItem item = exploreWay.getItems().get(0); + String path = item.getUrl(); + if (path.contains(".mp4")){ + initVideo(); + } + V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity(); roadEventEntity.setNoveltyInfo(exploreWay); roadEventEntity.setPoiType(exploreWay.getPoiType()); @@ -256,6 +263,7 @@ public class V2XModuleProvider implements } }); + // 响应违章停车的POI点击 V2XServiceManager .getMogoRegisterCenter() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 6116a83506..53f0c88824 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -61,12 +61,12 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { * 对道路事件进行反馈 */ void manualMarkingTrafficJam(int status) { - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null); + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null); V2XServiceManager .getV2XRefreshModel() .manualMarkingTrafficJam( diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index c0e031b278..d68cb92a12 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -213,7 +213,11 @@ class V2XEventPanelFragment : MvpFragment implements IM if (v2xFaultHelpDialog == null) { v2xFaultHelpDialog = new V2XSeekHelpDialog(V2XServiceManager.getContext()); } - v2xFaultHelpDialog.setOnClickListener(new V2XSeekHelpDialog.OnClickListener() { - @Override - public void onClickLeft() { - //放弃求助 - /* if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) { - V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false); - }*/ - closeButton(); - v2xFaultHelpDialog.dismiss(); - } - - @Override - public void onClickRight() { - //继续求助 - v2xFaultHelpDialog.dismiss(); - - } - }); - v2xFaultHelpDialog.show(); +// v2xFaultHelpDialog.setOnClickListener(new V2XSeekHelpDialog.OnClickListener() { +// @Override +// public void onClickLeft() { +// //放弃求助 +// /* if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) { +// V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false); +// }*/ +// closeButton(); +// v2xFaultHelpDialog.dismiss(); +// } +// +// @Override +// public void onClickRight() { +// //继续求助 +// v2xFaultHelpDialog.dismiss(); +// +// } +// }); +// v2xFaultHelpDialog.show(); + closeButton(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java index a4d8161609..97821c1f1a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java @@ -84,15 +84,18 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL public void show() { try { Logger.d(TAG, "使用windowManager实现"); - if ( windowManager == null ) { - windowManager = new WindowManagerView.Builder( - V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext() - ).contentView(this).build(); - } - AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); - unRegisterVoiceCmd(); - registerVoiceCmd(); - windowManager.show(); +// if ( windowManager == null ) { +// windowManager = new WindowManagerView.Builder( +// V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext() +// ).contentView(this).build(); +// } +// AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗"); +// unRegisterVoiceCmd(); +// registerVoiceCmd(); +// windowManager.show(); + handleLeft(); + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消"); + } catch (Exception e) { e.printStackTrace(); } @@ -120,7 +123,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL if (mListener != null) { mListener.onClickLeft(); } - unRegisterVoiceCmd(); +// unRegisterVoiceCmd(); } //继续求助 @@ -128,7 +131,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL if (mListener != null) { mListener.onClickRight(); } - unRegisterVoiceCmd(); +// unRegisterVoiceCmd(); } private void registerVoiceCmd() { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java index 81f371228a..a1b26264dc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java @@ -19,15 +19,12 @@ import com.mogo.module.v2x.listener.V2XWindowStatusListener; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.view.SimpleCoverVideoPlayer; import com.mogo.utils.BitmapHelper; -import com.shuyu.gsyvideoplayer.GSYVideoManager; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack; import com.shuyu.gsyvideoplayer.utils.GSYVideoType; import com.shuyu.gsyvideoplayer.video.base.GSYVideoView; import java.util.ArrayList; - -import static com.mogo.module.v2x.VideoInitKt.initVideo; import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL; /** @@ -71,7 +68,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements private void initView(Context context) { LayoutInflater.from(mContext).inflate(R.layout.window_road_video_layout, this); - initVideo(); playImageView = this.findViewById(R.id.window_video_play); thumbnailImage = this.findViewById(R.id.thumbnail_image); simpleCoverVideoPlayer = this.findViewById(R.id.roadVideoView); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt index d0282bea5e..3d2697ed9e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt @@ -83,12 +83,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { } override fun updateStartImage() { - super.updateStartImage() - - when (mCurrentState) { - GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE - else -> start.visibility = View.INVISIBLE - } +// super.updateStartImage() +// +// when (mCurrentState) { +// GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE +// else -> start.visibility = View.INVISIBLE +// } } fun setFullClickListener(listener: OnClickListener) { @@ -167,6 +167,7 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { v?.let { when (v) { start -> { + onVideoResume() } else -> { } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index f72f5e2e12..a34bf1a2be 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -239,10 +239,10 @@ public class V2XVoiceConstants { // 封路 public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP_WORDS = {"封路了", "封了", "有封路", "确定"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP_WORDS = {"封路了", "封了", "封路", "有封路", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有", "没封路", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"不封路","没注意", "没看到", "没有", "没封路","无封路", "取消", "关闭"}; // 事故 @@ -250,7 +250,7 @@ public class V2XVoiceConstants { public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP_WORDS = {"有事故", "存在交通事故", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP_WORDS = {"没注意", "没有事故", "没看到", "没有", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP_WORDS = {"没注意", "没有事故", "无事故", "没看到", "没有", "取消", "关闭"}; // 道路施工 @@ -258,7 +258,7 @@ public class V2XVoiceConstants { public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP_WORDS = {"有", "在施工", "有施工", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有施工", "很正常", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有施工","无施工", "很正常", "取消", "关闭"}; static { diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml index c771e691e5..5f9bc8d7d2 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml @@ -7,7 +7,7 @@ android:bottom="2dp" android:left="2dp" android:right="2dp" - android:top="2dp" /> + android:top="3dp" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml index d63bad4e6b..61ff05d18a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml @@ -28,8 +28,7 @@ android:layout_width="@dimen/dp_110" android:layout_height="@dimen/dp_110" android:layout_centerInParent="true" - android:scaleType="centerCrop" - android:src="@drawable/v2x_icon_live_logo" /> + android:scaleType="centerCrop" /> @@ -72,13 +71,13 @@ //加载中圈圈 - - - - - - - - + diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index a2aa8d0bb0..9ab0be6694 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -105,7 +105,7 @@ 460px - 464px - 474px + 370px + 380px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 33f9e7b3ae..2d56c88133 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -100,13 +100,13 @@ 19px - 574px - 480px + 572px + 486px 384px 460px - 464px - 474px + 370px + 380px