1. 调整9832多媒体浮框位置

2. 调整多渠道多媒体模块的加载逻辑
3. 调整独立app的back键触发
This commit is contained in:
tongchenfei
2020-06-09 17:50:49 +08:00
parent 8e2a220621
commit d3d4a713c3
5 changed files with 18 additions and 8 deletions

View File

@@ -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;
@@ -242,7 +243,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();

View File

@@ -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;

View File

@@ -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-->

View File

@@ -354,7 +354,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
}
break;
default:
showShareDialog();
// showShareDialog();
break;
}
case VOICE_CMD_PUB_ROAD_CONDITION: