1.优化测评模块代码

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryActivity.kt

@@ -57,7 +57,7 @@ class EvaluationHistoryActivity :
     }
 
     override fun initData() {
-        getUserInfo()
+
     }
 
     override fun onResume() {
@@ -120,19 +120,6 @@ class EvaluationHistoryActivity :
         return true
     }
 
-    /**
-     * 获取个人中心信息接口
-     */
-    private fun getUserInfo() {
-        viewModel.getUserInfo(fail = {
-            it.toast()
-        }, success = {
-            if (it != null) {
-                binding.data = it
-            }
-        })
-    }
-
     /**
      * 结束刷新
      */

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryViewModel.kt

@@ -1,6 +1,5 @@
 package com.yingyangfly.home.evaluation
 
-import com.yingyangfly.baselib.bean.UserInfoBean
 import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
@@ -32,17 +31,4 @@ class EvaluationHistoryViewModel : BaseViewModel() {
         success,
         fail
     )
-
-    /**
-     * 获取个人中心信息接口
-     */
-    fun getUserInfo(
-        fail: ((msg: String) -> Unit)? = null,
-        success: ((success: UserInfoBean?) -> Unit)? = null,
-    ) = launchFlow(true) {
-        HOME_API.getUserInfo()
-    }.runUI(
-        success,
-        fail
-    )
 }

home/src/main/res/layout/activity_evaluation_history.xml

@@ -6,9 +6,7 @@
 
     <data>
 
-        <variable
-            name="data"
-            type="com.yingyangfly.baselib.bean.UserInfoBean" />
+        <import type="com.yingyangfly.baselib.utils.User" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -63,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_38px"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"姓名："+data.name}'
+                    android:text='@{"姓名："+User.INSTANCE.name}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -78,7 +76,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"性别："+data.getSex()}'
+                    android:text='@{"性别："+User.INSTANCE.userSex}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -93,7 +91,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"年龄："+data.getAgeInfo()}'
+                    android:text='@{"年龄："+User.INSTANCE.userAge}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -109,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
                     android:layout_marginEnd="@dimen/divider_37px"
-                    android:text='@{"编号："+data.id}'
+                    android:text='@{"编号："+User.INSTANCE.userId}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"

home/src/main/res/layout/activity_review_result_detail.xml

@@ -6,9 +6,7 @@
 
     <data>
 
-        <variable
-            name="data"
-            type="com.yingyangfly.baselib.bean.UserInfoBean" />
+        <import type="com.yingyangfly.baselib.utils.User" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -63,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_38px"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"姓名："+data.name}'
+                    android:text='@{"姓名："+User.INSTANCE.name}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -78,7 +76,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"性别："+data.getSex()}'
+                    android:text='@{"性别："+User.INSTANCE.userSex}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -93,7 +91,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"年龄："+data.getAgeInfo()}'
+                    android:text='@{"年龄："+User.INSTANCE.userAge}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -109,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
                     android:layout_marginEnd="@dimen/divider_37px"
-                    android:text='@{"编号："+data.id}'
+                    android:text='@{"编号："+User.INSTANCE.userId}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"