From b213c3e542fc71b31b6ad1e9da6958eaec6d5b41 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 13 一月 2021 09:24:09 +0800
Subject: [PATCH] 修改评判表数据库,只能rtkconfig sn变化的时候发送一次initdata

---
 app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 022903a..352721b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
@@ -21,6 +21,8 @@
 import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
 import safeluck.drive.evaluation.DB.appstatusdb.AppStatusDao;
 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.CriteriaForII;
 import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
@@ -30,6 +32,7 @@
 import safeluck.drive.evaluation.DB.criterias.CriteriaIDao;
 import safeluck.drive.evaluation.DB.criterias.CriteriaIIDao;
 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;
 import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
@@ -62,7 +65,7 @@
  * All Rights Saved! Chongqing AnYun Tech co. LTD
  */
 @Database(entities = {Student.class, CriteriaForI.class, FailedProj.class,LuKaoFailedProj.class, CriteriaForII.class, CriteriaForIII.class,RTKConfig.class, GPSInfo.class, AppStatus.class, ExamStatus.class, SingalConfig.class
-        ,RouteBean.class, RouteCross.class, RouteTriggerLine.class},version = 1,exportSchema = false)
+        , Criteria.class,RouteBean.class, RouteCross.class, RouteTriggerLine.class},version = 1,exportSchema = false)
 public abstract class WorkRoomDataBase extends RoomDatabase {
     private static final String TAG = "WorkRoomDataBase";
     public abstract StudentDao getstudentDao();
@@ -72,6 +75,8 @@
 
     //绉戠洰浜� I绫昏�冨満璇勫垽琛�
     public abstract CriteriaIDao getCriteriaIDao();
+    //鑰冨満璇勫垽琛�
+    public abstract CriteriaDao getCriteriaDao();
     //绉戠洰浜� II绫昏�冨満璇勫垽琛�
     public abstract CriteriaIIDao getCriteriaIIDao();
     public abstract FailProjDao getFailProjDao();
@@ -103,7 +108,8 @@
                                     super.onCreate(db);
                                     OneTimeWorkRequest oneTimeWorkRequest = OneTimeWorkRequest.from(SeedDatabaseWorker.class);
                                     OneTimeWorkRequest oneTimeWorkRequest1 = OneTimeWorkRequest.from(CriteriaForIWorker.class);
-                                    OneTimeWorkRequest oneTimeWorkRequest3 = OneTimeWorkRequest.from(CriteriaForIIWorker.class);
+                                    OneTimeWorkRequest criteriaInitWorkRequest = OneTimeWorkRequest.from(CriteriaInitWorker.class);
+//                                    OneTimeWorkRequest oneTimeWorkRequest3 = OneTimeWorkRequest.from(CriteriaForIIWorker.class);
                                     OneTimeWorkRequest  mCriteriaForIIIWorker= OneTimeWorkRequest.from(CriteriaForIIIWorker.class);
                                     OneTimeWorkRequest oneTimeWorkRequest2 = OneTimeWorkRequest.from(FailedProjWorker.class);
                                     OneTimeWorkRequest RTKConfigWorkRequest = OneTimeWorkRequest.from(RTKConfigWork.class);
@@ -123,8 +129,8 @@
 //                                    WorkManager.getInstance(mContext).enqueue(signalConigInitWorker);
 
 //鍗曡矾寰勬墽琛岋紝鍙互瀹炵幇鏇村姞澶嶆潅鐨勫璺緞鎵ц鏂瑰紡
-                                    WorkContinuation chain1= WorkManager.getInstance(mContext).beginWith(Arrays.asList(oneTimeWorkRequest,oneTimeWorkRequest1))
-                                            .then(mCriteriaForIIIWorker).then(oneTimeWorkRequest3);
+                                    WorkContinuation chain1= WorkManager.getInstance(mContext).beginWith(Arrays.asList(oneTimeWorkRequest,oneTimeWorkRequest1,criteriaInitWorkRequest))
+                                            .then(mCriteriaForIIIWorker);
                                     WorkContinuation chain2 = WorkManager.getInstance(mContext).beginWith(Arrays.asList(RTKConfigWorkRequest,appStatusInitWork,signalConigInitWorker,routeInitWorker))
                                             .then(oneTimeWorkRequest2).then(examStatusInitWorker);
 

--
Gitblit v1.8.0