yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.6.0] union deviceUtil check and fix bug, close the multi device

Browse Source
This commit is contained in:
EmArrow
2024-08-30 19:01:46 +08:00
parent bf40e5db07
commit 1e7796f420
15 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
View File

@@ -37,7 +37,7 @@ class RomaPassengerView @JvmOverloads constructor(
private var controlVisible = true
init {
if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
if(DeviceUtils.isLeOrEb5Model()){
LayoutInflater.from(context).inflate(R.layout.view_roma_passenger_bg, this, true)
val a =
context.obtainStyledAttributes(attrs, R.styleable.RomaPassengerView, defStyleAttr, 0)
@@ -65,7 +65,7 @@ class RomaPassengerView @JvmOverloads constructor(
override fun onAttachedToWindow() {
super.onAttachedToWindow()
if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
if(DeviceUtils.isLeOrEb5Model()){
CallerMapRomaListener.addListener(TAG, this)
}
}
@@ -116,7 +116,7 @@ class RomaPassengerView @JvmOverloads constructor(
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
if(DeviceUtils.isLeOrEb5Model()){
CallerMapRomaListener.removeListener(TAG)
}
}

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
View File

@@ -50,7 +50,7 @@ public class MainLauncherActivity extends MainActivity {
// 多进程方案
CallerLogger.i(M_HMI + TAG, "MultiDisplayUtils startActWithSecond");
// MultiDisplayUtils.INSTANCE.startActWithSecond(this, "com.mogo.launcher.passenger");
MultiDisplayUtils.INSTANCE.startActWithSecond(this, PassengerLauncherActivity.class);
// MultiDisplayUtils.INSTANCE.startActWithSecond(this, PassengerLauncherActivity.class);
} catch (Exception e) {
e.printStackTrace();
}
@@ -105,7 +105,7 @@ public class MainLauncherActivity extends MainActivity {
} else {
// 目前只有金旅星辰乘客屏是连接的双屏
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/passenger/api")
.build("/driver/api")
.navigation(getContext());
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java
View File

@@ -49,7 +49,7 @@ public class PassengerLauncherActivity extends MainActivity {
*/
private void loadOCHModule() {
IMoGoFunctionProvider ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.build("/passenger/api")
.navigation(getContext());
if (ochProvider != null) {
ochProvider.createCoverage(this, R.id.module_main_id_och_fragment);