From d1b983c6116be9c91d3cb4837436d683c4f47947 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 15 Jul 2020 17:11:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E6=AF=94=E4=BA=9A?= =?UTF-8?q?=E8=BF=AA=E5=88=86=E4=BA=AB=E6=A1=86=E5=BC=B9=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=202.=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=AF=94=E4=BA=9A=E8=BF=AAFull=20Screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/commons/mvp/MvpActivity.java | 9 +++++++++ .../main/independent/MainIndependentActivity.java | 10 ++++++++++ .../com/mogo/module/common/dialog/BaseFloatDialog.java | 2 +- .../main/java/com/mogo/module/share/ShareControl.java | 5 +++++ .../java/com/mogo/service/share/IMogoShareManager.java | 8 ++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 82ed20b2f0..c31eb8b869 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -4,9 +4,14 @@ import android.content.Context; import android.os.Bundle; import android.view.MotionEvent; +import android.view.Window; +import android.view.WindowManager; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; + +import com.mogo.commons.debug.DebugConfig; import com.mogo.utils.SoftKeyBoardJobber; /** @@ -23,6 +28,10 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > > @Override protected void onCreate( @Nullable Bundle savedInstanceState ) { super.onCreate( savedInstanceState ); + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) { + requestWindowFeature(Window.FEATURE_NO_TITLE); + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + } setContentView( getLayoutId() ); initViews(); mPresenter = createPresenter(); diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 7ccaebd058..0c04f66cd9 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -6,7 +6,11 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; +import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.main.MainActivity; +import com.mogo.service.IMogoServiceApis; +import com.mogo.service.MogoServicePaths; /** * 针对独立应用形式，做单独定制 @@ -19,6 +23,12 @@ public class MainIndependentActivity extends MainActivity { super.onCreate( savedInstanceState ); // 独立app需要在onCreate里面增加处理scheme的情况 mPresenter.handleSchemeIntent( getIntent() ); + + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) { + IMogoServiceApis apis = + (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this); + apis.getShareManager().resetContext(this); + } } @Override diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java index 3a66bd5939..8d9b3dc3a1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java @@ -20,7 +20,7 @@ public class BaseFloatDialog extends Dialog { public BaseFloatDialog(@NonNull Context context, int themeResId) { super(context, themeResId); - addFlag(); +// addFlag(); } private void addFlag() { 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 02586d686b..2994dcbc77 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 @@ -115,6 +115,11 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo } } + @Override + public void resetContext(Context context) { + mContext = context; + } + private void realShowDialog() { if (mShareDialog == null) { mShareDialog = new LaucherShareDialog(mContext); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java index 8d16700dfc..f74b14b110 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java @@ -1,5 +1,7 @@ package com.mogo.service.share; +import android.content.Context; + import com.mogo.service.module.IMogoModuleProvider; /** @@ -16,4 +18,10 @@ public interface IMogoShareManager extends IMogoModuleProvider { * 隐藏分享框 */ void dismissShareDialog(); + + /** + * 重置一下上下文，普通dialog需要activity的上下文 + * @param context 待重置的上下文 + */ + void resetContext(Context context); }