diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
index 0dea8a3efe..fb0a9eeede 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
@@ -40,61 +40,61 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
private boolean mIsFirstAccOn = true;
@Override
- public final void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) {
- switch ( descriptor ) {
+ public final void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+ switch (descriptor) {
case USER_INTERACTED:
- onUserInteracted( isTrue );
+ onUserInteracted(isTrue);
break;
case SEARCH_UI:
- onSearchUIShow( isTrue );
+ onSearchUIShow(isTrue);
break;
case MAIN_PAGE_RESUME:
- onMainPageResumeStatusChanged( isTrue );
+ onMainPageResumeStatusChanged(isTrue);
break;
case MAIN_PAGE_IS_BACKGROUND:
- onMainPageIsBackgroundStatusChanged( isTrue );
+ onMainPageIsBackgroundStatusChanged(isTrue);
break;
case SEEK_HELPING:
- onSeekHelpingStatusChanged( isTrue );
+ onSeekHelpingStatusChanged(isTrue);
break;
case ACC_STATUS:
- onAccStatusChanged( isTrue );
+ onAccStatusChanged(isTrue);
break;
case VR_MODE:
- onVrModeChanged( isTrue );
+ onVrModeChanged(isTrue);
break;
case TOP_VIEW:
- onTopViewStatusChanged( isTrue );
+ onTopViewStatusChanged(isTrue);
break;
}
}
- public void onUserInteracted( boolean userInteracted ) {
- if ( userInteracted ) {
- MogoServices.getInstance().restartAutoRefreshAtTime( ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT );
+ public void onUserInteracted(boolean userInteracted) {
+ if (userInteracted) {
+ MogoServices.getInstance().restartAutoRefreshAtTime(ServiceConst.DEFAULT_AUTO_REFRESH_WHEN_INTERRUPT);
}
}
- public abstract void onSearchUIShow( boolean visible );
+ public abstract void onSearchUIShow(boolean visible);
- public void onMainPageResumeStatusChanged( boolean resume ) {
- if ( resume ) {
+ public void onMainPageResumeStatusChanged(boolean resume) {
+ if (resume) {
MogoServices.getInstance().registerInternalUnWakeupWords();
- if ( !mIsMainPageFirstResume ) {
- MogoServices.getInstance().restartAutoRefreshAtTime( 2_000L );
+ if (!mIsMainPageFirstResume) {
+ MogoServices.getInstance().restartAutoRefreshAtTime(2_000L);
}
mIsMainPageFirstResume = false;
- LauncherCardRefresher.getInstance( AbsMogoApplication.getApp() ).stop();
+ LauncherCardRefresher.getInstance(AbsMogoApplication.getApp()).stop();
MogoServices.getInstance().playAppTts();
} else {
MogoServices.getInstance().unregisterInternalUnWakeupWords();
MogoServices.getInstance().stopAutoRefreshStrategy();
}
- VrModeController.getInstance().onMainPageResumeStatusChanged( resume );
+ VrModeController.getInstance().onMainPageResumeStatusChanged(resume);
}
- public void onMainPageIsBackgroundStatusChanged( boolean isBackground ) {
- if ( isBackground ) {
+ public void onMainPageIsBackgroundStatusChanged(boolean isBackground) {
+ if (isBackground) {
closeAllPanel();
}
}
@@ -104,76 +104,79 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
*/
private void closeAllPanel() {
- if ( mCallProviderResponse == null ) {
+ if (mCallProviderResponse == null) {
mCallProviderResponse = new ICallChatResponse() {
@Override
- public void hideUserWindowError( @NotNull String errorMsg ) {
+ public void hideUserWindowError(@NotNull String errorMsg) {
}
};
}
MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog();
MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
- MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus( false );
+ MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel();
- if ( mCarsChattingProvider == null ) {
- mCarsChattingProvider = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation();
+ if (mCarsChattingProvider == null) {
+ mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
}
- if ( mCarsChattingProvider != null ) {
- mCarsChattingProvider.hideUserWindow( TAG, AbsMogoApplication.getApp(), mCallProviderResponse );
+ if (mCarsChattingProvider != null) {
+ mCarsChattingProvider.hideUserWindow(TAG, AbsMogoApplication.getApp(), mCallProviderResponse);
}
}
- public void onSeekHelpingStatusChanged( boolean isSeekingHelping ) {
- CarIconDisplayStrategy.getInstance().changeCarIconStatus( isSeekingHelping );
- notifySeekHelpingStatusChanged( isSeekingHelping );
+ public void onSeekHelpingStatusChanged(boolean isSeekingHelping) {
+ CarIconDisplayStrategy.getInstance().changeCarIconStatus(isSeekingHelping);
+ notifySeekHelpingStatusChanged(isSeekingHelping);
}
- private void notifySeekHelpingStatusChanged( boolean seekHelpingStatus ) {
- Intent intent = new Intent( "com.mogo.launcher.adas.app" );
+ private void notifySeekHelpingStatusChanged(boolean seekHelpingStatus) {
+ Intent intent = new Intent("com.mogo.launcher.adas.app");
try {
JSONObject data = new JSONObject();
- data.put( "object", "辅助驾驶" );
- data.put( "action", seekHelpingStatus ? "2" : "1" );
- data.put( "des", "自身故障报警" );
- data.put( "v2x_warning_type", "20007" );// 后台返回
- intent.putExtra( "data", data.toString() );
- AbsMogoApplication.getApp().sendBroadcast( intent );
- } catch ( Exception e ) {
- Logger.e( TAG, e, "error." );
+ data.put("object", "辅助驾驶");
+ data.put("action", seekHelpingStatus ? "2" : "1");
+ data.put("des", "自身故障报警");
+ data.put("v2x_warning_type", "20007");// 后台返回
+ intent.putExtra("data", data.toString());
+ AbsMogoApplication.getApp().sendBroadcast(intent);
+ } catch (Exception e) {
+ Logger.e(TAG, e, "error.");
}
}
- public void onAccStatusChanged( boolean accOn ) {
- if ( accOn ) {
- if ( mIsFirstAccOn ) {
+ public void onAccStatusChanged(boolean accOn) {
+ if (accOn) {
+ if (mIsFirstAccOn) {
mIsFirstAccOn = false;
return;
}
- MogoServices.getInstance().initLocationServiceProcess( AbsMogoApplication.getApp() );
+ MogoServices.getInstance().initLocationServiceProcess(AbsMogoApplication.getApp());
MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
- MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).start();
- MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers();
- UiThreadHandler.postDelayed( () -> {
+ MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).start();
+ MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers();
+ UiThreadHandler.postDelayed(() -> {
MogoServices.getInstance().refreshStrategy();
- }, 3_000L );
+ }, 3_000L);
} else {
- MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( AbsMogoApplication.getApp() ).stop();
- MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers();
+ MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).stop();
+ MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers();
}
}
- public void onVrModeChanged( boolean isVrMode ) {
- VrModeController.getInstance().onVrModeChanged( isVrMode );
+ public void onVrModeChanged(boolean isVrMode) {
+ VrModeController.getInstance().onVrModeChanged(isVrMode);
+ if (MarkerServiceHandler.getMogoStatusManager().isSeekHelping()) {
+ onSeekHelpingStatusChanged(true);
+ }
}
- public void onTopViewStatusChanged( boolean visible ) {
- if ( visible ) {
+ public void onTopViewStatusChanged(boolean visible) {
+ if (visible) {
return;
}
try {
MapMarkerManager.getInstance().onCloseCurrentSelectedMarker();
- } catch ( Exception e ) {
- Logger.e( TAG, e, "onTopViewStatusChanged" );
+ } catch (Exception e) {
+ Logger.e(TAG, e, "onTopViewStatusChanged");
}
}
}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java
index 3c9ba2bab3..5f0f07f942 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java
@@ -81,6 +81,35 @@ public class CarIconDisplayStrategy {
R.drawable.module_service_ic_warning_circle_orange_00046
};
+ // F 系列才有这个帧动画
+ public static final int[] sFrameVr = {
+ R.drawable.module_service_ic_car_for_help_0000,
+ R.drawable.module_service_ic_car_for_help_0001,
+ R.drawable.module_service_ic_car_for_help_0002,
+ R.drawable.module_service_ic_car_for_help_0003,
+ R.drawable.module_service_ic_car_for_help_0004,
+ R.drawable.module_service_ic_car_for_help_0005,
+ R.drawable.module_service_ic_car_for_help_0006,
+ R.drawable.module_service_ic_car_for_help_0007,
+ R.drawable.module_service_ic_car_for_help_0008,
+ R.drawable.module_service_ic_car_for_help_0009,
+ R.drawable.module_service_ic_car_for_help_0010,
+ R.drawable.module_service_ic_car_for_help_0011,
+ R.drawable.module_service_ic_car_for_help_0012,
+ R.drawable.module_service_ic_car_for_help_0013,
+ R.drawable.module_service_ic_car_for_help_0014,
+ R.drawable.module_service_ic_car_for_help_0015,
+ R.drawable.module_service_ic_car_for_help_0016,
+ R.drawable.module_service_ic_car_for_help_0017,
+ R.drawable.module_service_ic_car_for_help_0018,
+ R.drawable.module_service_ic_car_for_help_0019,
+ R.drawable.module_service_ic_car_for_help_0020,
+ R.drawable.module_service_ic_car_for_help_0021,
+ R.drawable.module_service_ic_car_for_help_0022,
+ R.drawable.module_service_ic_car_for_help_0023,
+ R.drawable.module_service_ic_car_for_help_0024
+ };
+
private static volatile CarIconDisplayStrategy sInstance;
private IMogoMarker mSeekHelpingMarker;
@@ -165,6 +194,7 @@ public class CarIconDisplayStrategy {
switch (msg.what) {
case MSG_SEEK_HELPING_ANIM:
try {
+ stopAnim();
playAnim();
} catch (Exception e) {
e.printStackTrace();
@@ -191,13 +221,20 @@ public class CarIconDisplayStrategy {
private void playAnim() {
try {
- for (int i : sFrame) {
- mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i));
+ if (MarkerServiceHandler.getMogoStatusManager().isVrMode()) {
+ for (int i : sFrameVr) {
+ mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i));
+ }
+ } else {
+ for (int i : sFrame) {
+ mBitmapFrames.add(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), i));
+ }
}
+
mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(TAG,
new MogoMarkerOptions()
.icons(mBitmapFrames)
- .period(1)
+ .period(20)
.zIndex(0)
.autoManager(false)
.anchor(0.5f, 0.5f)
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png
new file mode 100644
index 0000000000..3e1a005805
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0000.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png
new file mode 100644
index 0000000000..cf50f496f9
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0001.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png
new file mode 100644
index 0000000000..6e78ad0a5d
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0002.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png
new file mode 100644
index 0000000000..62fb4f6905
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0003.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png
new file mode 100644
index 0000000000..e31c16e5bc
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0004.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png
new file mode 100644
index 0000000000..9b63c26cb0
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0005.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png
new file mode 100644
index 0000000000..bb43dace92
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0006.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png
new file mode 100644
index 0000000000..fbd41c7f46
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0007.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png
new file mode 100644
index 0000000000..22063213c2
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0008.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png
new file mode 100644
index 0000000000..0c7352bd3d
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0009.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png
new file mode 100644
index 0000000000..e3f368072d
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0010.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png
new file mode 100644
index 0000000000..5ab71f95c9
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0011.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png
new file mode 100644
index 0000000000..8cf231388a
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0012.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png
new file mode 100644
index 0000000000..1ce7794873
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0013.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png
new file mode 100644
index 0000000000..1e432c6c60
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0014.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png
new file mode 100644
index 0000000000..d5ac9bcabe
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0015.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png
new file mode 100644
index 0000000000..b9bd28d26e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0016.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png
new file mode 100644
index 0000000000..0957be0dd0
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0017.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png
new file mode 100644
index 0000000000..b2fa02c103
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0018.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png
new file mode 100644
index 0000000000..89d396bcaa
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0019.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png
new file mode 100644
index 0000000000..f4855c2cc6
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0020.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png
new file mode 100644
index 0000000000..9505ecd1f5
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0021.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png
new file mode 100644
index 0000000000..cb4c5a9e82
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0022.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png
new file mode 100644
index 0000000000..8399cc8d0a
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0023.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png
new file mode 100644
index 0000000000..3e1a005805
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_car_for_help_0024.png differ
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
index 5c52454150..d05d89a56d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -1,5 +1,6 @@
package com.mogo.module.v2x.scenario.scene.help;
+import android.app.ActionBar;
import android.content.Intent;
import android.view.LayoutInflater;
import android.view.View;
@@ -82,7 +83,7 @@ public class V2XSeekHelpButton implements IV2XButton {
tvCancel.setOnClickListener(v -> {
doAction();
});
- ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_640),
+ ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
(int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_140));
V2XServiceManager.getMogoTopViewManager().addView(topView, layoutParams);
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
index 73892b5ac9..b7428f06fb 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 79f8efeac3..adfeb53772 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -275,6 +275,7 @@
android:layout_height="@dimen/dp_70"
android:background="@color/v2x_line_color"
android:visibility="gone"
+ android:alpha="0.3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_play"
app:layout_constraintStart_toEndOf="@+id/ll_event"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
index 3623d89beb..593cd5b173 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_carforhelp_detail.xml
@@ -1,55 +1,66 @@
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/dp_20">
-
-
-
-
-
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file