From c3e207bd4a37f4f4cafbf43b897592ac3c582e45 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 02 二月 2021 13:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 105 ---------------
app/src/main/java/safeluck/drive/evaluation/app.java | 8
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 7
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 9 +
app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java | 46 +++--
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java | 31 ----
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java | 1
app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java | 26 ---
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java | 23 ---
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java | 6
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 116 ++++------------
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 15 --
12 files changed, 78 insertions(+), 315 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java b/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
index 51de27d..1a560f5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
@@ -21,12 +21,6 @@
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusInitWork;
import safeluck.drive.evaluation.DB.criterias.Criteria;
import safeluck.drive.evaluation.DB.criterias.CriteriaDao;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForIIIWorker;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForIWorker;
-import safeluck.drive.evaluation.DB.criterias.CriteriaIDao;
-import safeluck.drive.evaluation.DB.criterias.CriteriaIIIDao;
import safeluck.drive.evaluation.DB.criterias.CriteriaInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusDao;
@@ -34,8 +28,6 @@
import safeluck.drive.evaluation.DB.failitems.FailProjDao;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjWorker;
-import safeluck.drive.evaluation.DB.failitems.LuKaoFailProjDao;
-import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
import safeluck.drive.evaluation.DB.gps.GPSInfo;
import safeluck.drive.evaluation.DB.gps.GpsInfoDao;
import safeluck.drive.evaluation.DB.lightdb.LightAllAnswerDao;
@@ -68,7 +60,7 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-@Database(entities = {Student.class, CriteriaForI.class, FailedProj.class,LuKaoFailedProj.class, LightUseQuestions.class, CriteriaForIII.class,RTKConfig.class, GPSInfo.class, AppStatus.class, ExamStatus.class, SingalConfig.class
+@Database(entities = {Student.class, FailedProj.class, LightUseQuestions.class, RTKConfig.class, GPSInfo.class, AppStatus.class, ExamStatus.class, SingalConfig.class
, Criteria.class,RouteBean.class, RouteCross.class, RouteTriggerLine.class, LightAnswers.class, LightQuestion.class},version = 1,exportSchema = false)
public abstract class WorkRoomDataBase extends RoomDatabase {
private static final String TAG = "WorkRoomDataBase";
@@ -77,8 +69,6 @@
public abstract RouteCrossDao getRouteCrooDao();
public abstract RouteTriggerLineDao getRouteTriggerLineDao();
- //绉戠洰浜� I绫昏�冨満璇勫垽琛�
- public abstract CriteriaIDao getCriteriaIDao();
//鑰冨満璇勫垽琛�
public abstract CriteriaDao getCriteriaDao();
//鑰冨満璇勫垽琛�
@@ -112,12 +102,10 @@
public void onCreate(@NonNull SupportSQLiteDatabase db) {
super.onCreate(db);
OneTimeWorkRequest oneTimeWorkRequest = OneTimeWorkRequest.from(SeedDatabaseWorker.class);
- OneTimeWorkRequest oneTimeWorkRequest1 = OneTimeWorkRequest.from(CriteriaForIWorker.class);
OneTimeWorkRequest criteriaInitWorkRequest = OneTimeWorkRequest.from(CriteriaInitWorker.class);
OneTimeWorkRequest oneTimeWorkRequest3 = OneTimeWorkRequest.from(LightUseInitWorker.class);
OneTimeWorkRequest lightAllQuestInitWorker = OneTimeWorkRequest.from(LightAllQuestInitWorker.class);
OneTimeWorkRequest lightAllAnswerInitWorker = OneTimeWorkRequest.from(LightAllAnswerInitWorker.class);
- OneTimeWorkRequest mCriteriaForIIIWorker= OneTimeWorkRequest.from(CriteriaForIIIWorker.class);
OneTimeWorkRequest oneTimeWorkRequest2 = OneTimeWorkRequest.from(FailedProjWorker.class);
OneTimeWorkRequest RTKConfigWorkRequest = OneTimeWorkRequest.from(RTKConfigWork.class);
OneTimeWorkRequest appStatusInitWork = OneTimeWorkRequest.from(AppStatusInitWork.class);
@@ -136,8 +124,8 @@
// WorkManager.getInstance(mContext).enqueue(signalConigInitWorker);
//鍗曡矾寰勬墽琛岋紝鍙互瀹炵幇鏇村姞澶嶆潅鐨勫璺緞鎵ц鏂瑰紡
- WorkContinuation chain1= WorkManager.getInstance(mContext).beginWith(Arrays.asList(oneTimeWorkRequest,oneTimeWorkRequest1,criteriaInitWorkRequest))
- .then(mCriteriaForIIIWorker).then(oneTimeWorkRequest3).then(lightAllAnswerInitWorker).then(lightAllQuestInitWorker);
+ WorkContinuation chain1= WorkManager.getInstance(mContext).beginWith(Arrays.asList(oneTimeWorkRequest,criteriaInitWorkRequest,lightAllQuestInitWorker))
+ .then(lightAllAnswerInitWorker).then(oneTimeWorkRequest3);
WorkContinuation chain2 = WorkManager.getInstance(mContext).beginWith(Arrays.asList(RTKConfigWorkRequest,appStatusInitWork,signalConigInitWorker,routeInitWorker))
.then(oneTimeWorkRequest2).then(examStatusInitWorker);
@@ -169,14 +157,8 @@
public abstract SignalConfigDao getSignalConfigDao();
- /**
- * 鑾峰彇绉戠洰涓夎瘎鍒よ〃鐨� Dao
- *
- * @return
- */
- public abstract CriteriaIIIDao getCriteriaIIIDao();
- public abstract LuKaoFailProjDao getLuKaoFailProjDao();
+
public abstract LightAllAnswerDao getLightAllAnswersDao();
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForI.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForI.java
deleted file mode 100644
index 3358e0a..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForI.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import androidx.annotation.NonNull;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 10:15:55
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- *
- * 绉戠洰浜� I绫昏�冨満璇勫垽鏍囧噯琛�
- */
-@Entity(tableName = "criteria_one")
-public class CriteriaForI {
-/**************
- * item_id item_content deducting_reason score_deducting required _precision
- 23 璧锋 杞﹂棬鏈畬鍏ㄥ叧闂捣姝� 涓嶅悎鏍� 琛岄┒璺濈澶т簬1m 鏃�
- **************/
- @PrimaryKey
- @ColumnInfo(name = "item_id")
- @NonNull
- private int item_id;
-
-
- @ColumnInfo(name = "item_content")
- private String item_content;
-
- @ColumnInfo(name = "deducting_reason")
- private String deducting_reason;
-
-
- @NonNull @ColumnInfo(name = "score_deducting")
- private int score_deducting;
-
- @ColumnInfo(name = "required_precision")
- private String required_precision;
-
- public int getItem_id() {
- return item_id;
- }
-
- public void setItem_id(int item_id) {
- this.item_id = item_id;
- }
-
- public String getItem_content() {
- return item_content;
- }
-
- public void setItem_content(String item_content) {
- this.item_content = item_content;
- }
-
- public String getDeducting_reason() {
- return deducting_reason;
- }
-
- public void setDeducting_reason(String deducting_reason) {
- this.deducting_reason = deducting_reason;
- }
-
- public int getScore_deducting() {
- return score_deducting;
- }
-
- public void setScore_deducting(int score_deducting) {
- this.score_deducting = score_deducting;
- }
-
- public String getRequired_precision() {
- return required_precision;
- }
-
- public void setRequired_precision(String required_precision) {
- this.required_precision = required_precision;
- }
-
- @Override
- public String toString() {
- return "CriteriaForI{" +
- "item_id=" + item_id +
- ", item_content='" + item_content + '\'' +
- ", deducting_reason='" + deducting_reason + '\'' +
- ", score_deducting=" + score_deducting +
- ", required_precision='" + required_precision + '\'' +
- '}';
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIII.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIII.java
deleted file mode 100644
index 2fce6db..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIII.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import androidx.annotation.NonNull;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 10:15:55
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- *
- * 璺�冪被鑰冨満璇勫垽鏍囧噯琛�
- */
-@Entity(tableName = "criteria_three")
-public class CriteriaForIII {
-/**************
- * item_id item_content deducting_reason score_deducting required _precision
- 23 璧锋 杞﹂棬鏈畬鍏ㄥ叧闂捣姝� 涓嶅悎鏍� 琛岄┒璺濈澶т簬1m 鏃�
- **************/
-
-
-
- @PrimaryKey
- @ColumnInfo(name = "item_id")
- @NonNull
- private int item_id;
-
- @ColumnInfo(name = "item_content")
- private String item_content;
-
- @ColumnInfo(name = "deducting_reason")
- private String deducting_reason;
-
-
- @NonNull @ColumnInfo(name = "score_deducting")
- private int score_deducting;
-
- @ColumnInfo(name = "required_precision")
- private String required_precision;
-
- public int getItem_id() {
- return item_id;
- }
-
- public void setItem_id(int item_id) {
- this.item_id = item_id;
- }
-
- public String getItem_content() {
- return item_content;
- }
-
- public void setItem_content(String item_content) {
- this.item_content = item_content;
- }
-
- public String getDeducting_reason() {
- return deducting_reason;
- }
-
- public void setDeducting_reason(String deducting_reason) {
- this.deducting_reason = deducting_reason;
- }
-
- public int getScore_deducting() {
- return score_deducting;
- }
-
- public void setScore_deducting(int score_deducting) {
- this.score_deducting = score_deducting;
- }
-
- public String getRequired_precision() {
- return required_precision;
- }
-
- public void setRequired_precision(String required_precision) {
- this.required_precision = required_precision;
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIIIWorker.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIIIWorker.java
deleted file mode 100644
index efd9bbc..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIIIWorker.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
-
-import com.anyun.basecommonlib.MyLog;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.util.List;
-
-import safeluck.drive.evaluation.DB.Constant;
-import safeluck.drive.evaluation.DB.WorkRoomDataBase;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:59:25
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class CriteriaForIIIWorker extends Worker {
-
- private static final String TAG = "CriteriaForIWorker";
-
- public CriteriaForIIIWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
- super(context, workerParams);
- }
-
- @NonNull
- @Override
- public Result doWork() {
- InputStream inputStream = null;
- try {
- inputStream = getApplicationContext().getAssets()
- .open(Constant.CRITERIAFOR_III_JSON);
- InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
- JsonReader jsonReader = new JsonReader(inputStreamReader);
- Gson gson = new Gson();
- Type type = new TypeToken<List<CriteriaForIII>>(){}.getType();
-
- List<CriteriaForIII> criteriaForIIS = gson.fromJson(jsonReader,type);
- MyLog.i(TAG,"鎻掑叆绉戠洰涓夎�冨満璇勫垽琛�");
- WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getCriteriaIIIDao().insertAllCriteriaIII(criteriaForIIS);
- return Result.success();
- } catch (IOException e) {
- e.printStackTrace();
- return Result.failure();
- }
-
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIWorker.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIWorker.java
deleted file mode 100644
index 2d1723b..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaForIWorker.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
-
-import com.anyun.basecommonlib.MyLog;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.util.List;
-
-import safeluck.drive.evaluation.DB.Constant;
-import safeluck.drive.evaluation.DB.WorkRoomDataBase;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:59:25
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class CriteriaForIWorker extends Worker {
-
- private static final String TAG = "CriteriaForIWorker";
-
- public CriteriaForIWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
- super(context, workerParams);
- }
-
- @NonNull
- @Override
- public Result doWork() {
- InputStream inputStream = null;
- try {
- inputStream = getApplicationContext().getAssets()
- .open(Constant.CRITERIAFOR_I_JSON);
- } catch (IOException e) {
- e.printStackTrace();
- }
- InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
- JsonReader jsonReader = new JsonReader(inputStreamReader);
- Gson gson = new Gson();
- Type type = new TypeToken<List<CriteriaForI>>(){}.getType();
-
- List<CriteriaForI> criteriaForIS = gson.fromJson(jsonReader,type);
- MyLog.i(TAG,"鎻掑叆绉戠洰浜岋紝I绫昏�冨満璇勫垽琛�");
- WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getCriteriaIDao().insertAllCriteriaI(criteriaForIS);
- return Result.success();
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIDao.java
deleted file mode 100644
index 8274f9e..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIDao.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:12:18
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-@Dao
-public interface CriteriaIDao {
- @Insert(onConflict = OnConflictStrategy.IGNORE)
- void insertCriteriaI(CriteriaForI criteriaForI);
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insertAllCriteriaI(List<CriteriaForI> criteriaForI);
-
- @Query( "SELECT * FROM criteria_one WHERE item_id =:item_id")
- LiveData<CriteriaForI > queryItemForCriteriaI(int item_id);
- @Query( "SELECT * FROM criteria_one WHERE item_id =:item_id")
- CriteriaForI queryItemForCriteriaINoLive(int item_id);
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIIIDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIIIDao.java
deleted file mode 100644
index c320aa1..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriaIIIDao.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:12:18
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-@Dao
-public interface CriteriaIIIDao {
- @Insert(onConflict = OnConflictStrategy.IGNORE)
- void insertCriteriaIII(CriteriaForIII criteriaForIII);
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insertAllCriteriaIII(List<CriteriaForIII> criteriaForIII);
-
- @Query( "SELECT * FROM criteria_three WHERE item_id =:item_id")
- LiveData<CriteriaForIII > queryItemForCriteriaIII(int item_id);
- @Query( "SELECT * FROM criteria_three WHERE item_id =:item_id")
- CriteriaForIII queryItemForCriteriaIIINoLive(int item_id);
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriasRepository.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriasRepository.java
deleted file mode 100644
index d0e8c3b..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/CriteriasRepository.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias;
-
-import android.app.Application;
-import android.util.Log;
-
-import androidx.lifecycle.LiveData;
-
-import java.util.List;
-
-import safeluck.drive.evaluation.DB.WorkRoomDataBase;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:22:09
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class CriteriasRepository {
-
- private static final String TAG = "CriteriasRepository";
-
- CriteriaIDao mCriteriaIDao;
-
- public void insertCriteriaI(final CriteriaForI criteriaForI){
- WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
- @Override
- public void run() {
- mCriteriaIDao.insertCriteriaI(criteriaForI);
- }
- });
-
- }
-
- public void insertCriteriaIs(final List<CriteriaForI> criteriaForIs){
- WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
- @Override
- public void run() {
- mCriteriaIDao.insertAllCriteriaI(criteriaForIs);
- }
- });
-
- }
-
- /**
- * 鏌ヨ鏌愰」璇勫垽鏍囧噯
- * @param item_id
- * @return
- */
- public LiveData<CriteriaForI> queryItemForCriteriaI(final int item_id){
- return mCriteriaIDao.queryItemForCriteriaI(item_id);
-
- }
-
- /**
- * CriteriasRepository鏋勯�犲嚱鏁�
- * @param application
- */
- public CriteriasRepository(Application application) {
- Log.i(TAG, "CriteriasRepository: ");
- WorkRoomDataBase db =WorkRoomDataBase.getWorkRoomDataBase(application);
- this.mCriteriaIDao = db.getCriteriaIDao();
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/viewmodel/CriteriaIViewModel.java b/app/src/main/java/safeluck/drive/evaluation/DB/criterias/viewmodel/CriteriaIViewModel.java
deleted file mode 100644
index 809eb5c..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/criterias/viewmodel/CriteriaIViewModel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package safeluck.drive.evaluation.DB.criterias.viewmodel;
-
-import android.app.Application;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-
-import java.util.List;
-
-import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
-import safeluck.drive.evaluation.DB.criterias.CriteriasRepository;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 11:48:42
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-public class CriteriaIViewModel extends AndroidViewModel {
-
- private static final String TAG = "CriteriaIViewModel";
- CriteriasRepository mCriteriasRep;
-
- public CriteriaIViewModel(@NonNull Application application) {
- super(application);
- Log.i(TAG, "CriteriaIViewModel Constructor ");
- mCriteriasRep = new CriteriasRepository(application);
- }
-
-
-
- public LiveData<CriteriaForI> queryCriteriaI(int item_id){
- return mCriteriasRep.queryItemForCriteriaI(item_id);
-
- }
-
- public void insertCriteriaIs(List<CriteriaForI> cs){
- mCriteriasRep.insertCriteriaIs(cs);
- }
-
- public void insertCriteriaI(CriteriaForI c){
- mCriteriasRep.insertCriteriaI(c);
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
index d3edd38..6022ee5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailProjDao.java
@@ -21,27 +21,13 @@
@Insert(onConflict = OnConflictStrategy.REPLACE)
void insert(FailedProj proj);
- /**
- * 鏌ヨ 绉戠洰浜� I绫昏�冨満鐨勫け璐ラ」鐩� 锛堝琛ㄦ煡璇級
- * 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
- * @return
- */
- @Query("SELECT emp_id,stu_id, utc ,sn ,deducting_reason,score_deducting,item_content from criteria_one INNER JOIN fail_projects ON criteria_one.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=1")
- LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id);
+
/**
* 鏌ヨ suoyou 澶辫触椤圭洰 锛堝琛ㄦ煡璇級
* @return
*/
@Query("SELECT emp_id,stu_id, utc ,sn ,deducting_reason,score_deducting,item_content from criteria INNER JOIN fail_projects ON criteria.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=999")
LiveData<List<FailedProj_select>> getFailedProjects(long stu_id);
-
- /**
- * 鏌ヨ 绉戠洰涓� 璺�冭�冨満鐨勫け璐ラ」鐩� 锛堝琛ㄦ煡璇級
- * 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
- * @return
- */
- @Query("SELECT emp_id,stu_id,utc,sn,deducting_reason,score_deducting,item_content from criteria_three INNER JOIN fail_projects ON criteria_three.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=3")
- LiveData<List<FailedProj_select>> getFailedProjectsForIII(long stu_id);
/**
* 鑾峰彇澶辫触椤圭洰鏉℃暟
@@ -54,10 +40,5 @@
@Query("delete from fail_projects")
void deleteAll();
- /**
- * 鏌ヨ 绉戠洰浜� I绫昏�冨満鐨勬墍鏈夊け璐ラ」鐩� 锛堝琛ㄦ煡璇級
- * @return
- */
- @Query("SELECT emp_id,stu_id, utc ,sn ,deducting_reason,score_deducting,item_content from criteria_one INNER JOIN fail_projects ON criteria_one.item_id= fail_projects.emp_id where fail_projects.stu_id=:stu_id and fail_projects.subject=1")
- List<FailedProj_select> getAllFailProjI(long stu_id);
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
index ffafbcc..39ea543 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj.java
@@ -7,7 +7,6 @@
import androidx.room.PrimaryKey;
import safeluck.drive.evaluation.DB.criterias.Criteria;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import static androidx.room.ForeignKey.CASCADE;
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
index 16433f6..b1db467 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjRepository.java
@@ -20,12 +20,10 @@
private FailProjDao failProjDao;
- private LuKaoFailProjDao luKaofailProjDao;
public FailedProjRepository(Application application) {
WorkRoomDataBase dataBase = WorkRoomDataBase.getWorkRoomDataBase(application);
failProjDao = dataBase.getFailProjDao();
- luKaofailProjDao = dataBase.getLuKaoFailProjDao();
}
@@ -38,15 +36,7 @@
}
});
}
- public void insertLuKao(final LuKaoFailedProj proj) {
- WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
- @Override
- public void run() {
- luKaofailProjDao.insert(proj);
- }
- });
- }
/**
* 鍒犻櫎fail_projects琛ㄤ腑鎵�鏈夋暟鎹�
@@ -56,20 +46,11 @@
@Override
public void run() {
failProjDao.deleteAll();
- luKaofailProjDao.deleteAll();
+
}
});
}
- /**
- * 鑾峰緱绉戠洰浜� I绫昏�冨満澶辫触椤圭洰鎵ｅ垎椤�
- *
- * @param stu_id
- * @return
- */
- public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id) {
- return failProjDao.getFailedProjectsForI(stu_id);
- }
/**
* 鑾峰緱suoyou 澶辫触椤圭洰鎵ｅ垎椤�
@@ -81,15 +62,7 @@
return failProjDao.getFailedProjects(stu_id);
}
- /**
- * 鑾峰緱绉戠洰涓� 璺�冭�冨満澶辫触椤圭洰鎵ｅ垎椤�
- *
- * @param stu_id
- * @return
- */
- public LiveData<List<FailedProj_select>> getFailedProjectsForIII(long stu_id) {
- return luKaofailProjDao.getFailedProjectsForIII(stu_id);
- }
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
index 503d2b9..89e4418 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProjViewModel.java
@@ -26,13 +26,7 @@
public LiveData<List<FailedProj_select>> getFailedProjects(long stu_id){
return failedProjRepository.getFailedProjects(stu_id);
}
- public LiveData<List<FailedProj_select>> getFailedProjectsForI(long stu_id){
- return failedProjRepository.getFailedProjectsForI(stu_id);
- }
- public LiveData<List<FailedProj_select>> getFailedProjectsForIII(long stu_id){
- return failedProjRepository.getFailedProjectsForIII(stu_id);
- }
public void insert(FailedProj proj){
failedProjRepository.insert(proj);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailProjDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailProjDao.java
deleted file mode 100644
index 6d0d443..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailProjDao.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package safeluck.drive.evaluation.DB.failitems;
-
-import androidx.lifecycle.LiveData;
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * MyApplication2
- * Created by lzw on 2019/11/26. 18:08:08
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-@Dao
-public interface LuKaoFailProjDao {
-
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(LuKaoFailedProj proj);
-
- /**
- * 鏌ヨ 绉戠洰涓� 璺�冭�冨満鐨勫け璐ラ」鐩� 锛堝琛ㄦ煡璇級
- * 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
- * @return
- */
- @Query("SELECT emp_id,stu_id,utc,sn,deducting_reason,score_deducting,item_content from criteria_three INNER JOIN lukao_fail_projects ON criteria_three.item_id= lukao_fail_projects.emp_id where lukao_fail_projects.stu_id=:stu_id and lukao_fail_projects.subject=3")
- LiveData<List<FailedProj_select>> getFailedProjectsForIII(long stu_id);
-
- /**
- * 鑾峰彇澶辫触椤圭洰鏉℃暟
- * @param subject_id
- * @return
- */
- @Query("SELECT COUNT(*) from lukao_fail_projects where subject=:subject_id")
- LiveData<Integer> getSubject(int subject_id);
-
- @Query("delete from lukao_fail_projects")
- void deleteAll();
-
-
-
- /**
- * 鏌ヨ 绉戠洰涓� 璺�冭�冨満鐨勫け璐ラ」鐩� 锛堝琛ㄦ煡璇級
- * 濡傛灉瑕佹坊鍔� 绉戠洰浜孖I III绫昏�冨満澶辫触椤圭洰锛岄渶瑕佸缓绔嬬浉搴旂殑璇勫垽鏍囧噯琛ㄦ暟鎹〃
- * @return
- */
- @Query("SELECT emp_id,stu_id,utc,sn,deducting_reason,score_deducting,item_content from criteria_three INNER JOIN lukao_fail_projects ON criteria_three.item_id= lukao_fail_projects.emp_id where lukao_fail_projects.stu_id=:stu_id and lukao_fail_projects.subject=3")
- List<FailedProj_select> getAllFailProjIII(long stu_id);
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailedProj.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailedProj.java
deleted file mode 100644
index 876c4cf..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/LuKaoFailedProj.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package safeluck.drive.evaluation.DB.failitems;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.ForeignKey;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-
-import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
-
-import static androidx.room.ForeignKey.CASCADE;
-
-/**
- * MyApplication2
- * 澶辫触椤圭洰鏉＄洰
- * Created by lzw on 2019/11/26. 17:59:20
- * 閭锛�632393724@qq.com
- * All Rights Saved! Chongqing AnYun Tech co. LTD
- */
-@Entity(tableName = "lukao_fail_projects",foreignKeys = {@ForeignKey(entity = CriteriaForIII.class,
- parentColumns = "item_id",childColumns = "emp_id",onDelete = CASCADE)},indices = @Index(value = {"emp_id"}))
-public class LuKaoFailedProj {
- @PrimaryKey(autoGenerate = true)
- private int id;
-
-
-
- @ColumnInfo(name = "stu_id")
- private long stu_id;
-
-// =1 I绫昏�冨満 ==2 II绫昏�冨満 3-璺��
- @ColumnInfo(name = "subject")
- private int subject;
-
- //浣滀负澶栭敭锛屽搴擨绫昏�冨満鐨刬tem_id
- @ColumnInfo(name = "emp_id")
- private int emp_id;
- private int sn;
- private String utc;
- public LuKaoFailedProj(int subject, int emp_id, long stu_id, String utc, int sn) {
- this.subject = subject;
- this.emp_id = emp_id;
- this.stu_id = stu_id;
- this.sn = sn;
- this.utc = utc;
- }
- public int getSn() {
- return sn;
- }
-
- public void setSn(int sn) {
- this.sn = sn;
- }
-
- public String getUtc() {
- return utc;
- }
-
- public void setUtc(String utc) {
- this.utc = utc;
- }
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public long getStu_id() {
- return stu_id;
- }
-
- public void setStu_id(long stu_id) {
- this.stu_id = stu_id;
- }
-
- public int getSubject() {
- return subject;
- }
-
- public void setSubject(int subject) {
- this.subject = subject;
- }
-
- public int getEmp_id() {
- return emp_id;
- }
-
- public void setEmp_id(int emp_id) {
- this.emp_id = emp_id;
- }
-
- @Override
- public String toString() {
- return "FailedProj{" +
- "id=" + id +
- ", stu_id=" + stu_id +
- ", subject=" + subject +
- ", emp_id=" + emp_id +
- ", sn=" + sn +
- ", utc='" + utc + '\'' +
- '}';
- }
-}
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index a924128..a84c75e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -286,15 +286,10 @@
synchronized (MainActivity.this){
if (ExamPlatformData.getInstance().isCanWriteSD()){
- AbsInitialData.getInstance().resethasSendInitData();
+// AbsInitialData.getInstance().resethasSendInitData();
AbsInitialData.getInstance().sendInitialData();
MyLog.i("rtkConfig 鏇存柊sn鍚庡彂閫佸垵濮嬫暟鎹�");
}
-// if (onlySendOnceRTKConfig){
-// MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
-// onlySendOnceRTKConfig = false;
-// sendRtkConfigInfo();
-// }
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 3ec7ab8..8a437bb 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -2,14 +2,12 @@
import android.app.Application;
import android.content.Context;
-import android.os.Environment;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.work.Configuration;
import androidx.work.Data;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
@@ -32,7 +30,6 @@
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -40,12 +37,9 @@
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
import safeluck.drive.evaluation.DB.criterias.Criteria;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
-import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.route.RouteCross;
import safeluck.drive.evaluation.DB.route.RouteTriggerLine;
@@ -717,10 +711,12 @@
MyLog.i(String.format("bindStatus = %d",code));
if (code == 0){
ExamPlatformData.getInstance().getTTS().speak("鏈嶅姟缁戝畾鎴愬姛");
+ ExamPlatformData.getInstance().setServiceBindStatus(0);
initData();
}else{
ExamPlatformData.getInstance().getTTS().speak("鏈嶅姟寮傚父姝讳骸");
MyLog.i("鏈嶅姟寮傚父姝讳骸鐩戝惉鍒颁箣鍚庯紝閲嶇疆鍙戦�佹爣蹇楋紝鐒跺悗鍙戦�佹暟鎹�");
+ ExamPlatformData.getInstance().setServiceBindStatus(-1);
AbsInitialData.getInstance().resethasSendInitData();
AbsInitialData.getInstance().sendInitialData();
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
index 10daff0..a76ad05 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/AbsInitialData.java
@@ -98,34 +98,40 @@
}
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
public synchronized void sendInitialData(){
- if (checkPermission() && !hasSend){
- /**********鍙湁鏉冮檺婊¤冻锛堣鍐橲D鍗℃潈闄愶級鍜屾病鏈夊彂閫佽繃鐨勬儏鍐典笅鎵嶈繘琛屼互涓嬫搷浣�*********/
- hasSend = true;
- sendCarModelFile();
- sendRoadMapFile();
- sendItemsMapFile();
- sendJudgeArgs();
+ if ( ExamPlatformData.getInstance().getServceBindStatus()==0){
+ if (checkPermission() && !hasSend ){
+ /**********鍙湁鏉冮檺婊¤冻锛堣鍐橲D鍗℃潈闄愶級鍜屾病鏈夊彂閫佽繃鐨勬儏鍐典笅鎵嶈繘琛屼互涓嬫搷浣�*********/
+ hasSend = true;
+ sendCarModelFile();
+ sendRoadMapFile();
+ sendItemsMapFile();
+ sendJudgeArgs();
//闇�瑕佸欢杩熷彂閫侊紝鍥犱负鍓嶉潰鏈塰ttp璇锋眰
- executorService.schedule(()->{
- Log.i("AYJiaKao","寤惰繜鍙戦��");
-// if (DataInitKt.getSendVehiSucc() && (DataInitKt.getSendMapSucc() || DataInitKt.getSendRoadMapSucc())){
- CThreadPoolExecutor.runInBackground(()->{
- sendLightsAndExamStatus();
- });
+ executorService.schedule(()->{
+ Log.i("AYJiaKao","寤惰繜鍙戦��");
+ if (DataInitKt.getSendVehiSucc() && (DataInitKt.getSendMapSucc() || DataInitKt.getSendRoadMapSucc())){
+ CThreadPoolExecutor.runInBackground(()->{
+ sendLightsAndExamStatus();
+ });
-// }else{
- MyLog.i(DataInitKt.getSendRoadMapSucc()?String.format("閬撹矾鍦板浘鍙戦�佹垚鍔�"):"閬撹矾鍦板浘鍙戦�佸け璐�");
- MyLog.i(DataInitKt.getSendMapSucc()?String.format("鍦哄湴鍦板浘鍙戦�佹垚鍔�"):"鍦哄湴鍦板浘鍙戦�佸け璐�");
- MyLog.i(DataInitKt.getSendVehiSucc()?String.format("杞﹁締妯″瀷鍙戦�佹垚鍔�"):"杞﹁締妯″瀷鍙戦�佸け璐�");
- Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
-// }
+ }else{
+ MyLog.i(DataInitKt.getSendRoadMapSucc()?String.format("閬撹矾鍦板浘鍙戦�佹垚鍔�"):"閬撹矾鍦板浘鍙戦�佸け璐�");
+ MyLog.i(DataInitKt.getSendMapSucc()?String.format("鍦哄湴鍦板浘鍙戦�佹垚鍔�"):"鍦哄湴鍦板浘鍙戦�佸け璐�");
+ MyLog.i(DataInitKt.getSendVehiSucc()?String.format("杞﹁締妯″瀷鍙戦�佹垚鍔�"):"杞﹁締妯″瀷鍙戦�佸け璐�");
+ Toast.makeText(app.getAppContext(), "鍦板浘鎴栬溅妯″瀷涓嶅瓨鍦紝璇锋鏌ュ钩鍙伴厤缃垨鎵嬪伐閰嶇疆", Toast.LENGTH_SHORT).show();
+
+ }
},2, TimeUnit.SECONDS);
+ }else{
+ MyLog.i(hasSend?"宸茬粡鍙戦�佽繃浜嗗垵濮嬫暟鎹�":"鏉冮檺涓嶅厑璁革紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ }
}else{
- MyLog.i(hasSend?"宸茬粡鍙戦�佽繃浜嗗垵濮嬫暟鎹�":"鏉冮檺涓嶅厑璁革紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ MyLog.i("鏈嶅姟鏈粦瀹氭垚鍔燂紝涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
}
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 77c7852..3c7a54d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -619,4 +619,13 @@
public String getMcuSN(){
return mcuSN;
}
+
+ private int bindServiceStats= -2;// 0-鏈嶅姟缁戝畾鎴愬姛 -1,鏈嶅姟寮傚父姝讳骸 -2-榛樿鍊艰繕鏈繘琛岀粦瀹氭湇鍔℃搷浣滐紱
+ public void setServiceBindStatus(int i) {
+ this.bindServiceStats = i;
+ }
+
+ public int getServceBindStatus(){
+ return bindServiceStats;
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 85bcc23..baa117d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -344,100 +344,48 @@
failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
- failedProjViewModel.getFailedProjectsForIII(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
- @Override
- public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
- MyLog.i("鐜板湪鏄矾鑰冪姸鎬侊紝鐩戣璺�冩暟鎹け璐ラ」鐩�");
- if (failedProj_selects != null && failedProj_selects.size()>0){
-
- item_id = 0;
- currTotalScore = 100;
- mArrayList.clear();
- item_conents.clear();
- for (FailedProj_select f :
- 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(),f.getUtc()));
- item_conents.add(f.getItem_content());
- Collections.sort(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
- currTotalScore -=item_id;
- MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
- if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
-
- }
- MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"璺�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
- item_id = 0;
-// mArrayList.clear();
-// item_conents.clear();
-// Collections.sort(mArrayList);
-// mScoreAdapter.addDatas(mArrayList);
-// mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }
- }
-
- }
- });
- failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
+ failedProjViewModel.getFailedProjects(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
- MyLog.i("鐜板湪鏄満鑰冪姸鎬侊紝鐩戣鏁版嵁澶辫触椤圭洰");
- if (failedProj_selects != null && failedProj_selects.size()>0){
-
- item_id = 0;
- currTotalScore = 100;
- mArrayList.clear();
- item_conents.clear();
- for (FailedProj_select f :
- 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(),f.getUtc()));
- item_conents.add(f.getItem_content());
- Collections.sort(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
- currTotalScore -=item_id;
- MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
- if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("鍦鸿�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
-
- }
- MyLog.i("鍦鸿�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"鍦鸿�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
- item_id = 0;
-// mArrayList.clear();
-// item_conents.clear();
-// Collections.sort(mArrayList);
-// mScoreAdapter.addDatas(mArrayList);
-// mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ if (failedProj_selects != null && failedProj_selects.size()>0){
+ item_id = 0;
+ currTotalScore = 100;
+ mArrayList.clear();
+ item_conents.clear();
+ for (FailedProj_select f :
+ 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(),f.getUtc()));
+ item_conents.add(f.getItem_content());
+ Collections.sort(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
}
- }
+ MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
+ currTotalScore -=item_id;
+ MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i("浣庝簬80锛屼笉鍚堟牸,缁撴潫鑰冭瘯"+currTotalScore);
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
+ }
+ MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ }else{
+ MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
+ item_id = 0;
+ }
}
});
+
+
+
examStatusViewModel = ViewModelProviders.of(this).get(ExamStatusViewModel.class);
examStatusViewModel.getExamStatus().observe(this, new Observer<List<ExamStatus>>() {
@Override
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 0fdbffa..b20cf14 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -16,10 +16,7 @@
import android.widget.Toast;
import androidx.appcompat.widget.AppCompatEditText;
-import androidx.lifecycle.Observer;
-import com.anyun.exam.lib.util.Speaker;
-import com.anyun.im_lib.listener.IMSConnectStatusCallback;
import com.anyun.im_lib.util.ByteUtil;
import com.google.android.material.textfield.TextInputEditText;
import com.safeluck.aykj.utils.BytesUtils;
@@ -36,9 +33,6 @@
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
-import retrofit2.Retrofit;
-import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
-import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.httpmodule.AYApiService;
@@ -78,7 +72,6 @@
private Button btn_auth;
private Button btn_send;
private AppCompatEditText sendEditText;
- private CriteriaIViewModel workViewModel;
private int item_id=0;
public static TcpFragment newInstance() {
@@ -327,12 +320,4 @@
}
}
- private void checkCriteria(int item_id) {
- workViewModel.queryCriteriaI(item_id).observe(TcpFragment.this, new Observer<CriteriaForI>() {
- @Override
- public void onChanged(CriteriaForI criteriaForI) {
- Log.i(TAG, "onChanged: "+criteriaForI.toString());
- }
- });
- }
}
--
Gitblit v1.8.0