Merge remote-tracking branch 'origin/feature/feature_mogo_obu' into feature/feature_mogo_obu
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -31,7 +31,7 @@
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="VisualizationToolProject">
|
||||
|
||||
@@ -19,7 +19,7 @@ public class MoGoObuProvider implements IMoGoObuProvider {
|
||||
public void init(Context context) {
|
||||
Logger.d(MogoObuConst.TAG_MOGO_OBU, "初始化蘑菇自研OBU……");
|
||||
|
||||
MogoSelfObuManager.getInstance().init(context);
|
||||
MogoPrivateObuManager.getInstance().init(context);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -27,21 +27,21 @@ import static com.mogo.module.obu.mogo.MogoObuConst.TAG_MOGO_OBU;
|
||||
*
|
||||
* @author lixiaopeng
|
||||
*/
|
||||
public class MogoSelfObuManager {
|
||||
public class MogoPrivateObuManager {
|
||||
final String icw_data = "02000114010000000000001effd7892b11a4440af70100142a03000907e506100e2917019000005662010a45000b0000220847162c000037970010000a17f6215c459478b6010347ac045000090a0006012c01f4009600080073007300730073000b000000000000000000000000000000002b000037780000247300003261000000000000426c827f47001200100000000000000000000021220000349a006c0010000a17f63ecb45947ba301030000332c0010000a17f642e945947bea010300004d580010000a17f6435545947e4e0103000054c40010000a17f6413a45947f96010300005c300010000a17f62c2845947d140103000070e40010000a17f5fdb14594786001030000992000060004ffec2710";
|
||||
|
||||
private List<ADASRecognizedResult> resultList = null;
|
||||
|
||||
private MogoSelfObuManager() {
|
||||
private MogoPrivateObuManager() {
|
||||
}
|
||||
|
||||
private volatile static MogoSelfObuManager instance = null;
|
||||
private volatile static MogoPrivateObuManager instance = null;
|
||||
|
||||
public static MogoSelfObuManager getInstance() {
|
||||
public static MogoPrivateObuManager getInstance() {
|
||||
if (instance == null) {
|
||||
synchronized (MogoSelfObuManager.class) {
|
||||
synchronized (MogoPrivateObuManager.class) {
|
||||
if (instance == null) {
|
||||
instance = new MogoSelfObuManager();
|
||||
instance = new MogoPrivateObuManager();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -254,11 +254,9 @@ public class MogoSelfObuManager {
|
||||
|
||||
}
|
||||
|
||||
// public void release() {
|
||||
// NebulaObuClient.getInstance().unregisterObu();
|
||||
// NebulaObuClient.getInstance().unregisterObuListener();
|
||||
// MogoObuManager.getInstance().unregisterListener();
|
||||
// }
|
||||
public void release() {
|
||||
MogoObuManager.getInstance().unregisterListener();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Reference in New Issue
Block a user