From b10199a9b59621af6cd406d0dbb761c717161f44 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 31 三月 2020 15:40:37 +0800
Subject: [PATCH] 修改考试模式结束考试仍然可以展示错误项目，直至被销毁或者重新开始考试
---
app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
index 8acf0f9..6e7ace1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/RoadDriveMapFragmentaa.java
@@ -8,6 +8,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.os.Bundle;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.SurfaceHolder;
@@ -24,6 +25,7 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import java.io.IOException;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -35,6 +37,7 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.RealTimeCarPos;
import safeluck.drive.evaluation.bean.RoadExamMap;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
@@ -47,7 +50,7 @@
private static final int ALL_MAP = 100;
private boolean isDrawing = false;
- private StringBuffer buffer;//瀛樻斁鍦板浘鐨刡uffer
+ private StringBuffer buffer = null;//瀛樻斁鍦板浘鐨刡uffer
private ICEventListener rtcmicEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, final Object obj) {
@@ -470,6 +473,7 @@
}
};
boolean flag = true;
+ String newmap = null;
class CalRunnable implements Runnable{
@@ -544,15 +548,29 @@
tire.add(tire4.get(0));
- if (buffer == null) {
- buffer = FileUtil.readAssetTxtFile(_mActivity, Constant.ROAD_MAP);
- Log.i(TAG, "ditu=" + buffer.toString().trim());
- }
+ final String roadMapPath = ExamPlatformData.getInstance().getRoadMapPath();
+ if (!TextUtils.isEmpty(roadMapPath)){
+ byte [] datas= FileUtil.readFile(roadMapPath);
+ if (datas != null){
+ newmap= new String(datas);
+ }else{
+ MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",roadMapPath));
+ }
+
+ }else{
+
+ buffer = FileUtil.readAssetTxtFile(_mActivity, Constant.ROAD_MAP);
+ Log.i(TAG, "ditu=" + buffer.toString().trim());
+ }
+
+
Type type = new TypeToken<RoadExamMap>() {
}.getType();
if (buffer != null) {
examMaps = gson.fromJson(buffer.toString().trim(), type);
+ }else{
+ examMaps = gson.fromJson(newmap.trim(),type);
}
if (examMaps != null) {
--
Gitblit v1.8.0