Browse Source

1.优化代码

王鹏鹏 2 years ago
parent
commit
8a6444823a

+ 0 - 2
baselib/src/main/java/com/yingyangfly/baselib/BaseApplication.kt

@@ -12,7 +12,6 @@ import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
 import com.tencent.bugly.crashreport.CrashReport
 import com.yingyangfly.baselib.config.AccountConfig
-import com.yingyangfly.baselib.utils.DensityUtils
 import com.yingyangfly.baselib.utils.LogUtil
 import com.yingyangfly.baselib.webview.base.WebViewInitTask
 import java.lang.reflect.Field
@@ -67,7 +66,6 @@ open class BaseApplication : Application() {
             moduleApps.forEach {
                 it.onCreate()
             }
-            DensityUtils.setDensity(this)
             // 初始化路由
             initRouter()
             //初始化bugly

+ 6 - 0
home/src/main/java/com/yingyangfly/home/adapter/EvaluationHistoryAdapter.kt

@@ -21,6 +21,12 @@ class EvaluationHistoryAdapter(override val layoutId: Int = R.layout.item_evalua
         position: Int
     ) {
         binding.data = item
+        binding.tvResult.text =
+            if (item.result != null && TextUtils.isEmpty(item.result.result).not()) {
+                item.result.result
+            } else {
+                ""
+            }
         if (position % 2 == 0) {
             binding.evaluationLayout.setBackgroundResource(R.drawable.bg_evaluation_result)
         } else {

+ 9 - 1
home/src/main/java/com/yingyangfly/home/entity/ReviewTaskListBean.kt

@@ -28,5 +28,13 @@ data class Records(
     val type: String,
     val updateBy: String,
     val updateTime: String,
-    val userId: String
+    val userId: String,
+    val result: Result
+)
+
+data class Result(
+    val result: String,
+    val reviewScore: String,
+    val reviewContent: String,
+    val referenceValue: String
 )

+ 10 - 0
home/src/main/res/layout/activity_evaluation_history.xml

@@ -162,6 +162,16 @@
                         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/evaluate_result"
+                        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"

+ 10 - 0
home/src/main/res/layout/item_evaluation_history.xml

@@ -46,6 +46,16 @@
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tvResult"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textColor="@color/color_FF4A76FF"
+            android:textSize="@dimen/divider_24px"
+            android:textStyle="bold" />
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvDetails"
             android:layout_width="0dp"

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

@@ -58,4 +58,5 @@
     <string name="start_training" tools:ignore="ResourceName">开始训练</string>
     <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>
 </resources>