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

[640][app] 添加获取界面后的证书

Browse Source
This commit is contained in:
xinfengkun
2024-04-08 17:40:02 +08:00
parent 4e35d90a57
commit a6487c4966
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -130,8 +130,8 @@ class MoGoAutopilotControlProvider :
.setPingAddressList(AdasManager.getInstance().pingAddressList)
.setPassenger(false)
.setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
.setRootCrt(CallerCloudCertManager.getRootCrtF())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtF())
.setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
.setUnableLaunchAutopilotGear(FunctionBuildConfig.unableLaunchAutopilotGear)
// .setSubscribeInterfaceOptions(subscribeInterfaceOptions)//
.build()
@@ -261,8 +261,8 @@ class MoGoAutopilotControlProvider :
.setPingAddressList(AdasManager.getInstance().pingAddressList)
.setPassenger(false)// 乘客端直连工控机改为false
.setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
.setRootCrt(CallerCloudCertManager.getRootCrtF())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtF())
.setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
.setUnableLaunchAutopilotGear(FunctionBuildConfig.unableLaunchAutopilotGear)
.build()
AdasManager.getInstance().create(mContext, options, MoGoAdasMsgConnectStatusListenerImpl())
@@ -322,8 +322,8 @@ class MoGoAutopilotControlProvider :
val options = AdasOptions.newBuilder()
.setPassenger(false)
.setEnableCertification(SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE))
.setRootCrt(CallerCloudCertManager.getRootCrtF())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtF())
.setRootCrt(CallerCloudCertManager.getRootCrtFDecode())
.setDeviceCrt(CallerCloudCertManager.getDeviceCrtFDecode())
.setConnectionMode(AdasOptions.IPC_CONNECTION_MODE.SPECIFIED)
.setSpecifiedAddress(autoPilotIp)
.build()

10
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudCertManager.kt
View File

@@ -27,6 +27,14 @@ object CallerCloudCertManager {
}
fun getDeviceCrtF(): String? {
return certProviderApi.getDeviceCrtF()
}
fun getRootCrtF(): String? {
return certProviderApi.getRootCrtF()
}
fun getDeviceCrtFDecode(): String? {
var crt = certProviderApi.getDeviceCrtF()
if (!crt.isNullOrEmpty()) {
crt = String(Base64.decode(crt, Base64.NO_WRAP), StandardCharsets.UTF_8)
@@ -34,7 +42,7 @@ object CallerCloudCertManager {
return crt
}
fun getRootCrtF(): String? {
fun getRootCrtFDecode(): String? {
var crt = certProviderApi.getRootCrtF()
if (!crt.isNullOrEmpty()) {
crt = String(Base64.decode(crt, Base64.NO_WRAP), StandardCharsets.UTF_8)