Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

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

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();

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);
         }
 

modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml

@@ -64,10 +64,10 @@
     <dimen name="module_media_pop_window_width">580px</dimen>
     <dimen name="module_media_pop_window_height">120px</dimen>
     <dimen name="module_media_pop_window_inner_height">112px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">20px</dimen>
+    <dimen name="module_media_pop_window_inner_padding">30px</dimen>
     <dimen name="module_media_pop_window_anim_img_size">90px</dimen>
     <dimen name="module_media_pop_window_text_width">230px</dimen>
-    <dimen name="module_media_pop_window_text_margin">20px</dimen>
+    <dimen name="module_media_pop_window_text_margin">14px</dimen>
     <dimen name="module_media_pop_window_text_top_size">35px</dimen>
     <dimen name="module_media_pop_window_text_bottom_size">24px</dimen>
     <dimen name="module_media_pop_window_control_img_size">56px</dimen>

modules/mogo-module-media/src/main/res/values/dimens.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_media_music_state_location">483px</dimen>
+    <dimen name="module_media_music_state_location">470px</dimen>
     <dimen name="module_media_music_state_location_x">573px</dimen>
 
     <!-- lcc start-->
@@ -64,10 +64,10 @@
     <dimen name="module_media_pop_window_width">322px</dimen>
     <dimen name="module_media_pop_window_height">66.7px</dimen>
     <dimen name="module_media_pop_window_inner_height">60px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">12px</dimen>
+    <dimen name="module_media_pop_window_inner_padding">18px</dimen>
     <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
     <dimen name="module_media_pop_window_text_width">123px</dimen>
-    <dimen name="module_media_pop_window_text_margin">13px</dimen>
+    <dimen name="module_media_pop_window_text_margin">10px</dimen>
     <dimen name="module_media_pop_window_text_top_size">18px</dimen>
     <dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
     <dimen name="module_media_pop_window_control_img_size">30px</dimen>

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: