From 508a582a7529efe5438613d4ee54f8c356c80d98 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Fri, 21 Mar 2025 10:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E6=96=87=E6=A1=88,=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hjx/parent/HuyouDetailActivity.java   | 49 +++++++++++++++-------
 app/src/main/res/layout/activity_huyou_detail.xml  |  4 +-
 .../main/res/layout/activity_huyou_detail_a4.xml   |  4 +-
 app/src/main/res/layout/item_huyou_week_point.xml  |  4 +-
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
index 36b31c9..58f94ae 100644
--- a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
@@ -176,16 +176,31 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
         int exNo = 0, goodNo = 0, normalNo = 0, weakNo = 0;
         float total = 0;
         if (data.points != null) {
-            for (StDetail.Point point: data.points) {
-                total += point.afterState;
-                if (point.afterState >= 0.9) {
-                    exNo ++;
-                } else if (point.afterState >= 0.8) {
-                    goodNo ++;
-                } else if (point.afterState >= 0.6) {
-                    normalNo ++;
-                } else {
-                    weakNo ++;
+            if (type == 0) {
+                for (StDetail.Point point: data.points) {
+                    total += point.beforeState;
+                    if (point.beforeState >= 0.9) {
+                        exNo ++;
+                    } else if (point.beforeState >= 0.8) {
+                        goodNo ++;
+                    } else if (point.beforeState >= 0.6) {
+                        normalNo ++;
+                    } else {
+                        weakNo ++;
+                    }
+                }
+            } else {
+                for (StDetail.Point point: data.points) {
+                    total += point.afterState;
+                    if (point.afterState >= 0.9) {
+                        exNo ++;
+                    } else if (point.afterState >= 0.8) {
+                        goodNo ++;
+                    } else if (point.afterState >= 0.6) {
+                        normalNo ++;
+                    } else {
+                        weakNo ++;
+                    }
                 }
             }
         }
@@ -220,10 +235,12 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
                     .append(correctNumHt).append(" 个，答错题目 ")
                     .append(errNumHt).append(" 个");
             if (exNo > 0) {
-                pointComment.append("，").append(exNo).append(" 个知识点掌握的非常棒");
+                String ht = fromColor(String.valueOf(exNo), "#3BC3B6");
+                pointComment.append("，").append(ht).append(" 个知识点掌握的非常棒");
             }
             if (weakNo > 0) {
-                pointComment.append("，").append(weakNo).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
+                String ht = fromColor(String.valueOf(weakNo), "#3BC3B6");
+                pointComment.append("，").append(ht).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
             }
             pointComment.append("。");
             String rateStr = new DecimalFormat("0%").format(rate / 100f);
@@ -460,13 +477,13 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
             holder.setText(R.id.tvName, point.pointName);
 
             TextView after = holder.getView(R.id.tvState);
-            if (point.afterState >= 0.9) {
+            if (point.beforeState >= 0.9) {
                 after.setText("掌握优秀");
                 after.setBackgroundTintList(ColorStateList.valueOf(0xFF4FBB7A));
-            } else if (point.afterState >= 0.8) {
+            } else if (point.beforeState >= 0.8) {
                 after.setText("掌握良好");
                 after.setBackgroundTintList(ColorStateList.valueOf(0xFF489AFA));
-            } else if (point.afterState >= 0.6) {
+            } else if (point.beforeState >= 0.6) {
                 after.setText("掌握一般");
                 after.setBackgroundTintList(ColorStateList.valueOf(0xFFF58725));
             } else {
@@ -475,7 +492,7 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
             }
 
             DecimalFormat format1 = new DecimalFormat("0%");
-            holder.setText(R.id.tvHuyou, format1.format(point.afterState));
+            holder.setText(R.id.tvHuyou, format1.format(point.beforeState));
         }
     }
 
diff --git a/app/src/main/res/layout/activity_huyou_detail.xml b/app/src/main/res/layout/activity_huyou_detail.xml
index 74793e5..9118f0c 100644
--- a/app/src/main/res/layout/activity_huyou_detail.xml
+++ b/app/src/main/res/layout/activity_huyou_detail.xml
@@ -1154,7 +1154,7 @@
                         android:textSize="13sp"
                         android:textColor="@color/white"
                         android:gravity="center"
-                        android:layout_weight="135"
+                        android:layout_weight="5"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"/>
                     <View
@@ -1167,7 +1167,7 @@
                         android:textSize="13sp"
                         android:textColor="@color/white"
                         android:gravity="center"
-                        android:layout_weight="179"
+                        android:layout_weight="4"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"/>
 
diff --git a/app/src/main/res/layout/activity_huyou_detail_a4.xml b/app/src/main/res/layout/activity_huyou_detail_a4.xml
index ffd4d2d..e17ef44 100644
--- a/app/src/main/res/layout/activity_huyou_detail_a4.xml
+++ b/app/src/main/res/layout/activity_huyou_detail_a4.xml
@@ -1159,7 +1159,7 @@
                                 android:textSize="13sp"
                                 android:textColor="@color/white"
                                 android:gravity="center"
-                                android:layout_weight="135"
+                                android:layout_weight="5"
                                 android:layout_width="0dp"
                                 android:layout_height="match_parent"/>
                             <View
@@ -1172,7 +1172,7 @@
                                 android:textSize="13sp"
                                 android:textColor="@color/white"
                                 android:gravity="center"
-                                android:layout_weight="179"
+                                android:layout_weight="4"
                                 android:layout_width="0dp"
                                 android:layout_height="match_parent"/>
 
diff --git a/app/src/main/res/layout/item_huyou_week_point.xml b/app/src/main/res/layout/item_huyou_week_point.xml
index 416ac13..bc3460b 100644
--- a/app/src/main/res/layout/item_huyou_week_point.xml
+++ b/app/src/main/res/layout/item_huyou_week_point.xml
@@ -22,7 +22,7 @@
             android:gravity="center_vertical"
             android:maxLines="2"
             android:paddingStart="6dp"
-            android:layout_weight="135"
+            android:layout_weight="5"
             android:layout_width="0dp"
             android:layout_height="match_parent"/>
         <View
@@ -31,7 +31,7 @@
             android:layout_height="match_parent"/>
         <FrameLayout
             android:paddingStart="4dp"
-            android:layout_weight="179"
+            android:layout_weight="4"
             android:layout_width="0dp"
             android:layout_height="match_parent">
             <TextView
-- 
1.9.0