1.专业测评添加非空判断

moca/src/main/java/com/yingyangfly/moca/adapter/NumberAdapter.kt

@@ -1,6 +1,7 @@
 package com.yingyangfly.moca.adapter
 
 import android.text.TextUtils
+import android.view.View
 import com.yingyang.moca.R
 import com.yingyang.moca.databinding.ItemMocaNumberBinding
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
@@ -13,7 +14,7 @@ import com.yingyangfly.baselib.ext.setTextColorResource
 class NumberAdapter(override val layoutId: Int = R.layout.item_moca_number) :
     BaseDataBindingAdapter<String, ItemMocaNumberBinding>() {
 
-    var onNumClickListener: ((bean: String, type: String) -> Unit)? = null
+    var onNumClickListener: ((view: View, bean: String, type: String) -> Unit)? = null
 
     override fun onBindViewHolder(binding: ItemMocaNumberBinding, item: String, position: Int) {
         binding.data = item
@@ -24,13 +25,13 @@ class NumberAdapter(override val layoutId: Int = R.layout.item_moca_number) :
         } else {
             binding.tvNumber.setTextColorResource(R.color.color_FF222222)
         }
-        binding.numberLayout.setOnSingleClickListener {
+        binding.numberLayout.setOnClickListener { v ->
             if (TextUtils.equals("删除", item)) {
-                onNumClickListener?.invoke("", "1")
+                onNumClickListener?.invoke(v, "", "1")
             } else if (TextUtils.equals("确定", item)) {
-                onNumClickListener?.invoke("", "2")
+                onNumClickListener?.invoke(v, "", "2")
             } else {
-                onNumClickListener?.invoke(item, "0")
+                onNumClickListener?.invoke(v, item, "0")
             }
         }
     }

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

@@ -20,7 +20,7 @@ class MemorizeResultFragment : BaseFragment<FragmentMemorizeResultBinding>(),
     /**
      * 问题id
      */
-    var questionId = 0
+    private var questionId = 0
     private val choiceItemList = mutableListOf<QuestionsBean>()
     private val adapter by lazy { ChoiceAdapter() }
 

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

@@ -41,7 +41,7 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
     override fun initViews() {
         binding.rvNum.layoutManager = GridLayoutManager(mContext, 3)
         binding.rvNum.adapter = numberAdapter
-        numberAdapter.onNumClickListener = { bean, type ->
+        numberAdapter.onNumClickListener = { view, bean, type ->
             when (type) {
                 "0" -> {
                     append(bean)
@@ -50,7 +50,7 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
                     delect()
                 }
                 "2" -> {
-                    update()
+                    update(view)
                 }
             }
 
@@ -97,15 +97,18 @@ class NumberRecordsFragment : BaseFragment<FragmentNumberRecordsBinding>(),
     /**
      * 保存信息
      */
-    private fun update() {
+    private fun update(v: View) {
         binding.editTime.post {
-            if (questionsDao != null) {
+            if (binding.editTime.text.isNullOrEmpty()) {
+                toastIndo.toast()
+            } else {
                 if (question != null) {
                     question!!.inputString = binding.editTime.text.toString().trim()
                     question!!.reviewId = question!!.id
                     question!!.reviewAnswer = binding.editTime.text.toString().trim()
                     question!!.correct = ""
                     questionsDao?.update(question!!)
+                    nextPage(v)
                 }
             }
         }

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

@@ -73,7 +73,7 @@ class ComputationFragment : BaseFragment<FragmentComputationBinding>(), View.OnT
             rvInput.layoutManager = GridLayoutManager(mContext, 3)
             rvInput.adapter = adapter
             adapter.setData(numberList)
-            adapter.onNumClickListener = { bean: String, type: String ->
+            adapter.onNumClickListener = { view, bean: String, type: String ->
                 when (type) {
                     "0" -> {
                         append(bean)