From 2542086f97dc8c494fbd24f64e436277bb75f992 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Thu, 9 Mar 2023 23:05:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20OCH=20=E5=AE=A3=E4=BC=A0=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E6=8A=BD=E5=8F=96=E5=88=B0common;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/MogoOCHBusPassenger.java | 10 ++++------ .../module/wigets/video/VideoPlayerActivity.kt | 11 +++++++++++ .../main/res/layout/activity_video_player.xml | 17 ++++++++++------- .../function/main/MainLauncherActivity.java | 3 --- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 1598873f2c..3bf45d5f18 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -3,8 +3,6 @@ package com.mogo.och.bus.passenger; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; import android.content.Context; -import android.content.Intent; -import android.util.Log; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; @@ -14,6 +12,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils; import com.mogo.och.bus.passenger.constant.BusPassengerConst; import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment; import com.mogo.och.common.module.wigets.video.VideoPlayerActivity; @@ -45,10 +44,9 @@ public class MogoOCHBusPassenger implements IMogoOCH { this.mActivity = activity; this.mContainerId = containerId; showFragment(); - Log.d(TAG, "MogoOCHBusPassenger-init"); - if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) - && AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { - activity.startActivity(new Intent(activity, VideoPlayerActivity.class)); + + if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { + MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class); } return null; } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt index 76fb4caa92..ee855ae81c 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerActivity.kt @@ -1,7 +1,18 @@ package com.mogo.och.common.module.wigets.video +import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import com.mogo.eagle.core.utilcode.util.BarUtils +import com.mogo.och.common.module.R class VideoPlayerActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_video_player) + val fragment = VideoPlayerFragment() + supportFragmentManager.beginTransaction().add(R.id.videoPlayerContainer, fragment) + .commitAllowingStateLoss() + BarUtils.hideStatusBarAndSticky(this.window) + } } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml b/OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml index fed57e72e9..4af9cb07d9 100644 --- a/OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml +++ b/OCH/mogo-och-common-module/src/main/res/layout/activity_video_player.xml @@ -1,13 +1,16 @@ - + android:background="@drawable/road_video_bg" + tools:context="com.mogo.eagle.core.function.main.VideoAdAtc"> - - - \ No newline at end of file + android:layout_height="match_parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 5c5fc11650..3d8721a439 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -129,9 +129,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/passenger/api") .navigation(getContext()); -// MultiDisplayUtils.INSTANCE.startActWithSecond( -// this, -// VideoAdAtc.class); } else { ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() .build("/noop/api")