瀏覽代碼

1.添加获取mmse试题库UI跳转

王鹏鹏 2 年之前
父節點
當前提交
2101cfde51

+ 2 - 1
.idea/misc.xml

@@ -24,7 +24,7 @@
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tips.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_base.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_dialog_base.xml" value="0.152" />
-        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_task.xml" value="0.152" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_task.xml" value="0.2" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/layout_center_toast.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/rv_empty.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendar/src/main/res/layout/cbk_list_item_calendar.xml" value="0.23697916666666666" />
@@ -98,6 +98,7 @@
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_questions.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/activity_signature.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_close_eyes.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_count.xml" value="0.44960474308300397" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_draw_designs.xml" value="0.38461538461538464" />
         <entry key="..\:/workspace/hcp-pad/mmse/src/main/res/layout/fragment_input.xml" value="0.23697916666666666" />

+ 53 - 0
mmse/src/main/java/com/yingyangfly/mmse/dialog/CloseEyesFragment.kt

@@ -0,0 +1,53 @@
+package com.yingyangfly.mmse.dialog
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.DialogFragment
+import com.gyf.immersionbar.BarHide
+import com.gyf.immersionbar.ktx.immersionBar
+import com.yingyang.mmse.R
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.utils.ViewTool
+
+/**
+ * 闭眼
+ */
+class CloseEyesFragment : DialogFragment() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        isCancelable = true
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        dialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        immersionBar {
+            hideBar(BarHide.FLAG_HIDE_BAR)
+            navigationBarColor(R.color.transparent)
+        }
+        val rootView = ViewTool.inflateFragmentPixels(
+            activity, R.layout.fragment_close_eyes, container, 1194, 834
+        )
+        val eyesLayout = rootView.findViewById<ConstraintLayout>(R.id.eyesLayout)
+        eyesLayout.setOnSingleClickListener {
+            dismiss()
+        }
+        return rootView
+    }
+}

+ 2 - 1
mmse/src/main/java/com/yingyangfly/mmse/fragment/JudgmentRecordFragment.kt

@@ -31,7 +31,8 @@ class JudgmentRecordFragment : BaseFragment<FragmentJudgmentRecordBinding>() {
     }
 
     override fun initViews() {
-
+        playVoice = PlayVoice()
+        playVoice?.setContext(mContext)
     }
 
     override fun initListener() {

+ 0 - 3
mmse/src/main/java/com/yingyangfly/mmse/fragment/MultipleChoiceFragment.kt

@@ -1,7 +1,6 @@
 package com.yingyangfly.mmse.fragment
 
 import android.os.Bundle
-import android.util.Log
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import com.yingyang.mmse.R
@@ -35,7 +34,6 @@ class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>() {
             rvChoice.adapter = adapter
             adapter.onNumClickListener = { bean ->
                 if (dao != null) {
-                    Log.e("wpp", bean.reviewItem + "------------------>" + bean.inputString)
                     dao?.update(bean)
                 }
             }
@@ -87,7 +85,6 @@ class MultipleChoiceFragment : BaseFragment<FragmentMultipleChoiceBinding>() {
 
     override fun onResume() {
         super.onResume()
-        Log.e("wpp", "===================")
         loadData()
     }
 

+ 60 - 3
mmse/src/main/java/com/yingyangfly/mmse/fragment/ReadFragment.kt

@@ -1,29 +1,70 @@
 package com.yingyangfly.mmse.fragment
 
+import android.os.Bundle
+import android.text.TextUtils
 import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentReadBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.mmse.dialog.CloseEyesFragment
 
 /**
- * 重复
+ * 看字做动作
  */
 class ReadFragment : BaseFragment<FragmentReadBinding>() {
+
+    /**
+     * 问题id
+     */
+    var questionId = 0
+    var question: QuestionsBean? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 25
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
 
     }
 
     override fun initListener() {
         binding {
+            soundImage.setOnSingleClickListener {
+                val closeEyesFragment = CloseEyesFragment()
+                closeEyesFragment.show(childFragmentManager, "closeEyesFragment")
+            }
+
             btnPrevious.setOnSingleClickListener {
                 val controller = Navigation.findNavController(it)
                 controller.navigate(R.id.action_readFragment_to_judgmentRecordFragment)
             }
 
             btnNext.setOnSingleClickListener {
-                val controller = Navigation.findNavController(it)
-                controller.navigate(R.id.action_readFragment_to_recordActionFragment)
+                if (question!!.inputString.isNullOrEmpty()) {
+                    val str = "请判断受试者的回答是否正确"
+                    str.toast()
+                } else {
+                    val controller = Navigation.findNavController(it)
+                    controller.navigate(R.id.action_readFragment_to_recordActionFragment)
+                }
+            }
+
+            judgeRadio.setOnCheckedChangeListener { group, checkedId ->
+                if (checkedId == R.id.btnDeny) {
+                    if (question != null && dao != null) {
+                        question!!.inputString = "否"
+                        dao?.update(question!!)
+                    }
+                } else if (checkedId == R.id.btnCorrect) {
+                    if (question != null && dao != null) {
+                        question!!.inputString = "是"
+                        dao?.update(question!!)
+                    }
+                }
             }
         }
     }
@@ -31,4 +72,20 @@ class ReadFragment : BaseFragment<FragmentReadBinding>() {
     override fun initData() {
 
     }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 获取题目数据
+     */
+    private fun loadData() {
+        if (dao != null) {
+            question = dao?.getQuestion(questionId)
+            binding.btnDeny.isChecked = TextUtils.equals("否", question!!.inputString)
+            binding.btnCorrect.isChecked = TextUtils.equals("是", question!!.inputString)
+        }
+    }
 }

+ 14 - 0
mmse/src/main/java/com/yingyangfly/mmse/fragment/RecordActionFragment.kt

@@ -1,16 +1,30 @@
 package com.yingyangfly.mmse.fragment
 
+import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.navigation.Navigation
 import com.yingyang.mmse.R
 import com.yingyang.mmse.databinding.FragmentRecordActionBinding
 import com.yingyangfly.baselib.base.BaseFragment
+import com.yingyangfly.baselib.db.QuestionsBean
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 
 /**
  * 听录音做动作
  */
 class RecordActionFragment : BaseFragment<FragmentRecordActionBinding>() {
+
+    /**
+     * 问题id
+     */
+    var questionId = 0
+    var question: QuestionsBean? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        questionId = arguments?.getInt("questionId") ?: 25
+        super.onCreate(savedInstanceState)
+    }
+
     override fun initViews() {
 
     }

+ 35 - 0
mmse/src/main/res/layout/fragment_close_eyes.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/eyesLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="@dimen/divider_120px"
+        android:background="@color/color_FF222222"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_120px"
+            android:textStyle="bold"
+            android:text="@string/close_the_eyes"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 0
mmse/src/main/res/values/colors.xml

@@ -8,4 +8,5 @@
     <color name="color_FFF6F4F4" tools:ignore="ResourceName">#FFF6F4F4</color>
     <color name="color_FFCF0404" tools:ignore="ResourceName">#FFCF0404</color>
     <color name="color_FFFFFFFF" tools:ignore="ResourceName">#FFFFFFFF</color>
+    <color name="transparent" tools:ignore="ResourceName">#00000000</color><!-- 透明   -->
 </resources>

+ 1 - 0
mmse/src/main/res/values/strings.xml

@@ -21,4 +21,5 @@
     <string name="erase" tools:ignore="ResourceName">擦除</string>
     <string name="subjects_can_also_draw_pictures_on_paper" tools:ignore="ResourceName">受试者也可在纸上画图</string>
     <string name="do_you_remember_three_words_you_just_remembered_please_say_again" tools:ignore="ResourceName">还记得刚才让您记住的三个词吗?请您再说一遍</string>
+    <string name="close_the_eyes" tools:ignore="ResourceName">闭上眼睛</string>
 </resources>