1.优化代码

.idea/misc.xml

@@ -590,7 +590,7 @@
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_choice.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/mmse/src/main/res/layout/item_number.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/drawable/selector_text_choice.xml" value="0.151" />
-        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_alternating_connection.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_alternating_connection.xml" value="0.49146341463414633" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_identify_picture.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_listen_record.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/moca/src/main/res/layout/fragment_memorize_result.xml" value="0.536" />

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

@@ -45,7 +45,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
         binding {
             btnPrevious.setOnTouchListener(this@AlternatingConnectionFragment)
             btnNext.setOnTouchListener(this@AlternatingConnectionFragment)
-            tvFirst.setOnCheckedChangeListener { _, isChecked ->
+            tvFirstes.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("甲")
                     tvFirst.isEnabled = false
@@ -69,7 +69,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvOne.setOnCheckedChangeListener { _, isChecked ->
+            tvOnees.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("1")
                     tvOne.isEnabled = false
@@ -93,7 +93,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvSeconds.setOnCheckedChangeListener { _, isChecked ->
+            tvSecondses.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("乙")
                     tvSeconds.isEnabled = false
@@ -116,7 +116,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                     }
                 }
             }
-            tvTwo.setOnCheckedChangeListener { _, isChecked ->
+            tvTwoes.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("2")
                     tvTwo.isEnabled = false
@@ -140,7 +140,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvThird.setOnCheckedChangeListener { _, isChecked ->
+            tvThirdes.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("丙")
                     tvThird.isEnabled = false
@@ -164,7 +164,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvThree.setOnCheckedChangeListener { _, isChecked ->
+            tvThreees.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("3")
                     tvThree.isEnabled = false
@@ -188,7 +188,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvFourth.setOnCheckedChangeListener { _, isChecked ->
+            tvFourthes.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("丁")
                     tvFourth.isEnabled = false
@@ -212,7 +212,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvFour.setOnCheckedChangeListener { _, isChecked ->
+            tvFoures.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("4")
                     tvFour.isEnabled = false
@@ -236,7 +236,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvFifth.setOnCheckedChangeListener { _, isChecked ->
+            tvFifthes.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("戊")
                     tvFifth.isEnabled = false
@@ -260,7 +260,7 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
                 }
             }
 
-            tvFive.setOnCheckedChangeListener { _, isChecked ->
+            tvFivees.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
                     stringBuffer.append("5")
                     tvFive.isEnabled = false
@@ -338,27 +338,27 @@ class AlternatingConnectionFragment : BaseFragment<FragmentAlternatingConnection
         firstChecked = true
         binding {
             signatureView.clearData()
-            tvFirst.isEnabled = true
-            tvSeconds.isEnabled = true
-            tvThird.isEnabled = true
-            tvFourth.isEnabled = true
-            tvFifth.isEnabled = true
-            tvOne.isEnabled = true
-            tvTwo.isEnabled = true
-            tvThree.isEnabled = true
-            tvFour.isEnabled = true
-            tvFive.isEnabled = true
-            tvFirst.isChecked = false
-            tvSeconds.isChecked = false
-            tvThird.isChecked = false
-            tvFourth.isChecked = false
-            tvFifth.isChecked = false
-            tvOne.isChecked = false
-            tvTwo.isChecked = false
-            tvThree.isChecked = false
-            tvThird.isChecked = false
-            tvFour.isChecked = false
-            tvFive.isChecked = false
+            tvFirstes.isEnabled = true
+            tvSecondses.isEnabled = true
+            tvThirdes.isEnabled = true
+            tvFourthes.isEnabled = true
+            tvFifthes.isEnabled = true
+            tvOnees.isEnabled = true
+            tvTwoes.isEnabled = true
+            tvThreees.isEnabled = true
+            tvFoures.isEnabled = true
+            tvFivees.isEnabled = true
+            tvFirstes.isChecked = false
+            tvSecondses.isChecked = false
+            tvThirdes.isChecked = false
+            tvFourthes.isChecked = false
+            tvFifthes.isChecked = false
+            tvOnees.isChecked = false
+            tvTwoes.isChecked = false
+            tvThreees.isChecked = false
+            tvThirdes.isChecked = false
+            tvFoures.isChecked = false
+            tvFivees.isChecked = false
             if (stringBuffer.toString().isEmpty().not()) {
                 stringBuffer.delete(0, stringBuffer.toString().length)
             }

moca/src/main/res/layout/fragment_alternating_connection.xml

@@ -60,6 +60,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -76,6 +77,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvFirst" />
 
@@ -92,6 +94,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintEnd_toStartOf="@+id/tvTwo"
                     app:layout_constraintTop_toBottomOf="@+id/tvFirst" />
 
@@ -108,6 +111,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintEnd_toStartOf="@+id/tvSeconds"
                     app:layout_constraintTop_toBottomOf="@+id/tvFirst" />
 
@@ -124,6 +128,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -140,6 +145,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -156,6 +162,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tvFive" />
 
@@ -172,6 +179,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toEndOf="@+id/tvFourth"
                     app:layout_constraintTop_toBottomOf="@+id/tvOne" />
 
@@ -188,6 +196,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toEndOf="@+id/tvThird"
                     app:layout_constraintTop_toBottomOf="@+id/tvSeconds" />
 
@@ -204,11 +213,178 @@
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold"
+                    android:visibility="invisible"
                     app:layout_constraintStart_toEndOf="@+id/tvFourth"
                     app:layout_constraintTop_toBottomOf="@+id/tvFourth" />
 
             </com.yingyangfly.moca.widget.LinkLineView>
 
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvFirstes"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginTop="@dimen/divider_37px"
+                    android:layout_marginEnd="@dimen/divider_218px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/first"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvTwoes"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginTop="@dimen/divider_9px"
+                    android:layout_marginEnd="@dimen/divider_148px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/two"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFirstes" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvSecondses"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginTop="@dimen/divider_18px"
+                    android:layout_marginEnd="@dimen/divider_42px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/seconds"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/tvTwoes"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFirstes" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvOnees"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginTop="@dimen/divider_13px"
+                    android:layout_marginEnd="@dimen/divider_42px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/one"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/tvSecondses"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFirstes" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvFifthes"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_265px"
+                    android:layout_marginTop="@dimen/divider_45px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/fifth"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvFivees"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_179px"
+                    android:layout_marginTop="@dimen/divider_101px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/five"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvFourthes"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_148px"
+                    android:layout_marginTop="@dimen/divider_31px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/fourth"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFivees" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvThirdes"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_134px"
+                    android:layout_marginTop="@dimen/divider_45px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/third"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvFourthes"
+                    app:layout_constraintTop_toBottomOf="@+id/tvOnees" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvThreees"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_36px"
+                    android:layout_marginTop="@dimen/divider_52px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/three"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvThirdes"
+                    app:layout_constraintTop_toBottomOf="@+id/tvSecondses" />
+
+                <androidx.appcompat.widget.AppCompatCheckBox
+                    android:id="@+id/tvFoures"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_marginStart="@dimen/divider_48px"
+                    android:layout_marginTop="@dimen/divider_5px"
+                    android:background="@drawable/selector_text_choice"
+                    android:button="@null"
+                    android:gravity="center"
+                    android:text="@string/four"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@+id/tvFourthes"
+                    app:layout_constraintTop_toBottomOf="@+id/tvFourthes" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </com.google.android.material.card.MaterialCardView>
 
         <androidx.appcompat.widget.AppCompatButton