From 75367625ed7245cab712bd88aa08d2d93dd1f31d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 15 Jul 2020 16:48:41 +0800 Subject: [PATCH 1/4] upgrade tanlu version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index aec68a184c..4601487404 100644 --- a/gradle.properties +++ b/gradle.properties @@ -57,7 +57,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.16 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.0.1-SNAPSHOT +MOGO_MODULE_TANLU_VERSION=1.3.0.2 # 车聊聊 CARCHATTING_VERSION=1.3.2 # 车聊聊接口 @@ -77,7 +77,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.5 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.0.1-SNAPSHOT +TANLULIB_VERSION=1.3.0.2 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 From d1b983c6116be9c91d3cb4837436d683c4f47947 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 15 Jul 2020 17:11:23 +0800 Subject: [PATCH 2/4] =?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); } From 413b0f2a990d1dd182247f61d49579632e9e4454 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 15 Jul 2020 19:05:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9module-byd=E4=B8=BAmodule?= =?UTF-8?q?-splash=EF=BC=8C=E6=9A=82=E6=9C=AA=E4=BD=BF=E7=94=A8module-spla?= =?UTF-8?q?sh-noop=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 4 +- app/build.gradle | 22 +------ config.gradle | 6 +- gradle.properties | 61 +++++++++--------- .../com/zhidao/mogo/module/byd/BydConst.kt | 6 -- .../com/mogo/module/main/MainActivity.java | 2 +- .../module/main/cards/MogoModulesHandler.java | 2 +- .../module/main/cards/MogoModulesManager.java | 5 +- .../.gitignore | 0 .../build.gradle | 0 .../consumer-rules.pro | 0 .../gradle.properties | 2 +- .../proguard-rules.pro | 0 .../module/splash}/ExampleInstrumentedTest.kt | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../zhidao/mogo/module/splash}/BydConst.kt | 2 +- .../zhidao/mogo/module/splash}/BydProvider.kt | 6 +- .../mogo/module/splash}/ExampleUnitTest.kt | 2 +- .../.gitignore | 0 .../build.gradle | 0 .../consumer-rules.pro | 0 .../gradle.properties | 2 +- .../proguard-rules.pro | 0 .../module/splash}/ExampleInstrumentedTest.kt | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../com/zhidao/mogo/module/splash/BydConst.kt | 6 ++ .../zhidao/mogo/module/splash}/BydProvider.kt | 17 +++-- .../splash}/fragment/BydSplashFragment.kt | 6 +- .../splash}/presenter/BydSplashPresenter.kt | 4 +- .../src/main/res/drawable-xhdpi/binli.jpg | Bin .../main/res/layout/fragment_byd_splash.xml | 0 .../mogo/module/splash}/ExampleUnitTest.kt | 2 +- .../com/mogo/service/MogoServicePaths.java | 2 +- settings.gradle | 4 +- upload.sh | 1 - 35 files changed, 76 insertions(+), 96 deletions(-) delete mode 100644 modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt rename modules/{mogo-module-byd-noop => mogo-module-splash-noop}/.gitignore (100%) rename modules/{mogo-module-byd-noop => mogo-module-splash-noop}/build.gradle (100%) rename modules/{mogo-module-byd-noop => mogo-module-splash-noop}/consumer-rules.pro (100%) rename modules/{mogo-module-byd-noop => mogo-module-splash-noop}/gradle.properties (51%) rename modules/{mogo-module-byd-noop => mogo-module-splash-noop}/proguard-rules.pro (100%) rename modules/{mogo-module-byd-noop/src/androidTest/java/com/zhidao/mogo/module/byd => mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash}/ExampleInstrumentedTest.kt (94%) rename modules/{mogo-module-byd => mogo-module-splash-noop}/src/main/AndroidManifest.xml (65%) rename modules/{mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd => mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash}/BydConst.kt (73%) rename modules/{mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd => mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash}/BydProvider.kt (91%) rename modules/{mogo-module-byd-noop/src/test/java/com/zhidao/mogo/module/byd => mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash}/ExampleUnitTest.kt (89%) rename modules/{mogo-module-byd => mogo-module-splash}/.gitignore (100%) rename modules/{mogo-module-byd => mogo-module-splash}/build.gradle (100%) rename modules/{mogo-module-byd => mogo-module-splash}/consumer-rules.pro (100%) rename modules/{mogo-module-byd => mogo-module-splash}/gradle.properties (55%) rename modules/{mogo-module-byd => mogo-module-splash}/proguard-rules.pro (100%) rename modules/{mogo-module-byd/src/androidTest/java/com/zhidao/mogo/module/byd => mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash}/ExampleInstrumentedTest.kt (94%) rename modules/{mogo-module-byd-noop => mogo-module-splash}/src/main/AndroidManifest.xml (65%) create mode 100644 modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt rename modules/{mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd => mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash}/BydProvider.kt (77%) rename modules/{mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd => mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash}/fragment/BydSplashFragment.kt (76%) rename modules/{mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd => mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash}/presenter/BydSplashPresenter.kt (53%) rename modules/{mogo-module-byd => mogo-module-splash}/src/main/res/drawable-xhdpi/binli.jpg (100%) rename modules/{mogo-module-byd => mogo-module-splash}/src/main/res/layout/fragment_byd_splash.xml (100%) rename modules/{mogo-module-byd/src/test/java/com/zhidao/mogo/module/byd => mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash}/ExampleUnitTest.kt (89%) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 407bc58beb..97996e66c3 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -27,8 +27,6 @@