From 40e5354d874c416661681cb2715d5adf8f1b128e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 30 三月 2020 12:17:37 +0800
Subject: [PATCH] 增加正则判断一个字符串是否全为数字；不再TTSWorker里面执行插入数据库操作和语音播报工作；训练模式和考试模式评判信息按时间排序；收到评判消息在线程里面进行语音播报和数据库操作
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 0c2074a..6b1f4c5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -1,25 +1,18 @@
package safeluck.drive.evaluation.fragment;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
import android.content.Context;
-import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.core.app.AlarmManagerCompat;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import androidx.work.OneTimeWorkRequest;
-import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkInfo;
import androidx.work.WorkManager;
import android.os.Handler;
import android.os.Message;
-import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -45,8 +38,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
@@ -72,13 +63,8 @@
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.JKMessage0201;
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
-import safeluck.drive.evaluation.platformMessage.JKMessage0203;
-import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.TimeViewModel;
-import safeluck.drive.evaluation.worker.TimeWorker;
-
-import static androidx.work.PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS;
/**鍗曟満璁粌UI
* MyApplication2
@@ -374,9 +360,9 @@
failedProj_selects) {
item_id += f.getScore_deducting();
Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
item_conents.add(f.getItem_content());
- Collections.reverse(mArrayList);
+ Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
MyLog.i("item_score="+item_id);
}
@@ -393,7 +379,7 @@
item_id = 0;
mArrayList.clear();
item_conents.clear();
- Collections.reverse(mArrayList);
+ Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
@@ -418,9 +404,9 @@
failedProj_selects) {
item_id += f.getScore_deducting();
Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
item_conents.add(f.getItem_content());
- Collections.reverse(mArrayList);
+ Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
MyLog.i("item_score="+item_id);
}
@@ -437,7 +423,7 @@
item_id = 0;
mArrayList.clear();
item_conents.clear();
- Collections.reverse(mArrayList);
+ Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
--
Gitblit v1.8.0