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

[BadCase]更新Adas版本号

Browse Source
This commit is contained in:
renwj
2022-01-20 19:24:11 +08:00
parent 088b293f23
commit 4d4a200e38
6 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.gradle
View File

@@ -114,7 +114,7 @@ ext {
obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19',
mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10',
adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate4',
adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate6',
// google
googlezxing : "com.google.zxing:core:3.3.3",

4
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
View File

@@ -110,7 +110,7 @@ class MoGoAutopilotProvider :
AdasManager.getInstance().rebootIPC()
}
override fun recordCause(key: String?, name: String?, reason: String?) {
AdasManager.getInstance().recordCause(key, name, reason)
override fun recordCause(key: String?, name: String?, id: String?, reason: String?) {
AdasManager.getInstance().recordCause(key, name, id, reason)
}
}

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
View File

@@ -305,7 +305,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
itx.onDismiss {
val record =
autoPilotBadCaseEntrance?.getTag(R.id.autopilot_badcase_record) as? AutoPilotRecordResult
CallerAutoPilotManager.recordCause(record?.key, record?.fileName, null)
dismissBadCaseFloatView()
}
itx.onSelect {
@@ -334,7 +333,12 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
Logger.i(TAG, "ok:${body}")
dismissBadCaseFloatView()
dismiss?.invoke()
CallerAutoPilotManager.recordCause(
record?.key,
record?.fileName,
it.id, it.reason)
ToastUtils.showShort("接管反馈成功~")
record?.consumed = true
return@launch
}
Logger.e(TAG, "fail:${body}")
@@ -343,13 +347,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
t.printStackTrace()
ToastUtils.showShort("网络请求失败，请尝试联网~")
Logger.e(TAG, "exception:${t.message}")
} finally {
record?.consumed = true
CallerAutoPilotManager.recordCause(
record?.key,
record?.fileName,
it.id
)
}
}
}

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.java
View File

@@ -66,7 +66,7 @@ public interface IMoGoAutopilotProvider extends IMoGoFunctionServerProvider {
* @param name 文件名字
* @param reason 原因
*/
void recordCause(String key, String name, String reason);
void recordCause(String key, String name, String id, String reason);
/**
* 关机

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt
View File

@@ -75,8 +75,8 @@ object CallerAutoPilotManager {
return providerApi?.setAutoPilotSpeed(speed) ?: false
}
fun recordCause(key: String?, name: String?, reason: String?) {
providerApi?.recordCause(key, name, reason)
fun recordCause(key: String?, name: String?, id: String?, reason: String?) {
providerApi?.recordCause(key, name, id, reason)
}
fun setIPCShutDown() {

61
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
View File

@@ -26,7 +26,6 @@ import com.zhidao.support.adas.high.bean.AutopilotWayArrive;
import com.zhidao.support.adas.high.bean.CarLaneInfo;
import com.zhidao.support.adas.high.bean.CarStateInfo;
import com.zhidao.support.adas.high.bean.IPCUpgradeInfo;
import com.zhidao.support.adas.high.bean.IPCUpgradePatchDownloadStatusInfo;
import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo;
import com.zhidao.support.adas.high.bean.LightStatueInfo;
import com.zhidao.support.adas.high.bean.ObstaclesInfo;
@@ -231,38 +230,40 @@ public class OnAdasListenerAdapter implements OnAdasListener {
*/
@Override
public void onUpgradeStateInfo(IPCUpgradeStateInfo info) {
if(info!=null){
Logger.d(TAG,"onUpgradeStateInfo : "+info.getUpgradeStatus());
boolean upgradeStatus=false;//工控机升级状态，true代表升级成功 false代表升级失败,默认为false
if(info.getUpgradeStatus() == IPCUpgradeStateInfo.Status.SUCCESSFUL.code){
upgradeStatus=true;//升级成功
//升级结束确认
AdasManager.getInstance().sendBaseInfo(IPCUpgradeInfo.upgradeFinishAffirm());
}else if(info.getUpgradeStatus() == IPCUpgradeStateInfo.Status.FAILED.code){
upgradeStatus=false;//升级失败
}
Logger.d(TAG,"onUpgradeStateInfo : "+(upgradeStatus ? "升级成功" :"升级失败"));
CallerHmiManager.INSTANCE.showAdUpgradeStatus(upgradeStatus);
}else{
Logger.d(TAG,"onUpgradeStateInfo : upgrade status info is null");
}
// if(info!=null){
// Logger.d(TAG,"onUpgradeStateInfo : "+info.getUpgradeStatus());
// boolean upgradeStatus=false;//工控机升级状态，true代表升级成功 false代表升级失败,默认为false
// if(info.getUpgradeStatus() == IPCUpgradeStateInfo.Status.SUCCESSFUL.code){
// upgradeStatus=true;//升级成功
// //升级结束确认
// AdasManager.getInstance().sendBaseInfo(IPCUpgradeInfo.upgradeFinishAffirm());
// }else if(info.getUpgradeStatus() == IPCUpgradeStateInfo.Status.FAILED.code){
// upgradeStatus=false;//升级失败
// }
// Logger.d(TAG,"onUpgradeStateInfo : "+(upgradeStatus ? "升级成功" :"升级失败"));
// CallerHmiManager.INSTANCE.showAdUpgradeStatus(upgradeStatus);
// }else{
// Logger.d(TAG,"onUpgradeStateInfo : upgrade status info is null");
// }
}
/**
* 工控机下载状态
* @param info 工控机升级包下载进度
*/
@Override
public void onUpgradePatchDownloadStatus(IPCUpgradePatchDownloadStatusInfo info) {
if(info!=null){
Logger.d(TAG,"onUpgradePatchDownloadStatus : status="+info.getDownloadStatus() +
" version="+info.getDownloadVersion()+ " progress="+info.getDownloadProgress());
CallerHmiManager.INSTANCE.showAdDownloadStatus(info.getDownloadVersion(),info.getDownloadStatus(),info.getDownloadProgress());
}else{
Logger.d(TAG,"onUpgradePatchDownloadStatus : download status info is null");
}
// /**
// * 工控机下载状态
// * @param info 工控机升级包下载进度
// */
// @Override
// public void onUpgradePatchDownloadStatus(IPCUpgradePatchDownloadStatusInfo info) {
// if(info!=null){
// Logger.d(TAG,"onUpgradePatchDownloadStatus : status="+info.getDownloadStatus() +
// " version="+info.getDownloadVersion()+ " progress="+info.getDownloadProgress());
// CallerHmiManager.INSTANCE.showAdDownloadStatus(info.getDownloadVersion(),info.getDownloadStatus(),info.getDownloadProgress());
// }else{
// Logger.d(TAG,"onUpgradePatchDownloadStatus : download status info is null");
// }
//
// }
}
@Override
public void onSSHResult(SSHResult info) {