Pārlūkot izejas kodu

1.优化测评模块代码

王鹏鹏 1 gadu atpakaļ
vecāks
revīzija
611fbbe949

+ 12 - 0
home/src/main/java/com/yingyangfly/home/evaluation/ReviewResultDetailActivity.kt

@@ -42,6 +42,18 @@ class ReviewResultDetailActivity :
 
     }
 
+    override fun onResume() {
+        super.onResume()
+        loadData()
+    }
+
+    /**
+     * 获取测评报告详情
+     */
+    private fun loadData() {
+
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {

+ 66 - 6
home/src/main/res/layout/activity_review_result_detail.xml

@@ -117,19 +117,79 @@
                     app:layout_constraintStart_toEndOf="@+id/tvAge"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvResult"
+                <LinearLayout
+                    android:id="@+id/tvTitleTag"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="@dimen/divider_38px"
+                    android:layout_height="@dimen/divider_71px"
+                    android:layout_marginStart="@dimen/divider_34px"
                     android:layout_marginTop="@dimen/divider_23px"
                     android:layout_marginEnd="@dimen/divider_37px"
+                    android:background="@drawable/bg_top_results"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvNumber">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/dimension"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/subdimensional"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/score"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="@string/score_range"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_24px"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="@dimen/divider_34px"
+                    android:layout_marginEnd="@dimen/divider_37px"
                     android:layout_marginBottom="@dimen/divider_36px"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    android:background="@drawable/bg_results_content"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvName" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvTitleTag">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvResult"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+                </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.card.MaterialCardView>
 

+ 3 - 0
home/src/main/res/values/strings.xml

@@ -59,4 +59,7 @@
     <string name="evaluation_report" tools:ignore="ResourceName">测评报告</string>
     <string name="start_training_info" tools:ignore="ResourceName">欢迎使用未来海豚认知训练平台平台为您提供针对脑认知的各种类型的训练,您也可以根据您的训练数据优化训练方向。</string>
     <string name="evaluate_result" tools:ignore="ResourceName">结果</string>
+    <string name="dimension" tools:ignore="ResourceName">维度</string>
+    <string name="subdimensional" tools:ignore="ResourceName">子维度</string>
+    <string name="score_range" tools:ignore="ResourceName">得分范围</string>
 </resources>