1.添加医生打分功能

.idea/misc.xml

@@ -111,6 +111,7 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_data_content.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_down_load_app.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_evaluation_result.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_evaluation_result_two.xml" value="0.161" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_fun_time.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_current_level.xml" value="0.2185" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/drawable/bg_game_total_level.xml" value="0.2185" />

baselib/src/main/java/com/yingyangfly/baselib/bean/UserInfoBean.kt

@@ -38,6 +38,8 @@ data class UserInfoBean(
     val updateBy: String,
     val updateTime: String,
     val username: String,
+    val gender: String,
+    val age: String,
     val firstLogin: String//是否第一次登陆 0需要弹框引导提示的
 ) {
     fun getUserNameInfo(): String {
@@ -95,4 +97,20 @@ data class UserInfoBean(
             orgName
         }
     }
+
+    fun getSex(): String {
+        return if (TextUtils.equals("0", gender)) {
+            "女"
+        } else {
+            "男"
+        }
+    }
+
+    fun getAgeInfo(): String {
+        return if (age.isNullOrEmpty()) {
+            return ""
+        } else {
+            age + "岁"
+        }
+    }
 }

home/src/main/java/com/yingyangfly/home/adapter/EvaluationHistoryAdapter.kt

@@ -4,6 +4,7 @@ import android.text.TextUtils
 import com.yingyang.home.R
 import com.yingyang.home.databinding.ItemEvaluationHistoryBinding
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.home.entity.Records
 
 /**
@@ -11,16 +12,27 @@ import com.yingyangfly.home.entity.Records
  */
 class EvaluationHistoryAdapter(override val layoutId: Int = R.layout.item_evaluation_history) :
     BaseDataBindingAdapter<Records, ItemEvaluationHistoryBinding>() {
+
+    var onClickListener: ((bean: Records) -> Unit)? = null
+
     override fun onBindViewHolder(
         binding: ItemEvaluationHistoryBinding,
         item: Records,
         position: Int
     ) {
         binding.data = item
+        if (position % 2 == 0) {
+            binding.evaluationLayout.setBackgroundResource(R.drawable.bg_evaluation_result)
+        } else {
+            binding.evaluationLayout.setBackgroundResource(R.color.transparent)
+        }
         binding.tvStatus.text = if (TextUtils.equals("0", item.status)) {
             "未评测"
         } else {
             "已评测"
         }
+        binding.tvDetails.setOnSingleClickListener {
+            onClickListener?.invoke(item)
+        }
     }
 }

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

@@ -11,6 +11,7 @@ import com.yingyangfly.baselib.ext.getScaleAnimation
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.home.adapter.EvaluationHistoryAdapter
 import com.yingyangfly.home.entity.Records
 
@@ -30,6 +31,13 @@ class EvaluationHistoryActivity :
         binding {
             rvResult.adapter = adapter
             adapter.setData(results)
+            adapter.onClickListener = {
+                JumpUtil.jumpActivityWithUrl(
+                    RouterUrlCommon.evaluationResult,
+                    it.reviewTaskId,
+                    mContext
+                )
+            }
         }
     }
 

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

@@ -63,7 +63,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_38px"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"姓名："+data.username}'
+                    android:text='@{"姓名："+data.name}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -78,7 +78,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"性别："+data.username}'
+                    android:text='@{"性别："+data.getSex()}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -93,7 +93,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text="@string/patient_age"
+                    android:text='@{"年龄："+data.getAgeInfo()}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -123,7 +123,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text="@string/patient_id"
+                    android:text='@{"编号："+data.id}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"

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

@@ -63,7 +63,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_38px"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text='@{"姓名："+data.username}'
+                    android:text='@{"姓名："+data.name}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -80,7 +80,7 @@
                     android:layout_marginTop="@dimen/divider_33px"
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
-                    android:text='@{"性别："+data.username}'
+                    android:text='@{"性别："+data.getSex()}'
                     android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@+id/tvAge"
                     app:layout_constraintHorizontal_chainStyle="spread"
@@ -93,7 +93,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text="@string/patient_age"
+                    android:text='@{"年龄："+data.getAgeInfo()}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"
@@ -123,7 +123,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_33px"
-                    android:text="@string/patient_id"
+                    android:text='@{"编号："+data.id}'
                     android:textColor="@color/color_FF333333"
                     android:textSize="@dimen/divider_24px"
                     android:textStyle="bold"

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

@@ -11,9 +11,9 @@
     </data>
 
     <LinearLayout
+        android:id="@+id/evaluationLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/divider_98px"
-        android:background="@drawable/bg_evaluation_result"
         android:orientation="horizontal">
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -22,7 +22,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@{data.reviewTaskName}"
-            android:textColor="@color/color_FF333333"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
@@ -32,7 +32,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:text="@{data.type}"
-            android:textColor="@color/color_FF333333"
+            android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_24px"
             android:textStyle="bold" />
 
@@ -42,11 +42,12 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:gravity="center"
-            android:textColor="@color/color_FF333333"
+            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"
             android:layout_height="match_parent"
             android:layout_weight="1"