1.添加测评module

baselib/schemas/com.yingyangfly.baselib.db.AppDataBase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "0e256fbdbcde18374164ae5aeae4a404",
+    "identityHash": "f357e4c637ab54dffa07dbbcfddbca04",
     "entities": [
       {
         "tableName": "Questions",
@@ -306,12 +306,12 @@
       },
       {
         "tableName": "QuestionOption",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `correctOption` TEXT, `id` TEXT, `optionKey` TEXT, `optionVal` TEXT, `questionId` TEXT)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` REAL NOT NULL, `correctOption` TEXT, `optionKey` TEXT, `optionVal` TEXT, `questionId` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "REAL",
             "notNull": true
           },
           {
@@ -320,12 +320,6 @@
             "affinity": "TEXT",
             "notNull": false
           },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": false
-          },
           {
             "fieldPath": "optionKey",
             "columnName": "optionKey",
@@ -347,21 +341,21 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "uid"
+            "id"
           ],
-          "autoGenerate": true
+          "autoGenerate": false
         },
         "indices": [],
         "foreignKeys": []
       },
       {
         "tableName": "QuestionRecords",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `correctOptionId` TEXT, `correctOptionName` TEXT, `examinationId` TEXT, `examinationTitle` TEXT, `id` TEXT, `manualHelp` TEXT, `orgCode` TEXT, `orgName` TEXT, `score` TEXT, `status` TEXT, `title` TEXT, `usedTime` TEXT)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` REAL NOT NULL, `correctOptionId` TEXT, `correctOptionName` TEXT, `examinationId` TEXT, `examinationTitle` TEXT, `manualHelp` TEXT, `orgCode` TEXT, `orgName` TEXT, `score` TEXT, `status` TEXT, `title` TEXT, `usedTime` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "REAL",
             "notNull": true
           },
           {
@@ -388,12 +382,6 @@
             "affinity": "TEXT",
             "notNull": false
           },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": false
-          },
           {
             "fieldPath": "manualHelp",
             "columnName": "manualHelp",
@@ -439,9 +427,9 @@
         ],
         "primaryKey": {
           "columnNames": [
-            "uid"
+            "id"
           ],
-          "autoGenerate": true
+          "autoGenerate": false
         },
         "indices": [],
         "foreignKeys": []
@@ -450,7 +438,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0e256fbdbcde18374164ae5aeae4a404')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f357e4c637ab54dffa07dbbcfddbca04')"
     ]
   }
 }

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionOptionBean.java

@@ -14,11 +14,10 @@ import androidx.room.PrimaryKey;
 @Entity(tableName = "QuestionOption")
 public class QuestionOptionBean {
 
-    @PrimaryKey(autoGenerate = true)
-    private int uid;
+    @PrimaryKey
+    private double id;
 
     private String correctOption;
-    private String id;
     private String optionKey;
     private String optionVal;
     private String questionId;
@@ -32,12 +31,12 @@ public class QuestionOptionBean {
     @Ignore
     private String createTime;
 
-    public int getUid() {
-        return uid;
+    public double getId() {
+        return id;
     }
 
-    public void setUid(int uid) {
-        this.uid = uid;
+    public void setId(double id) {
+        this.id = id;
     }
 
     public String getCorrectOption() {
@@ -73,17 +72,6 @@ public class QuestionOptionBean {
         this.createTime = createTime;
     }
 
-    public String getId() {
-        if (TextUtils.isEmpty(id)) {
-            return "";
-        }
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getOptionKey() {
         if (TextUtils.isEmpty(optionKey)) {
             return "";

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionRecordsBean.java

@@ -11,19 +11,19 @@ import java.util.List;
 
 /**
  * 试题内容列表
+ *
  * @author 王鹏鹏
  */
 @Entity(tableName = "QuestionRecords")
 public class QuestionRecordsBean {
 
-    @PrimaryKey(autoGenerate = true)
-    private int uid;
+    @PrimaryKey
+    private double id;
 
     private String correctOptionId;
     private String correctOptionName;
     private String examinationId;
     private String examinationTitle;
-    private String id;
     private String manualHelp;
     private String orgCode;
     private String orgName;
@@ -47,12 +47,12 @@ public class QuestionRecordsBean {
     @Ignore
     private String limit;
 
-    public int getUid() {
-        return uid;
+    public void setId(double id) {
+        this.id = id;
     }
 
-    public void setUid(int uid) {
-        this.uid = uid;
+    public double getId() {
+        return id;
     }
 
     public String getCorrectOptionId() {
@@ -121,17 +121,6 @@ public class QuestionRecordsBean {
         this.examinationTitle = examinationTitle;
     }
 
-    public String getId() {
-        if (TextUtils.isEmpty(id)) {
-            return "";
-        }
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getLimit() {
         if (TextUtils.isEmpty(limit)) {
             return "";

baselib/src/main/java/com/yingyangfly/baselib/db/QuestionRecordsDao.kt

@@ -14,8 +14,8 @@ interface QuestionRecordsDao : BaseDao<QuestionRecordsBean> {
     @Query("select * from QuestionRecords")
     fun getAllQuestionRecordsBeanBean(): MutableList<QuestionRecordsBean>
 
-    @Query("select * from QuestionRecords where uid = :uid")
-    fun getQuestionRecordsBeanByUid(uid: String): List<QuestionRecordsBean>
+    @Query("select * from QuestionRecords where id = :id")
+    fun getQuestionRecordsBeanByUid(id: String): List<QuestionRecordsBean>
 
     @Query("delete from QuestionRecords")
     fun deleteAll()

evaluation/src/main/java/com/yingyangfly/evaluation/questionlist/QuestionListActivity.kt

@@ -1,6 +1,7 @@
 package com.yingyangfly.evaluation.questionlist
 
 import android.annotation.SuppressLint
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -9,6 +10,7 @@ import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.RxTimer
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.databinding.ActivityQuestionListBinding
@@ -24,7 +26,13 @@ class QuestionListActivity : BaseActivity<ActivityQuestionListBinding>(), View.O
 
     override fun initViews() {
         rxTimer = RxTimer()
+        if (questionOptionDao != null) {
+            Log.e("wpp", GsonUtil.GsonString(questionOptionDao?.getAllQuestionOptionBeanBean()))
+        }
 
+        if (questionRecordsDao != null) {
+            Log.e("wpp", GsonUtil.GsonString(questionRecordsDao?.getAllQuestionRecordsBeanBean()))
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")