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

[6.6.0] fit bailing func

Browse Source
This commit is contained in:
EmArrow
2024-08-29 21:37:51 +08:00
parent 5abf65298e
commit bf40e5db07
12 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
View File

@@ -787,4 +787,9 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
}
@Override
public void onAutopilotStatusResponseFromCan(int state) {
}
}

5
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
View File

@@ -464,4 +464,9 @@ public class SweeperOperatePresenter extends Presenter<SweeperOperateFragment>
@Override
public void onAutopilotTrajectoryDownloadReq(@NonNull AutopilotControlParameters.AutoPilotLine autoPilotLine, int downloadType) {
}
@Override
public void onAutopilotStatusResponseFromCan(int state) {
}
}

32
app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
View File

@@ -4,13 +4,14 @@ import android.content.Context
import com.google.gson.reflect.TypeToken
import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.app.UrlConfig
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.config.HdMapBuildConfig
import com.mogo.eagle.core.data.config.HmiBuildConfig
import com.mogo.eagle.core.data.app.UrlConfig
import com.mogo.eagle.core.data.config.JunkConfig
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.GsonUtils
import com.mogo.eagle.core.utilcode.util.ProcessUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.launcher.BuildConfig
import com.mogo.launcher.R
@@ -42,8 +43,6 @@ object ConfigStartUp {
FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER
// 演示模式,上一次勾选的数据
FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE
// app安装的身份信息 todo yakun 多进程
FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
FunctionBuildConfig.ttsLanguage = BuildConfig.ttsLanguage
// 支持的业务类型
if(!StringUtils.isEmpty(BuildConfig.supportBusiness)&&BuildConfig.supportBusiness!="null"){
@@ -59,20 +58,19 @@ object ConfigStartUp {
//是否支持Patch升级
FunctionBuildConfig.isSupportPatchUpgrade = BuildConfig.IS_SUPPORT_PATCH_UPGRADE
// // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端 TODO 暂时不启用，仅做洱海交付，独立乘客屏+宣传视频
// if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
// if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
// FunctionBuildConfig.appIdentityMode = 0xA1
// } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
// FunctionBuildConfig.appIdentityMode = 0x01
// }
// } else {
// if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
// FunctionBuildConfig.appIdentityMode = 0xA0
// } else if (AppIdentityModeUtils.isTaxi(BuildConfig.APP_IDENTITY_MODE)) {
// FunctionBuildConfig.appIdentityMode = 0x00
// }
// }
// app安装的身份信息
// FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
// // 这里影响当前Activity的身份信息，多进程，主进程为乘客端，:passenger 进程为司机端 TODO 暂时不启用，仅测试3588，在B2 2024车预研
if (DebugConfig.isMultiDisplay()) {
if(ProcessUtils.getCurrentProcessName().contains(":passenger")){
FunctionBuildConfig.appIdentityMode = "Product_Driver_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}else{
FunctionBuildConfig.appIdentityMode = "Product_Passenger_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}
}else{
FunctionBuildConfig.appIdentityMode = "Product_${BuildConfig.APP_IDENTITY_MODE_BODY}_${BuildConfig.APP_IDENTITY_MODE_TAIL}"
}
// 不同身份对应不同的IP地址
FunctionBuildConfig.adasConnectIP = BuildConfig.ADAS_CONNECT_IP
// 是否开启secure校验

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt
View File

@@ -221,9 +221,7 @@ object DataManager {
* 从本地数据库中查询数据
*/
fun queryAllMessages(context: Context) {
if (!ProcessUtils.isMainProcess(context)) {
return
}
CallerLogger.i("DataManager", "queryAllMessages")
clearMessageBoxTable(context)
scope.launch {
initCache()

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

@@ -26,6 +26,8 @@ import com.mogo.eagle.core.function.call.devatools.CallerPowerOffManager
import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.tools.DockerRebootDialog
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.util.ParseVersionUtils
@@ -232,8 +234,10 @@ class CheckSystemView @JvmOverloads constructor(
//将是否正在下发一键停服命令标签改为true
isExecutingPowerOff = true
CallerDevaToolsManager.setPowerOffStatus(1)
hmiAction("$M_HMI$TAG", mapOf("powerOff" to true))
//系统命令请求 关机
powerOffMsgId = CallerAutoPilotControlManager.sendIpcPowerOff()
hmiAction("$M_HMI$TAG", mapOf("powerOffID" to powerOffMsgId))
//开始执行10秒等待倒计时
CallerDevaToolsManager.startCommandWaitCountDown()
}

1
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
View File

@@ -123,6 +123,7 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
// 监听工控机连接信息
CallerAutoPilotStatusListenerManager.addListener(TAG, this)
CallerRequestActivityHandleManager.addListener(TAG, this)
d(SceneConstant.M_HMI + TAG, "stage two 启动")
initStageTwo()
// 加载模块
mPresenter!!.postLoadModuleMsg()

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

@@ -5,45 +5,29 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_INI
import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_STATUS;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.os.Process;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.module.intent.IMogoIntentListener;
import com.mogo.commons.module.intent.IntentManager;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener;
import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager;
import com.mogo.eagle.core.function.hmi.R;
import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.commons.storage.SharedPrefsMgr;
import com.rousetime.android_startup.model.CostTimesModel;
import com.zhjt.service.chain.ChainLog;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Set;
/**
* 多进程乘客屏启动launcher 亿金 司乘 activity 互换
*
* @author tongchenfei
*/
public class PassengerLauncherActivity extends MainActivity {
public class PassengerLauncherActivity extends MainActivity {
private static final String TAG = "PassengerLauncherActivity";
@Override
@@ -64,13 +48,11 @@ public class PassengerLauncherActivity extends MainActivity {
* 加载网约车模块
*/
private void loadOCHModule() {
if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
IMoGoFunctionProvider ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());
if (ochProvider != null) {
ochProvider.createCoverage(this, R.id.module_main_id_och_fragment);
}
IMoGoFunctionProvider ochProvider = (IMoGoFunctionProvider) ARouter.getInstance()
.build("/driver/api")
.navigation(getContext());
if (ochProvider != null) {
ochProvider.createCoverage(this, R.id.module_main_id_och_fragment);
}
}

4
core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
View File

@@ -92,9 +92,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>(), IMoGoCloudListener {
}
override fun create(context: Context): Boolean {
if (!ProcessUtils.isMainProcess()) {
return true
}
CallerLogger.d("$M_MAIN$TAG", "httpDns start up")
this.context = context
initGDLoc()
preparePassportEnvironment()

2
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ProcessUtils.java
View File

@@ -272,7 +272,7 @@ public final class ProcessUtils {
return processName;
}
public static boolean isMainProcess( Context context ) { //todo emArrow 多进程
public static boolean isMainProcess( Context context ) {
try {
ActivityManager activityManager = ( ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE ) );
if ( activityManager == null ) {

4
foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
View File

@@ -87,9 +87,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem
)
@Override
public void init(Context context, String sn, String appId, double lat, double lon) {
if (!ProcessUtils.isMainProcess()) {
return;
}
CallerLogger.w(TAG, "init");
this.mAppId = appId;
SocketManager.getInstance().registerSocketConnCallback(this);
SocketManager.getInstance().registerSocketErrorCallback(TAG, this);

2
foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
View File

@@ -66,7 +66,7 @@ public abstract class AbsMogoApplication extends Application {
}
protected boolean shouldInit() {
return ProcessUtils.isMainProcess(this);
return ProcessUtils.isMainProcess(this) || ProcessUtils.getCurrentProcessName().contains(":passenger");
}
/**

2
foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
View File

@@ -35,7 +35,7 @@ public abstract class MvpActivity<V extends IView, P extends Presenter<V>> exten
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
super.onCreate(savedInstanceState);
if (!ProcessUtils.isMainProcess(this)) {
if (!(ProcessUtils.isMainProcess(this) || ProcessUtils.getCurrentProcessName().contains(":passenger"))) {
return;
}
setContentView(getLayoutId());