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'
---
app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 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();
--
Gitblit v1.8.0