[fea]
[删除车型维度]
This commit is contained in:
yangyakun
2025-01-23 14:55:57 +08:00
parent 496af11530
commit bf313f04c1
98 changed files with 1540 additions and 1689 deletions

View File

@@ -59,7 +59,7 @@
android:hardwareAccelerated="true"
android:launchMode="singleTask"
android:resizeableActivity="false"
android:screenOrientation="landscape"
android:screenOrientation="locked"
android:resumeWhilePausing="true"
android:stateNotNeeded="true"
android:theme="@style/Main"
@@ -89,7 +89,7 @@
android:process=":passenger"
android:resizeableActivity="false"
android:resumeWhilePausing="true"
android:screenOrientation="landscape"
android:screenOrientation="locked"
android:stateNotNeeded="true"
android:theme="@style/Main"
android:windowSoftInputMode="adjustPan|stateHidden">

View File

@@ -2093,13 +2093,13 @@ internal class DebugSettingView @JvmOverloads constructor(
AppIdentityModeUtils.getProduct(
FunctionBuildConfig.appIdentityMode
)
}"
}_${AppIdentityModeUtils.getVehicle(FunctionBuildConfig.appIdentityMode)}"
tvAppVersionNameKey.text =
"鹰眼版本:${AppUtils.getAppVersionName()} Git Hash${AppConfigInfo.workingBranchHash}\n渠道信息:${AppConfigInfo.flavor}_${
AppIdentityModeUtils.getProduct(
FunctionBuildConfig.appIdentityMode
)
}"
}_${AppIdentityModeUtils.getVehicle(FunctionBuildConfig.appIdentityMode)}"
tvAutopilotProtocolVersionInfo.text =
"Autopilot协议版本${CallerAutoPilotControlManager.getProtocolVersion()}"

View File

@@ -45,17 +45,6 @@ public class MainLauncherActivity extends MainActivity {
EventBus.getDefault().register(this);
CallerLogger.i(M_HMI + TAG, "onCreate");
if(DebugConfig.isMultiDisplay()){
try {
// 在第二个屏幕启动乘客端app
// 多进程方案
CallerLogger.i(M_HMI + TAG, "MultiDisplayUtils startActWithSecond");
// MultiDisplayUtils.INSTANCE.startActWithSecond(this, "com.mogo.launcher.passenger");
// MultiDisplayUtils.INSTANCE.startActWithSecond(this, PassengerLauncherActivity.class);
} catch (Exception e) {
e.printStackTrace();
}
}
}
@Override
@@ -89,24 +78,17 @@ public class MainLauncherActivity extends MainActivity {
private void loadOCHModule() {
IMoGoFunctionProvider ochProvider;
// 兼容处理之前联想PAD及小巴车多个设备部署不同APP方案
if (!DebugConfig.isMultiDisplay()) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
Log.i("emArrow","Driver start");
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());
} else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
Log.i("emArrow","Passenger start");
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/passenger/api")
.navigation(getContext());
} else {
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());
}
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
Log.i("emArrow","Driver start");
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());
} else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
Log.i("emArrow","Passenger start");
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/passenger/api")
.navigation(getContext());
} else {
// 目前只有金旅星辰乘客屏是连接的双屏
ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());

View File

@@ -9,6 +9,7 @@ import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.module.MogoModule;
import com.mogo.commons.module.MogoModulePaths;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.mogo.commons.utils.MogoAnalyticUtils;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.constants.MogoServicePaths;