1.添加Luban图片压缩库

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

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "7411cf86970910d9fc2d3cd5c1842017",
+    "identityHash": "f5a3f79b1fa4c5026224a07f7dec48bd",
     "entities": [
       {
         "tableName": "Questions",
@@ -119,12 +119,194 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "tableName": "Doctor",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `avatar` TEXT, `certificate` TEXT, `consultationTotal` TEXT, `createBy` TEXT, `createTime` TEXT, `departmentName` TEXT, `goodRate` TEXT, `idCard` TEXT, `isDoctor` TEXT, `isOnline` TEXT, `limit` TEXT, `mobile` TEXT, `nickName` TEXT, `orgCode` TEXT, `orgName` TEXT, `page` TEXT, `password` TEXT, `price` TEXT, `remark` TEXT, `roleCodes` TEXT, `sex` TEXT, `speciality` TEXT, `status` TEXT, `title` TEXT, `updateBy` TEXT, `updateTime` TEXT, `userName` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatar",
+            "columnName": "avatar",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "certificate",
+            "columnName": "certificate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "consultationTotal",
+            "columnName": "consultationTotal",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createBy",
+            "columnName": "createBy",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createTime",
+            "columnName": "createTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "departmentName",
+            "columnName": "departmentName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "goodRate",
+            "columnName": "goodRate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "idCard",
+            "columnName": "idCard",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDoctor",
+            "columnName": "isDoctor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOnline",
+            "columnName": "isOnline",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "limit",
+            "columnName": "limit",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mobile",
+            "columnName": "mobile",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nickName",
+            "columnName": "nickName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "orgCode",
+            "columnName": "orgCode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "orgName",
+            "columnName": "orgName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "page",
+            "columnName": "page",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "remark",
+            "columnName": "remark",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "roleCodes",
+            "columnName": "roleCodes",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sex",
+            "columnName": "sex",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "speciality",
+            "columnName": "speciality",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updateBy",
+            "columnName": "updateBy",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
       }
     ],
     "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, '7411cf86970910d9fc2d3cd5c1842017')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f5a3f79b1fa4c5026224a07f7dec48bd')"
     ]
   }
 }

baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -20,6 +20,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.databinding.ActivityBaseBinding
 import com.yingyangfly.baselib.db.AppDataBase
+import com.yingyangfly.baselib.db.DoctorDao
 import com.yingyangfly.baselib.db.QuestionsDao
 import com.yingyangfly.baselib.dialog.LoadingDialog
 import com.yingyangfly.baselib.ext.getDbClass
@@ -64,7 +65,16 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
     private var logoutDialog: AlertDialog? = null
 
     var db: AppDataBase? = null
-    var dao: QuestionsDao? = null
+
+    /**
+     * 专业测评
+     */
+    var questionsDao: QuestionsDao? = null
+
+    /**
+     * 健康咨询
+     */
+    var daocorDao: DoctorDao? = null
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -87,7 +97,8 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE // 竖屏
         db = AppDataBase.getInstance(mContext)
         if (db != null) {
-            dao = db?.getQuestionsDao()
+            questionsDao = db?.getQuestionsDao()
+            daocorDao = db?.getDoctorsDao()
         }
         initMVVM()
         initViews()

baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragment.kt

@@ -52,7 +52,7 @@ abstract class BaseFragment<DB : ViewDataBinding> : Fragment(), OnRefreshLoadMor
     }
 
     var db: AppDataBase? = null
-    var dao: QuestionsDao? = null
+    var questionsDao: QuestionsDao? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -72,7 +72,7 @@ abstract class BaseFragment<DB : ViewDataBinding> : Fragment(), OnRefreshLoadMor
         bindingBase.llytContent.addView(ViewTool.inflateFragmentPixels(activity, binding.root,1194, 834))
         db = AppDataBase.getInstance(mContext)
         if (db != null) {
-            dao = db?.getQuestionsDao()
+            questionsDao = db?.getQuestionsDao()
         }
         initMVVM()
         initViews()

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

@@ -5,15 +5,17 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 
-@Database(entities = [QuestionsBean::class], version = 1)
+@Database(entities = [QuestionsBean::class, DoctorBean::class], version = 1)
 abstract class AppDataBase : RoomDatabase() {
 
     abstract fun getQuestionsDao(): QuestionsDao
 
+    abstract fun getDoctorsDao(): DoctorDao
+
     companion object {
         @Volatile
         private var sInstance: AppDataBase? = null
-        private const val DATA_BASE_NAME = "jetpack_movie.db"
+        private const val DATA_BASE_NAME = "hcp_pad.db"
 
         @JvmStatic
         fun getInstance(context: Context): AppDataBase? {
@@ -32,8 +34,7 @@ abstract class AppDataBase : RoomDatabase() {
                 context.applicationContext,
                 AppDataBase::class.java,
                 DATA_BASE_NAME
-            )
-                .allowMainThreadQueries()
+            ).allowMainThreadQueries()
                 .build()
         }
     }

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

@@ -0,0 +1,365 @@
+package com.yingyangfly.baselib.db;
+
+import android.text.TextUtils;
+
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+
+/**
+ * @author 王鹏鹏
+ */
+@Entity(tableName = "Doctor")
+public class DoctorBean implements Serializable {
+
+    @NotNull
+    @PrimaryKey
+    private String id;//用户ID
+
+    private String avatar;//头像地址
+    private String certificate;//医生资格证
+    private String consultationTotal;//问诊量
+    private String createBy;
+    private String createTime;
+    private String departmentName;//所属部门
+    private String goodRate;//好评率
+    private String idCard;//身份证号
+    private String isDoctor;//是否医生 0是 1否
+    private String isOnline;//是否在线 0是 1否
+    private String limit;
+    private String mobile;//手机号码
+    private String nickName;//用户昵称
+    private String orgCode;
+    private String orgName;//机构名字
+    private String page;
+    private String password;//密码
+    private String price;//单价
+    private String remark;//备注
+    private String roleCodes;//用户关联的所有的角色，用逗号分隔
+    private String sex;//用户性别（0男 1女 2未知）
+    private String speciality;//擅长
+    private String status;//帐号状态（0正常 1停用 2删除）
+    private String title;//职称
+    private String updateBy;
+    private String updateTime;
+    private String userName;//用户账号
+
+    public String getAvatar() {
+        if (TextUtils.isEmpty(avatar)) {
+            return "";
+        }
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getCertificate() {
+        if (TextUtils.isEmpty(certificate)) {
+            return "";
+        }
+        return certificate;
+    }
+
+    public void setCertificate(String certificate) {
+        this.certificate = certificate;
+    }
+
+    public String getConsultationTotal() {
+        if (TextUtils.isEmpty(consultationTotal)) {
+            return "";
+        }
+        return consultationTotal;
+    }
+
+    public void setConsultationTotal(String consultationTotal) {
+        this.consultationTotal = consultationTotal;
+    }
+
+    public String getCreateBy() {
+        if (TextUtils.isEmpty(createBy)) {
+            return "";
+        }
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateTime() {
+        if (TextUtils.isEmpty(createTime)) {
+            return "";
+        }
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDepartmentName() {
+        if (TextUtils.isEmpty(departmentName)) {
+            return "";
+        }
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getGoodRate() {
+        if (TextUtils.isEmpty(goodRate)) {
+            return "";
+        }
+        return goodRate;
+    }
+
+    public void setGoodRate(String goodRate) {
+        this.goodRate = goodRate;
+    }
+
+    public String getId() {
+        if (TextUtils.isEmpty(id)) {
+            return "";
+        }
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdCard() {
+        if (TextUtils.isEmpty(idCard)) {
+            return "";
+        }
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getIsDoctor() {
+        if (TextUtils.isEmpty(isDoctor)) {
+            return "";
+        }
+        return isDoctor;
+    }
+
+    public void setIsDoctor(String isDoctor) {
+        this.isDoctor = isDoctor;
+    }
+
+    public String getIsOnline() {
+        if (TextUtils.isEmpty(isOnline)) {
+            return "";
+        }
+        return isOnline;
+    }
+
+    public void setIsOnline(String isOnline) {
+        this.isOnline = isOnline;
+    }
+
+    public String getLimit() {
+        if (TextUtils.isEmpty(limit)) {
+            return "";
+        }
+        return limit;
+    }
+
+    public void setLimit(String limit) {
+        this.limit = limit;
+    }
+
+    public String getMobile() {
+        if (TextUtils.isEmpty(mobile)) {
+            return "";
+        }
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getNickName() {
+        if (TextUtils.isEmpty(nickName)) {
+            return "";
+        }
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getOrgCode() {
+        if (TextUtils.isEmpty(orgCode)) {
+            return "";
+        }
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgName() {
+        if (TextUtils.isEmpty(orgName)) {
+            return "";
+        }
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getPage() {
+        if (TextUtils.isEmpty(page)) {
+            return "";
+        }
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+
+    public String getPassword() {
+        if (TextUtils.isEmpty(password)) {
+            return "";
+        }
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPrice() {
+        if (TextUtils.isEmpty(price)) {
+            return "";
+        }
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getRemark() {
+        if (TextUtils.isEmpty(remark)) {
+            return "";
+        }
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRoleCodes() {
+        if (TextUtils.isEmpty(roleCodes)) {
+            return "";
+        }
+        return roleCodes;
+    }
+
+    public void setRoleCodes(String roleCodes) {
+        this.roleCodes = roleCodes;
+    }
+
+    public String getSex() {
+        if (TextUtils.isEmpty(sex)) {
+            return "";
+        }
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSpeciality() {
+        if (TextUtils.isEmpty(speciality)) {
+            return "";
+        }
+        return speciality;
+    }
+
+    public void setSpeciality(String speciality) {
+        this.speciality = speciality;
+    }
+
+    public String getStatus() {
+        if (TextUtils.isEmpty(status)) {
+            return "";
+        }
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getTitle() {
+        if (TextUtils.isEmpty(title)) {
+            return "";
+        }
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getUpdateBy() {
+        if (TextUtils.isEmpty(updateBy)) {
+            return "";
+        }
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateTime() {
+        if (TextUtils.isEmpty(updateTime)) {
+            return "";
+        }
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUserName() {
+        if (TextUtils.isEmpty(userName)) {
+            return "";
+        }
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getIsOnlineStatus() {
+        if (TextUtils.equals("0", getIsOnline())) {
+            return "在线";
+        } else {
+            return "离线";
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.yingyangfly.baselib.db
+
+import androidx.room.*
+
+@Dao
+interface DoctorDao : BaseDao<DoctorBean> {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insert(element: DoctorBean)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    override fun insertAll(list: MutableList<DoctorBean>)
+
+    @Query("select * from Doctor")
+    fun getAllDoctorBean(): MutableList<DoctorBean>
+
+    @Query("select * from Doctor where id = :id")
+    fun getDoctor(id: String): DoctorBean
+
+    @Query("delete from Doctor")
+    fun deleteAll()
+
+    @Update
+    override fun update(element: DoctorBean)
+
+}

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -9,7 +9,7 @@ import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationAdapter
 import com.yingyang.healthconsultation.adapter.RecommendDoctorAdapter
 import com.yingyang.healthconsultation.databinding.ActivityHealthConsultationBinding
-import com.yingyang.healthconsultation.entity.ConsultationBean
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.show
@@ -29,13 +29,13 @@ class HealthConsultationActivity :
      * 推荐医生列表
      */
     private val recommendDoctorAdapter by lazy { RecommendDoctorAdapter() }
-    private val doctorBeans = mutableListOf<ConsultationBean>()
+    private val doctorBeans = mutableListOf<DoctorBean>()
 
     /**
      * 正在咨询列表
      */
     private val consultationAdapter by lazy { ConsultationAdapter() }
-    private val consultationBeans = mutableListOf<ConsultationBean>()
+    private val consultationBeans = mutableListOf<DoctorBean>()
 
     override fun initViews() {
         binding {
@@ -44,10 +44,7 @@ class HealthConsultationActivity :
             rvRecommended.adapter = recommendDoctorAdapter
             recommendDoctorAdapter.setData(doctorBeans)
             recommendDoctorAdapter.onClickListener = {
-                ARouter.getInstance().build(RouterUrlCommon.consultationRequest)
-                    .withTransition(R.anim.leftin, R.anim.leftout)
-                    .withSerializable("doctorDetails", it)
-                    .navigation(mContext)
+                JumpUtil.jumpActivityWithUrl(RouterUrlCommon.consultationRequest, it.id, mContext)
             }
         }
     }
@@ -126,12 +123,18 @@ class HealthConsultationActivity :
      */
     private fun getRecommendDoctorList() {
         doctorBeans.clear()
+        if (daocorDao != null) {
+            daocorDao?.deleteAll()
+        }
         viewModel.getRecommendDoctorList(fail = {
             it.show()
         }, success = {
             if (it.isNullOrEmpty().not()) {
                 doctorBeans.clear()
                 doctorBeans.addAll(it!!)
+                if (daocorDao != null) {
+                    daocorDao?.insertAll(doctorBeans)
+                }
             }
             recommendDoctorAdapter.setData(doctorBeans)
         })

healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationViewModel.kt

@@ -1,7 +1,7 @@
 package com.yingyang.healthconsultation.activity
 
-import com.yingyang.healthconsultation.entity.ConsultationBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 
 /**
@@ -14,7 +14,7 @@ class HealthConsultationViewModel : BaseViewModel() {
      */
     fun getRecommendDoctorList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<ConsultationBean>?) -> Unit)? = null,
+        success: ((success: List<DoctorBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         HEALTHCONSULTATION_API.getRecommendDoctorList()
     }.runUI(
@@ -27,7 +27,7 @@ class HealthConsultationViewModel : BaseViewModel() {
      */
     fun getConsultationList(
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: List<ConsultationBean>?) -> Unit)? = null,
+        success: ((success: List<DoctorBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
         HEALTHCONSULTATION_API.getConsultationList()
     }.runUI(

healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/ConsultationAdapter.kt

@@ -2,17 +2,17 @@ package com.yingyang.healthconsultation.adapter
 
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ItemConsultationBinding
-import com.yingyang.healthconsultation.entity.ConsultationBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.db.DoctorBean
 
 /**
  * 正在进行的咨询列表adapter
  */
 class ConsultationAdapter(override val layoutId: Int = R.layout.item_consultation) :
-    BaseDataBindingAdapter<ConsultationBean, ItemConsultationBinding>() {
+    BaseDataBindingAdapter<DoctorBean, ItemConsultationBinding>() {
     override fun onBindViewHolder(
         binding: ItemConsultationBinding,
-        item: ConsultationBean,
+        item: DoctorBean,
         position: Int
     ) {
         binding.data = item

healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/RecommendDoctorAdapter.kt

@@ -8,8 +8,8 @@ import android.text.style.ForegroundColorSpan
 import android.view.MotionEvent
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ItemRecommendDoctorBinding
-import com.yingyang.healthconsultation.entity.ConsultationBean
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 
@@ -17,18 +17,18 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
  * 推荐医生adapter
  */
 class RecommendDoctorAdapter(override val layoutId: Int = R.layout.item_recommend_doctor) :
-    BaseDataBindingAdapter<ConsultationBean, ItemRecommendDoctorBinding>() {
+    BaseDataBindingAdapter<DoctorBean, ItemRecommendDoctorBinding>() {
 
-    var onClickListener: ((bean: ConsultationBean) -> Unit)? = null
+    var onClickListener: ((bean: DoctorBean) -> Unit)? = null
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onBindViewHolder(
         binding: ItemRecommendDoctorBinding,
-        item: ConsultationBean,
+        item: DoctorBean,
         position: Int
     ) {
         binding.data = item
-        val price = "单次：¥" + item.priceInfo()
+        val price = "单次：¥" + item.price
         val priceSpannableString = SpannableString(price)
         priceSpannableString.setSpan(
             ForegroundColorSpan(Color.parseColor("#FF4A76FF")),
@@ -36,7 +36,7 @@ class RecommendDoctorAdapter(override val layoutId: Int = R.layout.item_recommen
         )
         binding.tvPrice.text = priceSpannableString
 
-        val consultationTotal = "咨询量：" + item.getConsultationTotalInfo()
+        val consultationTotal = "咨询量：" + item.consultationTotal
         val spannableString = SpannableString(consultationTotal)
         spannableString.setSpan(
             ForegroundColorSpan(Color.parseColor("#FF4A76FF")),

healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationRequestActivity.kt

@@ -11,7 +11,7 @@ import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ActivityConsultationRequestBinding
-import com.yingyang.healthconsultation.entity.ConsultationBean
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.toast
@@ -27,23 +27,27 @@ class ConsultationRequestActivity :
     BaseMVVMActivity<ActivityConsultationRequestBinding, ConsultationRequestViewModel>(),
     View.OnTouchListener {
 
-    private var doctorDetails: ConsultationBean? = null
+    private var id: String = ""
+    private var doctorBean: DoctorBean? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        doctorDetails = intent.getSerializableExtra("doctorDetails") as ConsultationBean
+        id = intent.getStringExtra("url") ?: ""
         super.onCreate(savedInstanceState)
     }
 
     override fun initViews() {
-        if (doctorDetails != null) {
-            binding.data = doctorDetails
-            val consultationTotal = "咨询量：" + doctorDetails!!.getConsultationTotalInfo()
-            val totalSpannableString = SpannableString(consultationTotal)
-            totalSpannableString.setSpan(
-                ForegroundColorSpan(Color.parseColor("#FF4A76FF")),
-                4, totalSpannableString.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-            binding.tvConsult.text = totalSpannableString
+        if (daocorDao != null) {
+            doctorBean = daocorDao?.getDoctor(id)
+            if (doctorBean != null) {
+                binding.data = doctorBean!!
+                val consultationTotal = "咨询量：" + doctorBean!!.consultationTotal
+                val totalSpannableString = SpannableString(consultationTotal)
+                totalSpannableString.setSpan(
+                    ForegroundColorSpan(Color.parseColor("#FF4A76FF")),
+                    4, totalSpannableString.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                binding.tvConsult.text = totalSpannableString
+            }
         }
     }
 

healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt

@@ -1,10 +1,9 @@
 package com.yingyang.healthconsultation.net
 
-import com.yingyang.healthconsultation.entity.ConsultationBean
 import com.yingyang.healthconsultation.entity.UserInfoBean
+import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.net.BaseResp
 import okhttp3.MultipartBody
-import okhttp3.RequestBody
 import retrofit2.http.Body
 import retrofit2.http.POST
 
@@ -14,14 +13,14 @@ interface HealthConsultationApiService {
      * 推荐医生列表
      */
     @POST("medical_consultation/recommend_doctor")
-    suspend fun getRecommendDoctorList(): BaseResp<List<ConsultationBean>>
+    suspend fun getRecommendDoctorList(): BaseResp<List<DoctorBean>>
 
 
     /**
      * 正在进行的咨询列表
      */
     @POST("medical_consultation/list")
-    suspend fun getConsultationList(): BaseResp<List<ConsultationBean>>
+    suspend fun getConsultationList(): BaseResp<List<DoctorBean>>
 
     /**
      * 获取个人中心信息接口

healthconsultation/src/main/res/layout/activity_consultation_request.xml

@@ -12,7 +12,7 @@
 
         <variable
             name="data"
-            type="com.yingyang.healthconsultation.entity.ConsultationBean" />
+            type="com.yingyangfly.baselib.db.DoctorBean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -124,7 +124,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_40px"
                     android:layout_marginTop="@dimen/divider_44px"
-                    android:text='@{data.titleInfo()+data.departmentNameInfo()}'
+                    android:text='@{data.title+data.departmentName}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     app:layout_constraintStart_toEndOf="@+id/tvName"
@@ -137,7 +137,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_35px"
                     android:layout_marginTop="@dimen/divider_19px"
-                    android:text="@{data.specialityInfo()}"
+                    android:text="@{data.speciality}"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -163,7 +163,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_23px"
                     android:layout_marginEnd="@dimen/divider_26px"
-                    android:text='@{"好评率"+data.getGoodRateInfo()}'
+                    android:text='@{"好评率"+data.goodRate}'
                     android:textColor="@color/color_FFFF9E05"
                     android:textSize="@dimen/divider_24px"
                     app:layout_constraintEnd_toEndOf="parent"

healthconsultation/src/main/res/layout/item_consultation.xml

@@ -8,7 +8,7 @@
 
         <variable
             name="data"
-            type="com.yingyang.healthconsultation.entity.ConsultationBean" />
+            type="com.yingyangfly.baselib.db.DoctorBean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

healthconsultation/src/main/res/layout/item_recommend_doctor.xml

@@ -8,7 +8,7 @@
 
         <variable
             name="data"
-            type="com.yingyang.healthconsultation.entity.ConsultationBean" />
+            type="com.yingyangfly.baselib.db.DoctorBean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/divider_40px"
             android:layout_marginTop="@dimen/divider_36px"
-            android:text='@{data.titleInfo()+data.departmentNameInfo()}'
+            android:text='@{data.title+data.departmentName}'
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_24px"
             app:layout_constraintStart_toEndOf="@+id/tvName"
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/divider_35px"
             android:layout_marginTop="@dimen/divider_19px"
-            android:text="@{data.specialityInfo()}"
+            android:text="@{data.speciality}"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_24px"
             app:layout_constraintStart_toEndOf="@+id/imageHead"

mmse/src/main/java/com/yingyangfly/mmse/activity/QuestionsActivity.kt

@@ -56,8 +56,8 @@ class QuestionsActivity : BaseMVVMActivity<ActivityQuestionsBinding, QuestionsVi
     @Subscribe(code = RxBusCodes.EndMMSEQuestion, threadMode = ThreadMode.MAIN)
     fun loadData() {
         rxTimer.cancel()
-        if (dao != null) {
-            val questionsBeans = dao?.getAllQuestions()
+        if (questionsDao != null) {
+            val questionsBeans = questionsDao?.getAllQuestions()
             if (questionsBeans.isNullOrEmpty().not()) {
                 questionsBeans?.forEach {
                     it.reviewId = it.id

mmse/src/main/java/com/yingyangfly/mmse/fragment/CountFragment.kt

@@ -158,8 +158,8 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null && firstQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultOne.post {
                     if (stringBufferOne.toString().isEmpty().not()) {
@@ -171,7 +171,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                 }
             }
             val secondQuestionId = questionId + 1
-            secondQuestion = dao?.getQuestion(secondQuestionId)
+            secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null && secondQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultTwo.post {
                     if (stringBufferTwo.toString().isEmpty().not()) {
@@ -183,7 +183,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                 }
             }
             val thirdQuestionId = questionId + 2
-            thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null && thirdQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultThree.post {
                     if (stringBufferThree.toString().isEmpty().not()) {
@@ -195,7 +195,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                 }
             }
             val fourthQuestionId = questionId + 3
-            fourthQuestion = dao?.getQuestion(fourthQuestionId)
+            fourthQuestion = questionsDao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null && fourthQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultFour.post {
                     if (stringBufferFour.toString().isEmpty().not()) {
@@ -207,7 +207,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                 }
             }
             val fifthQuestionId = questionId + 4
-            fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null && fifthQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultFive.post {
                     if (stringBufferFive.toString().isEmpty().not()) {
@@ -225,7 +225,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
      * 非空判断
      */
     private fun judge(): Boolean {
-        if (dao != null) {
+        if (questionsDao != null) {
             if (binding.editResultOne.text.toString().trim().isEmpty()) {
                 "请输入第一道题目的答案".toast()
                 return false
@@ -235,7 +235,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     firstQuestion!!.reviewId = firstQuestion!!.id
                     firstQuestion!!.reviewAnswer = binding.editResultOne.text.toString().trim()
                     firstQuestion!!.correct = ""
-                    dao?.update(firstQuestion!!)
+                    questionsDao?.update(firstQuestion!!)
                 }
             }
             if (binding.editResultTwo.text.toString().trim().isEmpty()) {
@@ -247,7 +247,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     secondQuestion!!.reviewId = secondQuestion!!.id
                     secondQuestion!!.reviewAnswer = binding.editResultTwo.text.toString().trim()
                     secondQuestion!!.correct = ""
-                    dao?.update(secondQuestion!!)
+                    questionsDao?.update(secondQuestion!!)
                 }
             }
             if (binding.editResultThree.text.toString().trim().isEmpty()) {
@@ -259,7 +259,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     thirdQuestion!!.reviewId = thirdQuestion!!.id
                     thirdQuestion!!.reviewAnswer = binding.editResultThree.text.toString().trim()
                     thirdQuestion!!.correct = ""
-                    dao?.update(thirdQuestion!!)
+                    questionsDao?.update(thirdQuestion!!)
                 }
             }
             if (binding.editResultFour.text.toString().trim().isEmpty()) {
@@ -271,7 +271,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     fourthQuestion!!.reviewId = fourthQuestion!!.id
                     fourthQuestion!!.reviewAnswer = binding.editResultFour.text.toString().trim()
                     fourthQuestion!!.correct = ""
-                    dao?.update(fourthQuestion!!)
+                    questionsDao?.update(fourthQuestion!!)
                 }
             }
             if (binding.editResultFive.text.toString().trim().isEmpty()) {
@@ -283,7 +283,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     fifthQuestion!!.reviewId = fifthQuestion!!.id
                     fifthQuestion!!.reviewAnswer = binding.editResultFive.text.toString().trim()
                     fifthQuestion!!.correct = ""
-                    dao?.update(fifthQuestion!!)
+                    questionsDao?.update(fifthQuestion!!)
                 }
             }
         }
@@ -391,7 +391,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
      * 保存数据
      */
     private fun save() {
-        if (dao != null) {
+        if (questionsDao != null) {
             if (questionOne) {
                 questionOne = false
                 questionTwo = true
@@ -400,7 +400,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     firstQuestion!!.reviewId = firstQuestion!!.id
                     firstQuestion!!.reviewAnswer = binding.editResultOne.toString().trim()
                     firstQuestion!!.correct = ""
-                    dao?.update(firstQuestion!!)
+                    questionsDao?.update(firstQuestion!!)
                 }
             }
             if (questionTwo) {
@@ -411,7 +411,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     secondQuestion!!.reviewId = secondQuestion!!.id
                     secondQuestion!!.reviewAnswer = binding.editResultTwo.toString().trim()
                     secondQuestion!!.correct = ""
-                    dao?.update(secondQuestion!!)
+                    questionsDao?.update(secondQuestion!!)
                 }
             }
             if (questionThree) {
@@ -422,7 +422,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     thirdQuestion!!.reviewId = thirdQuestion!!.id
                     thirdQuestion!!.reviewAnswer = binding.editResultThree.toString().trim()
                     thirdQuestion!!.correct = ""
-                    dao?.update(thirdQuestion!!)
+                    questionsDao?.update(thirdQuestion!!)
                 }
             }
             if (questionFour) {
@@ -433,7 +433,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     fourthQuestion!!.reviewId = fourthQuestion!!.id
                     fourthQuestion!!.reviewAnswer = binding.editResultFour.toString().trim()
                     fourthQuestion!!.correct = ""
-                    dao?.update(fourthQuestion!!)
+                    questionsDao?.update(fourthQuestion!!)
                 }
             }
             if (questionFive) {
@@ -442,7 +442,7 @@ class CountFragment : BaseFragment<FragmentCountBinding>(), View.OnTouchListener
                     fifthQuestion!!.reviewId = fifthQuestion!!.id
                     fifthQuestion!!.reviewAnswer = binding.editResultFive.toString().trim()
                     fifthQuestion!!.correct = ""
-                    dao?.update(fifthQuestion!!)
+                    questionsDao?.update(fifthQuestion!!)
                 }
             }
 

mmse/src/main/java/com/yingyangfly/mmse/fragment/DrawDesignsFragment.kt

@@ -56,8 +56,8 @@ class DrawDesignsFragment : BaseFragment<FragmentDrawDesignsBinding>(), View.OnT
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding {
                     data = question

mmse/src/main/java/com/yingyangfly/mmse/fragment/InputFragment.kt

@@ -105,8 +105,8 @@ class InputFragment : BaseFragment<FragmentInputBinding>(), View.OnTouchListener
             val length = stringBuffer.length
             stringBuffer.delete(0, length)
         }
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
                 toastInfo = question!!.reviewItem
@@ -152,13 +152,13 @@ class InputFragment : BaseFragment<FragmentInputBinding>(), View.OnTouchListener
      */
     private fun saveData() {
         binding.editYear.post {
-            if (dao != null) {
+            if (questionsDao != null) {
                 if (question != null) {
                     question!!.inputString = binding.editYear.text.toString().trim()
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = binding.editYear.text.toString().trim()
                     question!!.correct = ""
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
         }
@@ -215,7 +215,7 @@ class InputFragment : BaseFragment<FragmentInputBinding>(), View.OnTouchListener
                 question!!.reviewId = question!!.id
                 question!!.reviewAnswer = binding.editYear.text.toString().trim()
                 question!!.correct = ""
-                dao?.update(question!!)
+                questionsDao?.update(question!!)
             }
             if (questionId == 3) {
                 questionId++

mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentFragment.kt

@@ -45,16 +45,16 @@ class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>(), View.OnTouchLi
                 question!!.reviewId = question!!.id
                 question!!.reviewAnswer = ""
                 if (checkedId == R.id.btnDeny) {
-                    if (question != null && dao != null) {
+                    if (question != null && questionsDao != null) {
                         question!!.inputString = "否"
                         question!!.correct = "0"
-                        dao?.update(question!!)
+                        questionsDao?.update(question!!)
                     }
                 } else if (checkedId == R.id.btnCorrect) {
-                    if (question != null && dao != null) {
+                    if (question != null && questionsDao != null) {
                         question!!.inputString = "是"
                         question!!.correct = "1"
-                        dao?.update(question!!)
+                        questionsDao?.update(question!!)
                     }
                 }
             }
@@ -74,8 +74,8 @@ class JudgmentFragment : BaseFragment<FragmentJudgmentBinding>(), View.OnTouchLi
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding {
                     data = question

mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentRecordFragment.kt

@@ -54,7 +54,7 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>(), Vi
                         question?.score = question?.reviewScore
                         question?.correct = "1"
                     }
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
             soundImage.setOnTouchListener(this@JudgmentRecordFragment)
@@ -76,8 +76,8 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>(), Vi
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.btnDeny.isChecked = TextUtils.equals(question!!.inputString, "否")
                 binding.btnCorrect.isChecked = TextUtils.equals(question!!.inputString, "是")

mmse/src/main/java/com/yingyangfly/mmse/fragment/MultipleChoiceFragment.kt

@@ -44,8 +44,8 @@ class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>(), Vi
             }
             rvChoice.adapter = adapter
             adapter.onNumClickListener = { bean ->
-                if (dao != null) {
-                    dao?.update(bean)
+                if (questionsDao != null) {
+                    questionsDao?.update(bean)
                 }
             }
         }
@@ -73,18 +73,18 @@ class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>(), Vi
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            val firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null) {
                 choiceItemList.add(firstquestion)
             }
             val secondQuestionnId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionnId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionnId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }

mmse/src/main/java/com/yingyangfly/mmse/fragment/ReadFragment.kt

@@ -43,20 +43,20 @@ class ReadFragment : BaseFragment<FragmentReadBinding>(), View.OnTouchListener {
             btnPrevious.setOnTouchListener(this@ReadFragment)
             btnNext.setOnTouchListener(this@ReadFragment)
             judgeRadio.setOnCheckedChangeListener { _, checkedId ->
-                if (question != null && dao != null) {
+                if (question != null && questionsDao != null) {
                     question?.reviewId = question!!.id
                     question?.reviewAnswer = ""
                     if (checkedId == R.id.btnDeny) {
                         question!!.inputString = "否"
                         question?.correct = "0"
                         question?.score = "0"
-                        dao?.update(question!!)
+                        questionsDao?.update(question!!)
 
                     } else if (checkedId == R.id.btnCorrect) {
                         question!!.inputString = "是"
                         question?.correct = "1"
                         question?.score = question?.reviewScore
-                        dao?.update(question!!)
+                        questionsDao?.update(question!!)
                     }
                 }
             }
@@ -76,8 +76,8 @@ class ReadFragment : BaseFragment<FragmentReadBinding>(), View.OnTouchListener {
      * 获取题目数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             binding.btnDeny.isChecked = TextUtils.equals("否", question!!.inputString)
             binding.btnCorrect.isChecked = TextUtils.equals("是", question!!.inputString)
         }

mmse/src/main/java/com/yingyangfly/mmse/fragment/RecognitionImageFragment.kt

@@ -44,8 +44,8 @@ class RecognitionImageFragment : BaseFragment<FragmentRecognitionImageBinding>()
         binding {
             rvChoice.adapter = adapter
             adapter.onNumClickListener = { bean ->
-                if (dao != null) {
-                    dao?.update(bean)
+                if (questionsDao != null) {
+                    questionsDao?.update(bean)
                 }
             }
         }
@@ -73,14 +73,14 @@ class RecognitionImageFragment : BaseFragment<FragmentRecognitionImageBinding>()
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 binding.firstData = firstQuestion
                 choiceItemList.add(firstQuestion)
             }
             val secondQuestionId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null) {
                 if (questionId == 22) {
                     binding.secondData = secondQuestion

mmse/src/main/java/com/yingyangfly/mmse/fragment/RecordActionFragment.kt

@@ -60,17 +60,17 @@ class RecordActionFragment : BaseFragment<FragmentRecordActionBinding>(), View.O
      * 加载数据
      */
     private fun loadData() {
-        val firstquestion = dao?.getQuestion(questionId)
+        val firstquestion = questionsDao?.getQuestion(questionId)
         if (firstquestion != null) {
             firstWord = firstquestion.reviewItem
         }
         val secondQuestionnId = questionId + 1
-        val secondQuestion = dao?.getQuestion(secondQuestionnId)
+        val secondQuestion = questionsDao?.getQuestion(secondQuestionnId)
         if (secondQuestion != null) {
             secondWord = secondQuestion.reviewItem
         }
         val thirdQuestionId = questionId + 2
-        val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+        val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
         if (thirdQuestion != null) {
             thirdWord = thirdQuestion.reviewItem
         }

mmse/src/main/java/com/yingyangfly/mmse/fragment/SelectedItemFragment.kt

@@ -46,12 +46,12 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>(), View.O
             rvSelectedItem.layoutManager = flexboxLayoutManager
             rvSelectedItem.adapter = selectedAdapter
             selectedAdapter.onSelectedItemClickListener = { bean ->
-                if (question != null && dao != null) {
+                if (question != null && questionsDao != null) {
                     question!!.inputString = bean
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = getWeekInfo(bean)
                     question!!.correct = ""
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
         }
@@ -104,8 +104,8 @@ class SelectedItemFragment : BaseFragment<FragmentSelectedItemBinding>(), View.O
      * 获取题目数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
                 selectedAdapter.selectedData = question!!.inputString

mmse/src/main/java/com/yingyangfly/mmse/fragment/SoundRecordFragment.kt

@@ -60,18 +60,18 @@ class SoundRecordFragment : BaseFragment<FragmentSoundRecordBinding>(), View.OnT
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            val firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null) {
                 firstWord = firstquestion.reviewItem
             }
             val secondQuestionnId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionnId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionnId)
             if (secondQuestion != null) {
                 secondWord = secondQuestion.reviewItem
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 thirdWord = thirdQuestion.reviewItem
             }

mmse/src/main/java/com/yingyangfly/mmse/fragment/YearFragment.kt

@@ -82,8 +82,8 @@ class YearFragment : BaseFragment<FragmentYearBinding>(), View.OnTouchListener {
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(1)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(1)
             if (question != null) {
                 binding.data = question
                 toastInfo = question!!.reviewItem
@@ -153,13 +153,13 @@ class YearFragment : BaseFragment<FragmentYearBinding>(), View.OnTouchListener {
      */
     private fun saveData() {
         binding.editYear.post {
-            if (dao != null) {
+            if (questionsDao != null) {
                 if (question != null) {
                     question!!.inputString = binding.editYear.text.toString().trim()
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = binding.editYear.text.toString().trim()
                     question!!.correct = ""
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
         }
@@ -178,7 +178,7 @@ class YearFragment : BaseFragment<FragmentYearBinding>(), View.OnTouchListener {
                 question!!.reviewId = question!!.id
                 question!!.reviewAnswer = binding.editYear.text.toString().trim()
                 question!!.correct = ""
-                dao?.update(question!!)
+                questionsDao?.update(question!!)
             }
             val bundle = bundleOf("questionId" to 2)
             val controller = Navigation.findNavController(v)

moca/src/main/java/com/yingyangfly/moca/activity/MocaActivity.kt

@@ -56,8 +56,8 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
     @Subscribe(code = RxBusCodes.EndMOCAQuestion, threadMode = ThreadMode.MAIN)
     fun loadData() {
         rxTimer.cancel()
-        if (dao != null) {
-            val questionsBeans = dao?.getAllQuestions()
+        if (questionsDao != null) {
+            val questionsBeans = questionsDao?.getAllQuestions()
             if (questionsBeans.isNullOrEmpty().not()) {
                 questionsBeans?.forEach {
                     it.usedTime = time.toString()

moca/src/main/java/com/yingyangfly/moca/alternatingconnection/AlternatingConnectionFragment.kt

@@ -299,8 +299,8 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
         }
     }
 
@@ -376,13 +376,13 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 if (question != null) {
                     question?.score = question?.reviewScore
                     question?.correct = "1"
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             } else {
                 if (question != null) {
                     question?.score = "0"
                     question?.correct = "0"
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
             val bundle = bundleOf("questionId" to 33)

moca/src/main/java/com/yingyangfly/moca/drawdesign/VerifyAnswersFragment.kt

@@ -42,8 +42,8 @@ class VerifyAnswersFragment : BaseFragment<FragmentVerifyAnswersBinding>(), View
         binding {
             rvChoice.adapter = adapter
             adapter.onCheckClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -73,18 +73,18 @@ class VerifyAnswersFragment : BaseFragment<FragmentVerifyAnswersBinding>(), View
         }
 
         choiceItemList.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 choiceItemList.add(firstQuestion)
             }
             val secondQuestionnId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionnId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionnId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }
@@ -124,8 +124,8 @@ class VerifyAnswersFragment : BaseFragment<FragmentVerifyAnswersBinding>(), View
                 it.reviewId = it.id
                 it.score = "0"
                 it.correct = "0"
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         } else {
@@ -133,8 +133,8 @@ class VerifyAnswersFragment : BaseFragment<FragmentVerifyAnswersBinding>(), View
                 it.reviewId = it.id
                 it.score = it.reviewScore
                 it.correct = "1"
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }

moca/src/main/java/com/yingyangfly/moca/identify/IdentifyPictureFragment.kt

@@ -55,8 +55,8 @@ class IdentifyPictureFragment : BaseFragment<FragmentIdentifyPictureBinding>(),
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
             }

moca/src/main/java/com/yingyangfly/moca/identify/IdentifyResultFragment.kt

@@ -37,8 +37,8 @@ class IdentifyResultFragment : BaseFragment<FragmentIdentifyResultBinding>(),
         binding {
             rvChoice.adapter = adapter
             adapter.onNumClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -66,18 +66,18 @@ class IdentifyResultFragment : BaseFragment<FragmentIdentifyResultBinding>(),
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            val firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null) {
                 choiceItemList.add(firstquestion)
             }
             val secondQuestionnId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionnId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionnId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }

moca/src/main/java/com/yingyangfly/moca/listenspeak/ListenSpeakFragment.kt

@@ -60,8 +60,8 @@ class ListenSpeakFragment : BaseFragment<FragmentListenSpeakBinding>(),
         } else {
             "下面将再给您听一遍刚才的几个词，请您仔细听并努力记住这些词，等一下要问您，请听题"
         }
-        if (dao != null) {
-            questionsBean = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            questionsBean = questionsDao?.getQuestion(questionId)
         }
     }
 

moca/src/main/java/com/yingyangfly/moca/listenspeak/ListenSpeakResultFragment.kt

@@ -34,8 +34,8 @@ class ListenSpeakResultFragment : BaseFragment<FragmentListenSpeakResultBinding>
         binding {
             rvChoice.adapter = adapter
             adapter.onCheckClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -63,8 +63,8 @@ class ListenSpeakResultFragment : BaseFragment<FragmentListenSpeakResultBinding>
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            val firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null) {
                 choiceItemList.add(firstquestion)
             }

moca/src/main/java/com/yingyangfly/moca/memorizenumbers/MemorizeNumbersFragment.kt

@@ -70,8 +70,8 @@ class MemorizeNumbersFragment : BaseFragment<FragmentMemorizeNumbersBinding>(),
                 "下面将给您听一串数字，请您仔细听，当您听到数字“1”时，请敲一下桌面，听到其他数字不用做反应"
             }
         }
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
         }
     }
 

moca/src/main/java/com/yingyangfly/moca/memorizenumbers/MemorizeResultFragment.kt

@@ -33,8 +33,8 @@ class MemorizeResultFragment : BaseFragment<FragmentMemorizeResultBinding>(),
         binding {
             rvChoice.adapter = adapter
             adapter.onNumClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -67,8 +67,8 @@ class MemorizeResultFragment : BaseFragment<FragmentMemorizeResultBinding>(),
             "请您倒序说出刚才听到的数字"
         }
         choiceItemList.clear()
-        if (dao != null) {
-            val firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null) {
                 choiceItemList.add(firstquestion)
             }

moca/src/main/java/com/yingyangfly/moca/numberrecords/NumberRecordsFragment.kt

@@ -99,13 +99,13 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
      */
     private fun update() {
         binding.editTime.post {
-            if (dao != null) {
+            if (questionsDao != null) {
                 if (question != null) {
                     question!!.inputString = binding.editTime.text.toString().trim()
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = binding.editTime.text.toString().trim()
                     question!!.correct = ""
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
         }
@@ -167,8 +167,8 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
         binding.editTime.isFocusable = true
         binding.editTime.isFocusableInTouchMode = true
         binding.editTime.postDelayed({ closeKeyBord(binding.editTime, mContext) }, 300)
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
                 if (question!!.inputString.isNullOrEmpty().not()) {
@@ -193,7 +193,7 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
             question!!.inputString = binding.editTime.text.toString().trim()
             question!!.reviewAnswer = binding.editTime.text.toString().trim()
             question!!.correct = ""
-            dao?.update(question!!)
+            questionsDao?.update(question!!)
         }
     }
 

moca/src/main/java/com/yingyangfly/moca/omputation/ComputationFragment.kt

@@ -155,8 +155,8 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            firstquestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            firstquestion = questionsDao?.getQuestion(questionId)
             if (firstquestion != null && firstquestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultOne.post {
                     if (stringBufferOne.toString().isEmpty().not()) {
@@ -168,7 +168,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 }
             }
             val secondQuestionId = questionId + 1
-            secondQuestion = dao?.getQuestion(secondQuestionId)
+            secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null && secondQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultTwo.post {
                     if (stringBufferTwo.toString().isEmpty().not()) {
@@ -180,7 +180,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 }
             }
             val thirdQuestionId = questionId + 2
-            thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null && thirdQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultThree.post {
                     if (stringBufferThree.toString().isEmpty().not()) {
@@ -192,7 +192,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 }
             }
             val fourthQuestionId = questionId + 3
-            fourthQuestion = dao?.getQuestion(fourthQuestionId)
+            fourthQuestion = questionsDao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null && fourthQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultFour.post {
                     if (stringBufferFour.toString().isEmpty().not()) {
@@ -204,7 +204,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                 }
             }
             val fifthQuestionId = questionId + 4
-            fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null && fifthQuestion!!.inputString.isNullOrEmpty().not()) {
                 binding.editResultFive.post {
                     if (stringBufferFive.toString().isEmpty().not()) {
@@ -222,7 +222,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
      * 非空判断
      */
     private fun judge(): Boolean {
-        if (dao != null) {
+        if (questionsDao != null) {
             if (binding.editResultOne.text.toString().trim().isEmpty()) {
                 "请输入第一道题目的答案".toast()
                 return false
@@ -232,7 +232,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     firstquestion!!.reviewId = firstquestion!!.id
                     firstquestion!!.reviewAnswer = binding.editResultOne.text.toString().trim()
                     firstquestion!!.correct = ""
-                    dao?.update(firstquestion!!)
+                    questionsDao?.update(firstquestion!!)
                 }
             }
             if (binding.editResultTwo.text.toString().trim().isEmpty()) {
@@ -244,7 +244,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     secondQuestion!!.reviewId = secondQuestion!!.id
                     secondQuestion!!.reviewAnswer = binding.editResultTwo.text.toString().trim()
                     secondQuestion!!.correct = ""
-                    dao?.update(secondQuestion!!)
+                    questionsDao?.update(secondQuestion!!)
                 }
             }
             if (binding.editResultThree.text.toString().trim().isEmpty()) {
@@ -256,7 +256,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     thirdQuestion!!.reviewId = thirdQuestion!!.id
                     thirdQuestion!!.reviewAnswer = binding.editResultThree.text.toString().trim()
                     thirdQuestion!!.correct = ""
-                    dao?.update(thirdQuestion!!)
+                    questionsDao?.update(thirdQuestion!!)
                 }
             }
             if (binding.editResultFour.text.toString().trim().isEmpty()) {
@@ -268,7 +268,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     fourthQuestion!!.reviewId = fourthQuestion!!.id
                     fourthQuestion!!.reviewAnswer = binding.editResultFour.text.toString().trim()
                     fourthQuestion!!.correct = ""
-                    dao?.update(fourthQuestion!!)
+                    questionsDao?.update(fourthQuestion!!)
                 }
             }
             if (binding.editResultFive.text.toString().trim().isEmpty()) {
@@ -280,7 +280,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     fifthQuestion!!.reviewId = fifthQuestion!!.id
                     fifthQuestion!!.reviewAnswer = binding.editResultFive.text.toString().trim()
                     fifthQuestion!!.correct = ""
-                    dao?.update(fifthQuestion!!)
+                    questionsDao?.update(fifthQuestion!!)
                 }
             }
         }
@@ -388,14 +388,14 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
      * 保存数据
      */
     private fun save() {
-        if (dao != null) {
+        if (questionsDao != null) {
             if (questionOne) {
                 if (firstquestion != null) {
                     firstquestion!!.inputString = binding.editResultOne.toString().trim()
                     firstquestion!!.reviewId = firstquestion!!.id
                     firstquestion!!.reviewAnswer = binding.editResultOne.toString().trim()
                     firstquestion!!.correct = ""
-                    dao?.update(firstquestion!!)
+                    questionsDao?.update(firstquestion!!)
                 }
             }
             if (questionTwo) {
@@ -404,7 +404,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     secondQuestion!!.reviewId = secondQuestion!!.id
                     secondQuestion!!.reviewAnswer = binding.editResultTwo.toString().trim()
                     secondQuestion!!.correct = ""
-                    dao?.update(secondQuestion!!)
+                    questionsDao?.update(secondQuestion!!)
                 }
             }
             if (questionThree) {
@@ -413,7 +413,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     thirdQuestion!!.reviewId = thirdQuestion!!.id
                     thirdQuestion!!.reviewAnswer = binding.editResultThree.toString().trim()
                     thirdQuestion!!.correct = ""
-                    dao?.update(thirdQuestion!!)
+                    questionsDao?.update(thirdQuestion!!)
                 }
             }
             if (questionFour) {
@@ -422,7 +422,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     fourthQuestion!!.reviewId = fourthQuestion!!.id
                     fourthQuestion!!.reviewAnswer = binding.editResultFour.toString().trim()
                     fourthQuestion!!.correct = ""
-                    dao?.update(fourthQuestion!!)
+                    questionsDao?.update(fourthQuestion!!)
                 }
             }
             if (questionFive) {
@@ -431,7 +431,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
                     fifthQuestion!!.reviewId = fifthQuestion!!.id
                     fifthQuestion!!.reviewAnswer = binding.editResultFive.toString().trim()
                     fifthQuestion!!.correct = ""
-                    dao?.update(fifthQuestion!!)
+                    questionsDao?.update(fifthQuestion!!)
                 }
             }
 

moca/src/main/java/com/yingyangfly/moca/record/ListenRecordFragment.kt

@@ -64,28 +64,28 @@ class ListenRecordFragment : BaseFragment<FragmentListenRecordBinding>(),
             "下面将再给您听一遍刚才的几个词，请您仔细听并努力记住这些词，等一下要问您，请听题"
         }
         words.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 words.add(firstQuestion.reviewItem)
             }
             val secondQuestionId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null) {
                 words.add(secondQuestion.reviewItem)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 words.add(thirdQuestion.reviewItem)
             }
             val fourthQuestionnId = questionId + 3
-            val fourthQuestion = dao?.getQuestion(fourthQuestionnId)
+            val fourthQuestion = questionsDao?.getQuestion(fourthQuestionnId)
             if (fourthQuestion != null) {
                 words.add(fourthQuestion.reviewItem)
             }
             val fifthQuestionId = questionId + 4
-            val fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            val fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null) {
                 words.add(fifthQuestion.reviewItem)
             }

moca/src/main/java/com/yingyangfly/moca/record/RecordResultFragment.kt

@@ -37,8 +37,8 @@ class RecordResultFragment : BaseFragment<FragmentRecordResultBinding>(),
         binding {
             rvChoice.adapter = adapter
             adapter.onNumClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -71,29 +71,29 @@ class RecordResultFragment : BaseFragment<FragmentRecordResultBinding>(),
             "请您说出刚才听到的词"
         }
         choiceItemList.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 choiceItemList.add(firstQuestion)
             }
             val secondQuestionId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }
             val fourthQuestionId = questionId + 3
-            val fourthQuestion = dao?.getQuestion(fourthQuestionId)
+            val fourthQuestion = questionsDao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null) {
                 choiceItemList.add(fourthQuestion)
             }
 
             val fifthQuestionId = questionId + 4
-            val fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            val fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null) {
                 choiceItemList.add(fifthQuestion)
             }

moca/src/main/java/com/yingyangfly/moca/signature/DesignsChoiceFragment.kt

@@ -46,8 +46,8 @@ class DesignsChoiceFragment : BaseFragment<FragmentDesignsChoiceBinding>(),
             rvChoice.layoutManager = LinearLayoutManager(mContext)
             rvChoice.adapter = adapter
             adapter.onNumClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -78,8 +78,8 @@ class DesignsChoiceFragment : BaseFragment<FragmentDesignsChoiceBinding>(),
                 it.reviewId = it.id
                 it.score = "0"
                 it.correct = "0"
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         } else {
@@ -87,8 +87,8 @@ class DesignsChoiceFragment : BaseFragment<FragmentDesignsChoiceBinding>(),
                 it.reviewId = it.id
                 it.score = it.reviewScore
                 it.correct = "1"
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -112,29 +112,29 @@ class DesignsChoiceFragment : BaseFragment<FragmentDesignsChoiceBinding>(),
             ImageUtil.loadUrl(mContext, drawable, binding.designsImage)
         }
         choiceItemList.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 choiceItemList.add(firstQuestion)
             }
             val secondQuestionId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }
             val fourthQuestionId = questionId + 3
-            val fourthQuestion = dao?.getQuestion(fourthQuestionId)
+            val fourthQuestion = questionsDao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null) {
                 choiceItemList.add(fourthQuestion)
             }
 
             val fifthQuestionId = questionId + 4
-            val fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            val fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null) {
                 choiceItemList.add(fifthQuestion)
             }

moca/src/main/java/com/yingyangfly/moca/signature/SignatureFragment.kt

@@ -56,8 +56,8 @@ class SignatureFragment : BaseFragment<FragmentSignatureBinding>(),
      * 加载数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding {
                     data = question

moca/src/main/java/com/yingyangfly/moca/singlechoice/SingleChoiceFragment.kt

@@ -40,8 +40,8 @@ class SingleChoiceFragment : BaseFragment<FragmentSingleChoiceBinding>(),
         binding {
             rvChoice.adapter = adapter
             adapter.onCheckClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -69,8 +69,8 @@ class SingleChoiceFragment : BaseFragment<FragmentSingleChoiceBinding>(),
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 choiceItemList.add(question!!)
             }

moca/src/main/java/com/yingyangfly/moca/tips/TipsFragment.kt

@@ -37,8 +37,8 @@ class TipsFragment : BaseFragment<FragmentTipsBinding>(),
         binding {
             rvChoice.adapter = adapter
             adapter.onCheckClickListener = {
-                if (dao != null) {
-                    dao?.update(it)
+                if (questionsDao != null) {
+                    questionsDao?.update(it)
                 }
             }
         }
@@ -66,29 +66,29 @@ class TipsFragment : BaseFragment<FragmentTipsBinding>(),
      */
     private fun loadData() {
         choiceItemList.clear()
-        if (dao != null) {
-            val firstQuestion = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            val firstQuestion = questionsDao?.getQuestion(questionId)
             if (firstQuestion != null) {
                 choiceItemList.add(firstQuestion)
             }
             val secondQuestionId = questionId + 1
-            val secondQuestion = dao?.getQuestion(secondQuestionId)
+            val secondQuestion = questionsDao?.getQuestion(secondQuestionId)
             if (secondQuestion != null) {
                 choiceItemList.add(secondQuestion)
             }
             val thirdQuestionId = questionId + 2
-            val thirdQuestion = dao?.getQuestion(thirdQuestionId)
+            val thirdQuestion = questionsDao?.getQuestion(thirdQuestionId)
             if (thirdQuestion != null) {
                 choiceItemList.add(thirdQuestion)
             }
             val fourthQuestionId = questionId + 3
-            val fourthQuestion = dao?.getQuestion(fourthQuestionId)
+            val fourthQuestion = questionsDao?.getQuestion(fourthQuestionId)
             if (fourthQuestion != null) {
                 choiceItemList.add(fourthQuestion)
             }
 
             val fifthQuestionId = questionId + 4
-            val fifthQuestion = dao?.getQuestion(fifthQuestionId)
+            val fifthQuestion = questionsDao?.getQuestion(fifthQuestionId)
             if (fifthQuestion != null) {
                 choiceItemList.add(fifthQuestion)
             }

moca/src/main/java/com/yingyangfly/moca/week/WeekFragment.kt

@@ -44,12 +44,12 @@ class WeekFragment : BaseFragment<FragmentWeekBinding>(),
             rvSelectedItem.layoutManager = flexboxLayoutManager
             rvSelectedItem.adapter = selectedAdapter
             selectedAdapter.onSelectedItemClickListener = { bean ->
-                if (question != null && dao != null) {
+                if (question != null && questionsDao != null) {
                     question!!.inputString = bean
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = getWeekInfo(bean)
                     question!!.correct = ""
-                    dao?.update(question!!)
+                    questionsDao?.update(question!!)
                 }
             }
         }
@@ -76,8 +76,8 @@ class WeekFragment : BaseFragment<FragmentWeekBinding>(),
      * 获取题目数据
      */
     private fun loadData() {
-        if (dao != null) {
-            question = dao?.getQuestion(questionId)
+        if (questionsDao != null) {
+            question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding.data = question
                 selectedAdapter.selectedData = question!!.inputString