diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ee645f4878..7a864b552b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -38,6 +38,9 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setNetMode(BuildConfig.NET_ENV); DebugConfig.setDebug(BuildConfig.DEBUG); DebugConfig.setAIType(BuildConfig.AIType); + DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); + DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI ); + DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER ); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); @@ -52,7 +55,9 @@ public class MogoApplication extends AbsMogoApplication { //运营位卡片，需要默认显示，放在第一个加载 MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); + if(DebugConfig.isLauncher()) { + MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); + } MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME)); @@ -61,10 +66,6 @@ public class MogoApplication extends AbsMogoApplication { // 暂时去掉推送 // MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); - - DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); - DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI ); - DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER ); } @Override 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 04a70217ea..f5a3ffd766 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 @@ -11,6 +11,7 @@ import androidx.annotation.Nullable; import androidx.viewpager.widget.ViewPager; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.MvpActivity; import com.mogo.commons.voice.AIAssist; import com.mogo.map.location.IMogoLocationClient; @@ -235,7 +236,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public void onBackPressed() { if ( mMogoFragmentManager.getStackSize() == 0 ) { - return; + if(DebugConfig.isLauncher()) { + return; + }else{ + super.onBackPressed(); + } } if ( mMogoFragmentManager != null ) { mMogoFragmentManager.pop(); diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java index f8638830d4..21898f15df 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java @@ -21,6 +21,7 @@ import com.mogo.module.media.widget.AnimCircleImageView; import com.mogo.module.media.widget.NoScrollSeekBar; import com.mogo.module.media.widget.ScrollingTextView; import com.mogo.utils.LaunchUtils; +import com.mogo.utils.WindowUtils; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl; @@ -95,6 +96,9 @@ public class MediaWindow2 implements IMusicView { getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location); int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x); + int statusBarHeight = WindowUtils.getStatusBarHeight(mContext); + Logger.d(TAG, + "yPos: " + yPos + " xPos: " + xPos + " statusBarHeight: " + statusBarHeight); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams((int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_width), (int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_height)); params.leftMargin = xPos; @@ -170,7 +174,7 @@ public class MediaWindow2 implements IMusicView { if (mCircleImg != null) { com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions() - .placeholder(R.drawable.module_media_share_default_icon); + .placeholder(R.drawable.module_media_default_music_img); GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); } diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png new file mode 100644 index 0000000000..4aab1a19b3 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png index d692431fa8..a3898c5827 100644 Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png index 967dfe701d..a908c23da5 100644 Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png index 21a77a0c44..ab6f5e4d7c 100644 Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png differ diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index 2ecf743e04..a07744e59d 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -64,10 +64,10 @@ 580px 120px 112px - 20px + 30px 90px 230px - 20px + 14px 35px 24px 56px diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 257216648f..372e5babff 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -1,6 +1,6 @@ - 483px + 470px 573px @@ -64,10 +64,10 @@ 322px 66.7px 60px - 12px + 18px 48px 123px - 13px + 10px 18px 14px 30px diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index 33ab9ac337..a549613d66 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -354,7 +354,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo } break; default: - showShareDialog(); +// showShareDialog(); break; } case VOICE_CMD_PUB_ROAD_CONDITION: