From 2220c4961b5233da7f4ee7d86120b2d8d2bfda06 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 21 一月 2020 11:22:01 +0800
Subject: [PATCH] 修改地图显示 0010 和000f消息
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 2 +
app/src/main/java/safeluck/drive/evaluation/app.java | 6 +-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 1
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 71 +++++++++++++++++++----------------
4 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 995aafe..4458296 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -69,5 +69,7 @@
public static final int PASSING_SCORE = 80;
public static final int DEBUG_RTCM = 0x000f;
public static final int DEBUG_TXT = 0x0010;
+ public static final String BIND_RTCM_TOPIC = "BIND_RTCM_TOPIC";
+ public static final String BIND_DEBUG_TXT = "BIND_DEBUG_TXT";
public static String exam_enter_exitdata="exam_enter_exitdata";
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 5ae8817..27e3599 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -66,7 +66,7 @@
super.onCreate();
//鍒濆鍖朏ragment 寤鸿鍦ˋpplication onCreate閲岄潰鍒濆鍖�
if (SystemUtil.compareProcessName(this)) {
- Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(false)
+ Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(true)
.handleException(new ExceptionHandler() {
@Override
public void onException(@NonNull Exception e) {
@@ -221,10 +221,10 @@
CEventCenter.dispatchEvent(Constant.REAL_TIME_POS_CAR_TOPIC,cmd,0,json);
break;
case Constant.DEBUG_RTCM:
- CEventCenter.dispatchEvent(Constant.REAL_TIME_POS_CAR_TOPIC,cmd,0,json);
+ CEventCenter.dispatchEvent(Constant.BIND_RTCM_TOPIC,cmd,0,json);
break;
case Constant.DEBUG_TXT:
- CEventCenter.dispatchEvent(Constant.REAL_TIME_POS_CAR_TOPIC,cmd,0,json);
+ CEventCenter.dispatchEvent(Constant.BIND_DEBUG_TXT,cmd,0,json);
break;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index a711d55..559f021 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -26,6 +26,9 @@
import com.google.gson.reflect.TypeToken;
+import org.json.JSONException;
+import org.json.JSONObject;
+
import java.lang.reflect.Type;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -39,6 +42,7 @@
import safeluck.drive.evaluation.bean.RealTimeCarPos;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
+import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
@@ -50,6 +54,36 @@
*/
public class MapFragment extends SupportFragment {
private boolean isDrawing = false;
+ private ICEventListener rtcmicEventListener = new ICEventListener() {
+ @Override
+ public void onCEvent(String topic, int msgCode, int resultCode, final Object obj) {
+ if (msgCode == Constant.DEBUG_RTCM){
+
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Log.i(TAG, "title="+(String)obj);
+ toolbar.setTitle((String)obj);
+ }
+ });
+ }
+ }
+ };
+ private ICEventListener debugTxticEventListener = new ICEventListener() {
+ @Override
+ public void onCEvent(String topic, int msgCode, int resultCode, final Object obj) {
+ if (msgCode == Constant.DEBUG_TXT){
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Log.i(TAG, "subtitle="+(String)obj);
+ toolbar.setSubtitle((String)obj);
+ }
+ });
+
+ }
+ }
+ };
public static SupportFragment newInstance() {
return new MapFragment();
@@ -344,7 +378,6 @@
@Override
public void onCEvent(String topic, final int msgCode, int resultCode, final Object obj) {
-// CThreadPoolExecutor.runInBackground(new CalRunnable(msgCode,(String)obj));
producer.execute(new Runnable() {
@Override
@@ -361,10 +394,6 @@
private String json;
private int cmd;
-// public CalRunnable(int cmd,String obj) {
-// this.json = obj;
-// this.cmd = cmd;
-// }
@Override
public void run() {
@@ -382,34 +411,6 @@
this.cmd = messageRemoteService.msgCode;
this.json = messageRemoteService.json;
MyLog.i(TAG, json);
-// if (!(cmd == Constant.REAL_TIME_CAR_POS)){
-// if (cmd == Constant.DEBUG_RTCM){
-// stringBuffer.append("\tRTCM:");
-// try {
-// JSONObject jsonObject = new JSONObject(json);
-// int length = jsonObject.getInt("length");
-// stringBuffer.append(length);
-// } catch (JSONException e) {
-// e.printStackTrace();
-// }
-// }
-// if (cmd == Constant.DEBUG_TXT){
-// try {
-// JSONObject jsonObject = new JSONObject(json);
-// String info = jsonObject.getString("info");
-// stringBuffer.append("\tinfo:");
-// stringBuffer.append(info);
-// } catch (JSONException e) {
-// e.printStackTrace();
-// }
-//
-// }
-// }
-// osd3 = stringBuffer.toString();
-// if (osd3!=null && osd3.contains("info:")&&osd3.contains("RTCM:")){
-//
-// stringBuffer.delete(0,stringBuffer.length());
-// }
RealTimeCarPos timeCarPos = gson.fromJson((String) json, RealTimeCarPos.class);
@@ -497,6 +498,8 @@
public void onAttach(Context context) {
super.onAttach(context);
CEventCenter.onBindEvent(true, icEventListener, Constant.REAL_TIME_POS_CAR_TOPIC);
+ CEventCenter.onBindEvent(true, rtcmicEventListener, Constant.BIND_RTCM_TOPIC);
+ CEventCenter.onBindEvent(true, debugTxticEventListener, Constant.BIND_DEBUG_TXT);
}
@Override
@@ -506,5 +509,7 @@
producer.shutdown();
consumer.shutdown();
CEventCenter.onBindEvent(false, icEventListener, Constant.REAL_TIME_POS_CAR_TOPIC);
+ CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_RTCM_TOPIC);
+ CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_DEBUG_TXT);
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 3f2ec67..fdf9965 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -297,6 +297,7 @@
break;
case R.id.view_map:
MapFragment mapFragment = findFragment(MapFragment.class);
+ MyLog.i(TAG,"鏌ョ湅鍦板浘");
if (mapFragment == null) {
mapFragment = (MapFragment) MapFragment.newInstance();
}
--
Gitblit v1.8.0