From b6edb915f535c67187a7ee449c1b31fe0be57c44 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 30 十一月 2020 16:11:15 +0800
Subject: [PATCH] 收到11和14号消息不再打印，因为太多了；进入/退出科二场地（ExamStatus)发送到ArcGismap以进行地图的放大和缩小
---
app/src/main/java/safeluck/drive/evaluation/app.java | 23 +++++++++++++++--------
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 27 +++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 8a8ed69..0bd8129 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -98,6 +98,9 @@
})
.install();
+
+
+
CrashHandler crashHandler = CrashHandler.getInstance();
crashHandler.init(getApplicationContext());
AYSdk.getInstance().init(getApplicationContext());
@@ -125,8 +128,8 @@
MyLog.i("寮�濮嬪垵濮嬪寲鏁版嵁鍙戦�佸湴鍥�/杞﹁締/mcu鍗囩骇鏂囦欢/鑰冭瘯鐘舵��="+type);
ExamPlatformData.getInstance().setExamType(type);
// OneTimeWorkRequest examStatausOutWorker = OneTimeWorkRequest.from(ExamStatusOutWorker.class);
- sendMapInfo();
- sendVechileInfo();
+// sendMapInfo();
+// sendVechileInfo();
sendRouteExam();
// DataInitKt.MCUUpgrade(getApplicationContext());
DataInitKt.sendExamLights(getApplicationContext());
@@ -272,14 +275,17 @@
int enter_status = -1;
@Override
public void callBackMsg(final int cmd, String json) {
- String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s,绾跨▼鍙�=%d,鏃堕棿=%s", cmd, json,Thread.currentThread().getId(),Utils.formatTimeYYMMDDHHmmSSSSS(System.currentTimeMillis()));
- if (strConent.equalsIgnoreCase(lastStr)){
+ if (cmd!=11 && cmd!=14){
+ String strConent = String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s,绾跨▼鍙�=%d,鏃堕棿=%s", cmd, json,Thread.currentThread().getId(),Utils.formatTimeYYMMDDHHmmSSSSS(System.currentTimeMillis()));
+ if (strConent.equalsIgnoreCase(lastStr)){
- }else{
+ }else{
- MyLog.d(TAG,strConent );
- lastStr = strConent;
+ MyLog.d(TAG,strConent );
+ lastStr = strConent;
+ }
}
+
switch (cmd) {
case Constant.ID_SM_BLUETOOTH_BRIEF:
CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
@@ -492,7 +498,7 @@
e.printStackTrace();
}
- MyLog.i("鏀跺埌鍛戒护13="+json);
+
CThreadPoolExecutor.runInBackground(new Runnable() {
@Override
public void run() {
@@ -501,6 +507,7 @@
examStatus.setMap_id(mapId);
examStatus.setMap_item(type);
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().insert(examStatus);
+ CEventCenter.dispatchEvent(Constant.BIND_EXAM_STATUS_TOPIC,cmd,0,examStatus);
}
});
// Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
index 1ba7024..7929b70 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -43,6 +43,7 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.BaseDataUIBean;
import safeluck.drive.evaluation.bean.ExamPlatformData;
@@ -64,6 +65,7 @@
public class ArcGisMapFragment extends SupportFragment implements View.OnClickListener {
private static final String TAG = ArcGisMapFragment.class.getSimpleName();
+ private static final int ENTER = 1;//杩涘叆 绉戜簩鏌愪釜椤圭洰鍦板浘
private LinkedBlockingQueue queue = new LinkedBlockingQueue(100);
private ExecutorService consumer = Executors.newSingleThreadExecutor();
@@ -90,6 +92,25 @@
// MyLog.i(TAG,"澶勭悊瀹�11.鏃堕棿="+Utils.formatTimeYYMMDDHHmmSSSSS(System.currentTimeMillis()));
+ }
+ };
+ private ICEventListener icEventListener1 = new ICEventListener() {
+ @Override
+ public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
+ if (msgCode==13){
+ ExamStatus examStatus = (ExamStatus)obj;
+ if (examStatus.getMap_id()>-1){
+ if (examStatus.getEnter()==ENTER){
+ MyLog.i(TAG,String.format("杩涘叆[%d] map",examStatus.getMap_id()));
+ double scale = mMapView.getMapScale();
+ mMapView.setViewpointScaleAsync(scale * 0.2*0.2);
+ }else{
+ MyLog.i(TAG,String.format("閫�鍑篬%d] map",examStatus.getMap_id()));
+ double scale = mMapView.getMapScale();
+ mMapView.setViewpointScaleAsync(scale * 5*5);
+ }
+ }
+ }
}
};
@@ -172,6 +193,7 @@
}
startWithPop(jiaXiaoFragment);
}
+
break;
}
@@ -319,6 +341,9 @@
SimpleFillSymbol simpleFillSymbolGls = new SimpleFillSymbol(SimpleFillSymbol.Style.SOLID, Color.argb(255,0,0,0), lineSymbolGls);
private void drawGlses(List<safeluck.drive.evaluation.bean.Point> carNew, GisCarModel gisCarModel) {
+ if(gisCarModel== null){
+ return;
+ }
long beginTime = System.currentTimeMillis();
@@ -539,6 +564,7 @@
consumer .shutdown();
queue.clear();
CEventCenter.onBindEvent(false,icEventListener, Constant.BIND_RTK_INFO_MAP);
+ CEventCenter.onBindEvent(false,icEventListener1, Constant.BIND_EXAM_STATUS_TOPIC);
}
@@ -547,6 +573,7 @@
public void onAttach(Context context) {
super.onAttach(context);
CEventCenter.onBindEvent(true,icEventListener,Constant.BIND_RTK_INFO_MAP);
+ CEventCenter.onBindEvent(true,icEventListener1,Constant.BIND_EXAM_STATUS_TOPIC);
}
}
--
Gitblit v1.8.0