aa

ncse/src/main/java/com/yingyangfly/ncse/fragment/PictureRecognitionJudgmentFragment.kt

@@ -13,6 +13,7 @@ import com.yingyangfly.baselib.base.BaseFragment
 import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.utils.ImageUtil
 import com.yingyangfly.ncse.R
 import com.yingyangfly.ncse.databinding.FragmentPictureRecognitionJudgmentBinding
@@ -76,7 +77,9 @@ class PictureRecognitionJudgmentFragment : BaseFragment<FragmentPictureRecogniti
                 if (v.id == R.id.btnPrevious) {
                     previousPage(v)
                 } else if (v.id == R.id.btnNext) {
-                    nextPage(v)
+                    if (judge()){
+                        nextPage(v)
+                    }
                 }
             }
             MotionEvent.ACTION_CANCEL ->{
@@ -112,18 +115,30 @@ class PictureRecognitionJudgmentFragment : BaseFragment<FragmentPictureRecogniti
         }
     }
 
+    /**
+     * 非空判断
+     */
+    private fun judge(): Boolean {
+        if (question != null) {
+            if (question!!.correct.isNullOrEmpty()) {
+                "请判断受试者的回答是否正确".toast()
+                return false
+            }
+        }
+        return true
+    }
+
     /**
      * 上一页
      */
     private fun previousPage(v: View) {
-        if(questionId == 128) {
-            val controller = Navigation.findNavController(v)
-            val bundle = bundleOf("questionId" to 128)
-            controller.navigate(
-                R.id.action_pictureRecognitionJudgmentFragment_to_structureOrganizationFragment,
-                bundle
-            )
-        }
+        val controller = Navigation.findNavController(v)
+        val bundle = bundleOf("questionId" to questionId)
+        controller.navigate(
+            R.id.action_pictureRecognitionJudgmentFragment_to_structureOrganizationFragment,
+            bundle
+        )
+
     }
 
     /**

ncse/src/main/java/com/yingyangfly/ncse/fragment/StructureOrganizationFragment.kt

@@ -7,6 +7,7 @@ import android.os.Handler
 import android.os.Looper
 import android.view.MotionEvent
 import android.view.View
+import androidx.appcompat.widget.AppCompatButton
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import com.yingyangfly.baselib.base.BaseFragment
@@ -52,6 +53,16 @@ class StructureOrganizationFragment : BaseFragment<FragmentStructureOrganization
     override fun onResume() {
         super.onResume()
         loadData()
+        if(questionId == 128){
+            binding.tvObservationTheSec.setVisibility(View.VISIBLE);
+        }else {
+
+            binding{
+                tvObservationTheSec.setVisibility(View.GONE);
+                tvImmediateObservation.visibility = View.GONE;
+            }
+
+        }
     }
 
     private fun showImage() {
@@ -81,7 +92,9 @@ class StructureOrganizationFragment : BaseFragment<FragmentStructureOrganization
             question = questionsDao?.getQuestion(questionId)
             if (question != null) {
                 binding {
-                    question?.reviewDesc = ""
+                    if (questionId == 128){
+                        question?.reviewDesc = ""
+                    }
                     data = question
                 }
             }
@@ -137,6 +150,14 @@ class StructureOrganizationFragment : BaseFragment<FragmentStructureOrganization
                 bundle
             )
         }
+        if (questionId == 129) {
+            val controller = Navigation.findNavController(v)
+            val bundle = bundleOf("questionId" to 128)
+            controller.navigate(
+                R.id.action_structureOrganizationFragment_to_pictureRecognitionJudgmentFragment,
+                bundle
+            )
+        }
     }
 
     /**
@@ -144,7 +165,7 @@ class StructureOrganizationFragment : BaseFragment<FragmentStructureOrganization
      */
     private fun nextPage(v: View) {
         val bundle = Bundle()
-        bundle.putInt("questionId", 128)
+        bundle.putInt("questionId", questionId)
         val bitmap: Bitmap = binding.signatureView.getCachebBitmaps()
         bundle.putParcelable("bitmap", bitmap)
         val controller = Navigation.findNavController(v)