From babb05583f59eb5e2c853168490f54fc7261e84a Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 28 三月 2020 14:44:00 +0800
Subject: [PATCH] uuuu
---
app/src/main/java/safeluck/drive/evaluation/app.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 5cda929..c1e15a9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -39,6 +39,8 @@
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
+import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
+import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
@@ -191,6 +193,22 @@
if(!TextUtils.isEmpty(json)){
Data judgeData = new Data.Builder().putString(Constant.TTS,json).build();
+ JsonArray jsonArray = (JsonArray) JsonParser.parseString(json);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
+ int emp_id = jsonObject.get("wrong_id").getAsInt();
+ if (emp_id>1000){
+ CriteriaForIII ttsStr=WorkRoomDataBase.getWorkRoomDataBase(this).getCriteriaIIIDao().queryItemForCriteriaIIINoLive(emp_id-1000);
+ ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason() + (ttsStr.getScore_deducting() == 100? "涓嶅悎鏍�" : "鎵�" +
+ ttsStr.getScore_deducting() + "鍒�"));
+ }else{
+ CriteriaForI ttsStr = WorkRoomDataBase.getWorkRoomDataBase(this).getCriteriaIDao().queryItemForCriteriaINoLive(emp_id);
+ ExamPlatformData.getInstance().getTTS().speak(ttsStr.getDeducting_reason() + (ttsStr.getScore_deducting() == 100? "涓嶅悎鏍�" : "鎵�" +
+ ttsStr.getScore_deducting() + "鍒�"));
+ }
+
+ }
+
OneTimeWorkRequest ttswoker = new OneTimeWorkRequest.Builder(TTSWorker.class).setInputData(judgeData).build();
WorkManager.getInstance(getAppContext()).enqueue(ttswoker);
@@ -459,20 +477,20 @@
}
});
StringBuffer buffer;
- buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.ROAD_MAP);
- if (buffer != null){
-
- AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_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();
- }
- });
-
- }
+// buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.ROAD_MAP);
+// if (buffer != null){
+//
+// AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_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();
+// }
+// });
+//
+// }
buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.MAP);
if (buffer != null){
--
Gitblit v1.8.0