From 59798b3c20c1b6e7bde1c03cd1caecbaf0860572 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 09 三月 2020 17:13:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/app.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 99b4a3e..ba745ad 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -59,6 +59,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0206;
+import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
@@ -245,6 +246,17 @@
WorkManager.getInstance(getApplicationContext()).enqueue(gpsinfoWorkRequest);
break;
case Constant.ENTER_OR_EXIT_ITEM:
+ int type = 0;
+ int enter_status = -1;
+ try {
+ JSONObject rtkConfigUpdtea = new JSONObject(json);
+ type = rtkConfigUpdtea.getInt("type");
+ enter_status = rtkConfigUpdtea.getInt("enter");
+ String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
+ ExamPlatformData.getInstance().getTTS().speak(itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"缁撴潫":"寮�濮�"));
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
OneTimeWorkRequest examStatusWorker = new OneTimeWorkRequest.Builder(ExamStatusWoker.class).setInputData(exam_enter_exitdata).build();
WorkManager.getInstance(getApplicationContext()).enqueue(examStatusWorker);
@@ -369,7 +381,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- String mapPath = ExamPlatformData.getInstance().getMapPath();
+ final String mapPath = ExamPlatformData.getInstance().getMapPath();
if (!TextUtils.isEmpty(mapPath)){
MyLog.i("璋冪敤鏇存柊Map璺緞鍚庣殑鍦板浘"+mapPath);
byte[] fileContent = FileUtil.readFile(mapPath);
@@ -379,15 +391,34 @@
AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,str);
}else{
MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",mapPath));
+
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(getAppContext(), "鏂囦欢锛�"+mapPath+"涓嶅瓨鍦�", Toast.LENGTH_SHORT).show();
+ }
+ });
}
}else{
MyLog.i("璇诲彇Assert鐩綍涓嬪垵濮嬪寲鐨勫湴鍥�");
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(getAppContext(), "璇诲彇Assert鐩綍涓嬪垵濮嬪寲鐨勫湴鍥�", Toast.LENGTH_SHORT).show();
+ }
+ });
StringBuffer buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.MAP);
if (buffer != null){
AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
}else{
MyLog.d(TAG,String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
+ CThreadPoolExecutor.runOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(getAppContext(), String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()), Toast.LENGTH_SHORT).show();
+ }
+ });
}
}
--
Gitblit v1.8.0