From 4ae79072c63bed09dc4d221a7e8c63ef3a6dddd2 Mon Sep 17 00:00:00 2001 From: wujifei Date: Wed, 28 Apr 2021 11:20:38 +0800 Subject: [PATCH] =?UTF-8?q?new#=E9=80=9F=E5=BA=A6=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/launcher/MainLauncherActivity.java | 37 ++++++------------- .../com/mogo/module/main/MainActivity.java | 25 ++++++++++++- .../src/main/res/values-mdpi/dimens.xml | 1 + .../res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + 6 files changed, 40 insertions(+), 26 deletions(-) diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index dcb7e4cb5c..07bb23672e 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -38,7 +38,7 @@ import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_T * * @author tongchenfei */ -public class MainLauncherActivity extends MainActivity implements IMogoIntentListener, IMogoStatusChangedListener, IV2XListener { +public class MainLauncherActivity extends MainActivity implements IMogoIntentListener, IV2XListener { private static final String TAG = "MainLauncherActivity"; protected boolean mIsHomeKeyDown = false; private static Handler handlerV2XEvent = new Handler(); @@ -53,9 +53,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis DebugConfig.setNeedRequestUserInfo(true); Log.d(TAG, "onCreate"); mServiceApis.getV2XListenerManager().registerIntentListener(MogoReceiver.ACTION_V2X_FRONT_WARNING, this); - mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, - StatusDescriptor.VR_MODE, this); - DisplayEffectsHelper.getInstance().init(clSpecialEffect); } @Override @@ -164,28 +161,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis Logger.d(TAG, "send msg to AI Voice"); } - @Override - public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { - FrameLayout.LayoutParams entranceParams = ((FrameLayout.LayoutParams) mEntrance.getLayoutParams()); - if (isTrue) { - entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_entrance_fragment_container_marginLeft_in_vr_mode); - mLeftShadowFrame.setVisibility(View.GONE); - mApps.setVisibility(View.GONE); - } else { - entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_id_entrance_fragment_container_marginLeft); - mLeftShadowFrame.setVisibility(View.VISIBLE); - mApps.setVisibility(View.VISIBLE); - } - mEntrance.setLayoutParams(entranceParams); - if (descriptor == StatusDescriptor.VR_MODE) { - if (isTrue) { - clSpecialEffect.setVisibility(View.VISIBLE); - } else { - clSpecialEffect.setVisibility(View.GONE); - } - } - } @Override public void warningChangedWithDirection(int type) { @@ -252,4 +228,15 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis EXPIRE_TIMER = ALL_EXPIRE_TIMER; } } + + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + if (isTrue) { + mLeftShadowFrame.setVisibility(View.GONE); + mApps.setVisibility(View.GONE); + } else { + mLeftShadowFrame.setVisibility(View.VISIBLE); + mApps.setVisibility(View.VISIBLE); + } + } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 02f4ca2e39..f7536a5eb5 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -31,7 +31,9 @@ import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.v2x.IV2XListener; import com.mogo.skin.support.SkinMode; import com.mogo.utils.NetworkUtils; @@ -50,6 +52,7 @@ import java.util.List; */ public class MainActivity extends MvpActivity implements MainView, IMogoLocationListener, + IMogoStatusChangedListener, IMogoADASControlStatusChangedListener, FragmentStackTransactionListener { @@ -151,8 +154,9 @@ public class MainActivity extends MvpActivity implement super.onCreate(savedInstanceState); ContextHolderUtil.holdContext(this); mPresenter.postLoadModuleMsg(); - NetworkUtils.listenNetStrength(this); + DisplayEffectsHelper.getInstance().init(clSpecialEffect); + mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this); } private void init() { @@ -402,4 +406,23 @@ public class MainActivity extends MvpActivity implement mServiceApis.getShareManager().releaseContext(); mServiceApis.getSkinSupportInstallerApi().onDestroy(); } + + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + FrameLayout.LayoutParams entranceParams = ((FrameLayout.LayoutParams) mEntrance.getLayoutParams()); + if (isTrue) { + entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_entrance_fragment_container_marginLeft_in_vr_mode); + } else { + entranceParams.leftMargin = getResources().getDimensionPixelSize(R.dimen.module_main_id_entrance_fragment_container_marginLeft); + } + mEntrance.setLayoutParams(entranceParams); + if (descriptor == StatusDescriptor.VR_MODE) { + if (isTrue) { + clSpecialEffect.setVisibility(View.VISIBLE); + } else { + clSpecialEffect.setVisibility(View.GONE); + } + + } + } } diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index a2343c16c2..8849f14d0d 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -21,6 +21,7 @@ 15px 460px 444px + 0px 350px 10px 16px diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml index a65f5d7496..54b1d65a55 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -20,6 +20,7 @@ 30px 830px 590px + 0px 30px 70px diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 234c6a3dbe..e4e5a34f4b 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -20,6 +20,7 @@ 30px 830px 800px + 0px 20px 30px diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 545cbff34a..a985fd57d2 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -21,6 +21,7 @@ 15px 460px 444px + 0px 350px 10px 16px