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

[2.13.0-arch-opt] fix obu bug of list is null

Browse Source
This commit is contained in:
zhongchao
2023-02-24 15:05:06 +08:00
parent d8d05f10f5
commit 5d378b833b
7 changed files with 25 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/mogo-adas/build.gradle
View File

@@ -71,18 +71,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogoservicebiz
//okhttp3的依赖
implementation 'com.squareup.okhttp3:okhttp:3.12.3'
// parser
// implementation rootProject.ext.dependencies.gson
implementation project(':libraries:mogo-adas-data')
// logger
//implementation 'com.orhanobut:logger:2.2.0'
//ProtoBuf
// implementation 'com.google.protobuf:protobuf-java:3.6.1'
// implementation 'com.google.protobuf:protoc:3.6.1'
// implementation 'com.google.protobuf:protobuf-java-util:3.6.1'
// api project(path: ':lib_recorder')
// api "com.zhidao.support.recorder:recorder:1.0.0.3"
}
task androidSourcesJar(type: Jar) {

2
libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java
View File

@@ -3,7 +3,6 @@ package com.zhidao.support.obu;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mogo.support.obu.MogoObuManager;
import com.mogo.support.obu.ObuBase;
@@ -112,7 +111,6 @@ public class ObuManager {
* @return 版本 null表示 无法连接OBU；无法获取版本；
* @since 1.1.0
*/
@Nullable
public String getObuVersion() {
return MogoObuManager.getInstance().getObuVersion();
}

54
libraries/mogo-obu/src/main/java/com/zhidao/support/obu/Test.java
View File

@@ -1,54 +0,0 @@
package com.zhidao.support.obu;
import com.mogo.support.obu.constants.MogoObuConstants;
import com.mogo.support.obu.model.MogoObuHvBasicsData;
import com.mogo.support.obu.model.advance.AccFourAxes;
import com.mogo.support.obu.model.advance.VehBasics;
import com.mogo.support.obu.model.advance.VehControl;
import com.mogo.support.obu.model.advance.VehSize;
public class Test {
private int have(int unitMask, int mask) {
unitMask += mask;
return unitMask;
}
public void buildMogoObuHvBasicsData() {
int vehBasicsUnitMask = 0;
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.ID);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.SEC_MARK);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.LATITUDE);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.LONGITUDE);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.ELEVATION);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.SPEED);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.HEADING);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.ACC_FOUR_AXES);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.VEH_SIZE);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.VEH_CLASS);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.VEH_CONTROL_MSG);
vehBasicsUnitMask = have(vehBasicsUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_BASICS.TARGET_POSITION);
VehBasics vehBasics = new VehBasics(vehBasicsUnitMask);
vehBasics.setId("aaa");
vehBasics.setLatitude(10000000);
vehBasics.setLongitude(20000000);
vehBasics.setElevation(2000);
vehBasics.setSpeed(3000);
vehBasics.setHeading(4000);
vehBasics.setAccFourAxes(new AccFourAxes(200, 201, 202, 203));
vehBasics.setVehSize(new VehSize(300, 301, 302));
vehBasics.setVehClass(303);
int vehControlUnitMask = 0;
vehControlUnitMask = have(vehControlUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_CONTROL.BRAKE_PEDAL_STATUS);
vehControlUnitMask = have(vehControlUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_CONTROL.TRANSMISSION_STATUS);
vehControlUnitMask = have(vehControlUnitMask, MogoObuConstants.UNIT_MASK.MOGO_OBU_VEH_CONTROL.EXTERIOR_LIGHTS);
VehControl vehControl = new VehControl(vehControlUnitMask);
vehControl.setBrakePedalStatus(401);
vehControl.setTransmissionStatus(402);
vehControl.setExteriorLights(403);
vehBasics.setVehControlMsg(vehControl);
vehBasics.setTargetPosition(8);
MogoObuHvBasicsData data = new MogoObuHvBasicsData(1, vehBasics);
}
}

3
libraries/mogo-obu/src/main/res/values/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">mogo-obu</string>
</resources>