diff --git a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
index 32200d3..eb8d368 100644
--- a/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
@@ -77,7 +77,13 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
         type = getIntent().getIntExtra("type", 0);
         student = (Student) getIntent().getSerializableExtra("student");
 
-        if (type == 1) binding.tvTitle.setText("阶段作业学习总结");
+        if (type == 1) {
+            binding.tvTitle.setText("阶段作业学习总结");
+            binding.viewWeekTable.setVisibility(View.GONE);
+        } else {
+            binding.viewPointTotal.setVisibility(View.GONE);
+            binding.viewTable.setVisibility(View.GONE);
+        }
 
         Glide.with(this).load(student.photo).into(binding.ivAvatar);
         binding.tvStuName.setText(student.stuName);
@@ -167,29 +173,60 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
             binding.tvWeakRate.setText(Html.fromHtml(temp, Html.FROM_HTML_MODE_COMPACT));
         }
 
-        binding.tvTotalRate.setText(new DecimalFormat("0").format(100f * data.correct / data.total));
+        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 ++;
+                }
+            }
+        }
+
+        float rate = 100f * data.correct / Math.max(data.total - data.unfinished, 1);
+        binding.tvTotalRate.setText(new DecimalFormat("0").format(rate));
         binding.tvTotalCorrect.setText(String.valueOf(data.correct));
         binding.tvTotalError.setText(String.valueOf(data.total - data.correct));
+        binding.tvTotalBlank.setText(String.valueOf(data.unfinished));
         if (data.total == 0) {
             binding.tvRating.setText("");
         } else {
-            float rate = 100f * data.correct / data.total;
-            String comment;
+            String rateComment;
             if (rate >= 90) {
-                comment = "掌握程度比较优秀，你对知识的理解和运用能力非常强，这是你努力的结果。请继续保持这份优秀，在未来的学习中，可以继续挑战更难的题目，勇攀高峰。";
+                rateComment = "知识点掌握得比较优秀，多练习多巩固掌握一般的知识点会有很大帮助。";
             } else if (rate >= 80) {
-                comment = "掌握良好。接下来，跟随老师的学习规划，针对薄弱环节重点突破。加油，只要持之以恒，坚持下去，你一定会更加出色。";
+                rateComment = "知识点掌握程度有进步，还要再继续学习，多练习，不断巩固。";
             } else if (rate >= 60) {
-                comment = "掌握程度一般。不过别灰心，你有提升的潜力。跟随老师的步伐，制定合理的学习计划，多做一些练习题来巩固知识。老师相信你一定可以做到。";
+                rateComment = "薄弱知识点还有进步空间，再多做一些类似题目来巩固知识点，继续努力。";
             } else {
-                comment = "掌握程度较为薄弱。但不要放弃，这正是你奋起直追的好时机。认真分析自己的问题，从基础开始逐步提升。老师会一直支持你，只要你有决心，就没有克服不了的困难。";
+                rateComment = "你的薄弱知识点还需要再深入了解，有不清楚的地方及时问老师，继续加油。";
+            }
+
+            String correctNumHt = fromColor(String.valueOf(data.correct), "#3BC3B6");
+            String errNumHt = fromColor(String.valueOf(data.total - data.correct - data.unfinished), "#3BC3B6");
+            StringBuilder pointComment = new StringBuilder("其中，答对题目 ")
+                    .append(correctNumHt).append(" 个，答错题目 ")
+                    .append(errNumHt).append(" 个");
+            if (exNo > 0) {
+                pointComment.append("，").append(exNo).append(" 个知识点掌握的非常棒");
             }
+            if (weakNo > 0) {
+                pointComment.append("，").append(weakNo).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
+            }
+            pointComment.append("。");
             String rateStr = new DecimalFormat("0%").format(rate / 100f);
             String temp;
             if (type == 0) {
-                temp = indent + "在本周作业中，你的综合正确率是 %s，" + comment;
+                temp = indent + "在本周作业中，你的综合正确率是 %s，" + rateComment + pointComment + "在未来的学习中，请保持这份优秀，继续挑战更难的题目，勇攀高峰。";
             } else {
-                temp = indent + "你的综合正确率是 %s，" + comment;
+                temp = indent + "你的综合正确率是 %s，" + rateComment;
             }
             temp = String.format(temp, fromColor(rateStr, "#3BC3B6"));
             binding.tvRating.setText(Html.fromHtml(temp, Html.FROM_HTML_MODE_COMPACT));
@@ -234,20 +271,6 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
         binding.lineChart.invalidate();
 
         if (!data.points.isEmpty()) {
-            int exNo = 0, goodNo = 0, normalNo = 0, weakNo = 0;
-            float total = 0;
-            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 ++;
-                }
-            }
             binding.tvExcellent.setText(String.valueOf(exNo));
             binding.tvGood.setText(String.valueOf(goodNo));
             binding.tvNormal.setText(String.valueOf(normalNo));
@@ -268,7 +291,9 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
             if (point.beforeState < 1) points.add(point);
         }
         binding.tableRoot.setClipToOutline(true);
+        binding.tableWeekRoot.setClipToOutline(true);
         binding.rvPoint.setAdapter(new Adapter(points));
+        binding.rvWeekPoint.setAdapter(new WeekAdapter(data.points));
         binding.tableRoot.setVisibility(points.isEmpty() ? View.GONE : View.VISIBLE);
         binding.flPointDesc.setVisibility(points.isEmpty() ? View.GONE : View.VISIBLE);
         binding.flEmptyPoints.setVisibility(points.isEmpty() ? View.VISIBLE : View.GONE);
@@ -420,4 +445,33 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
 
     }
 
+    public static class WeekAdapter extends BaseQuickAdapter<StDetail.Point, BaseViewHolder> {
+        public WeekAdapter(@Nullable List<StDetail.Point> data) {
+            super(R.layout.item_huyou_week_point, data);
+        }
+
+        @Override
+        protected void convert(@NonNull BaseViewHolder holder, StDetail.Point point) {
+            holder.setText(R.id.tvName, point.pointName);
+
+            TextView after = holder.getView(R.id.tvState);
+            if (point.afterState >= 0.9) {
+                after.setText("掌握优秀");
+                after.setBackgroundTintList(ColorStateList.valueOf(0xFF4FBB7A));
+            } else if (point.afterState >= 0.8) {
+                after.setText("掌握良好");
+                after.setBackgroundTintList(ColorStateList.valueOf(0xFF489AFA));
+            } else if (point.afterState >= 0.6) {
+                after.setText("掌握一般");
+                after.setBackgroundTintList(ColorStateList.valueOf(0xFFF58725));
+            } else {
+                after.setText("掌握薄弱");
+                after.setBackgroundTintList(ColorStateList.valueOf(0xFFEA5127));
+            }
+
+            DecimalFormat format1 = new DecimalFormat("0%");
+            holder.setText(R.id.tvHuyou, format1.format(point.correctness));
+        }
+    }
+
 }
diff --git a/app/src/main/res/drawable/png_icon_daily_blank.png b/app/src/main/res/drawable/png_icon_daily_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..caccc3cba418d7a89e41e8221b2afb4e2f2ca90f
GIT binary patch
literal 6382
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_huyou_detail.xml b/app/src/main/res/layout/activity_huyou_detail.xml
index cf7d91a..74793e5 100644
--- a/app/src/main/res/layout/activity_huyou_detail.xml
+++ b/app/src/main/res/layout/activity_huyou_detail.xml
@@ -15,6 +15,7 @@
         android:id="@+id/root"
         android:orientation="vertical"
         android:background="#CEF1EC"
+        android:paddingBottom="24dp"
         android:layout_width="378dp"
         android:layout_height="match_parent">
 
@@ -203,6 +204,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/viewPointTotal"
             android:orientation="vertical"
             android:background="@drawable/shape_radius_10"
             android:backgroundTint="@color/white"
@@ -212,7 +214,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <TextView
-                android:text="薄弱知识点总评"
+                android:text="知识点总评"
                 android:textSize="16sp"
                 android:textColor="#333333"
                 android:textStyle="bold"
@@ -418,7 +420,7 @@
                     android:gravity="center"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_weight="1.1">
                     <LinearLayout
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
@@ -433,7 +435,7 @@
                             android:textSize="11sp"
                             android:textColor="#333"
                             android:textStyle="bold"
-                            android:layout_marginStart="5dp"
+                            android:layout_marginStart="4dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
@@ -459,11 +461,6 @@
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
                 </LinearLayout>
-                <View
-                    android:background="#9ECAFC"
-                    android:layout_marginVertical="8dp"
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"/>
                 <LinearLayout
                     android:orientation="vertical"
                     android:gravity="center"
@@ -476,7 +473,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                         <ImageView
-                            android:src="@drawable/png_icon_statistical_accuracy"
+                            android:src="@drawable/png_icon_statistical_correct"
                             android:layout_width="12dp"
                             android:layout_height="13dp"/>
                         <TextView
@@ -484,7 +481,7 @@
                             android:textSize="11sp"
                             android:textColor="#333"
                             android:textStyle="bold"
-                            android:layout_marginStart="5dp"
+                            android:layout_marginStart="4dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
@@ -510,11 +507,6 @@
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
                 </LinearLayout>
-                <View
-                    android:background="#9ECAFC"
-                    android:layout_marginVertical="8dp"
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"/>
                 <LinearLayout
                     android:orientation="vertical"
                     android:gravity="center"
@@ -527,7 +519,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
                         <ImageView
-                            android:src="@drawable/png_icon_statistical_accuracy"
+                            android:src="@drawable/png_icon_statistical_error"
                             android:layout_width="12dp"
                             android:layout_height="13dp"/>
                         <TextView
@@ -535,7 +527,7 @@
                             android:textSize="11sp"
                             android:textColor="#333"
                             android:textStyle="bold"
-                            android:layout_marginStart="5dp"
+                            android:layout_marginStart="4dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
@@ -561,6 +553,52 @@
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:gravity="center"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+                        <ImageView
+                            android:src="@drawable/png_icon_daily_blank"
+                            android:layout_width="12dp"
+                            android:layout_height="13dp"/>
+                        <TextView
+                            android:text="未做题数"
+                            android:textSize="11sp"
+                            android:textColor="#333"
+                            android:textStyle="bold"
+                            android:layout_marginStart="4dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_marginTop="8dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:id="@+id/tvTotalBlank"
+                            tools:text="88"
+                            android:textSize="14sp"
+                            android:textColor="#3BC3B6"
+                            android:textStyle="bold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+                        <TextView
+                            android:text="道"
+                            android:textSize="9sp"
+                            android:textColor="#3BC3B6"
+                            android:textStyle="bold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+                    </LinearLayout>
+                </LinearLayout>
             </LinearLayout>
 
             <TextView
@@ -863,6 +901,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/viewTable"
             android:orientation="vertical"
             android:background="@drawable/shape_radius_10"
             android:backgroundTint="@color/white"
@@ -1074,6 +1113,85 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
             </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/viewWeekTable"
+            android:orientation="vertical"
+            android:background="@drawable/shape_radius_10"
+            android:backgroundTint="@color/white"
+            android:padding="16dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:text="知识点掌握详情"
+                android:textSize="16sp"
+                android:textColor="#333333"
+                android:textStyle="bold"
+                android:background="@drawable/bg_hy_analyse_title"
+                android:paddingStart="24dp"
+                android:paddingEnd="4dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <LinearLayout
+                android:id="@+id/tableWeekRoot"
+                android:orientation="vertical"
+                android:background="@drawable/bg_huyou_table_bg"
+                android:layout_marginTop="16dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:background="#50CEC2"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp">
+                    <TextView
+                        android:text="知识点名称"
+                        android:textSize="13sp"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_weight="135"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"/>
+                    <View
+                        android:background="#38B3A7"
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"/>
+
+                    <TextView
+                        android:text="知识点掌握状态"
+                        android:textSize="13sp"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_weight="179"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"/>
+
+                    <View
+                        android:background="#38B3A7"
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"/>
+
+                    <TextView
+                        android:text="正答率"
+                        android:textSize="13sp"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:layout_width="48dp"
+                        android:layout_height="match_parent"/>
+                </LinearLayout>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvWeekPoint"
+                    android:orientation="vertical"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    app:reverseLayout="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
 
         </LinearLayout>
     </LinearLayout>
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 ad5e79f..ffd4d2d 100644
--- a/app/src/main/res/layout/activity_huyou_detail_a4.xml
+++ b/app/src/main/res/layout/activity_huyou_detail_a4.xml
@@ -218,6 +218,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent">
                 <LinearLayout
+                    android:id="@+id/viewPointTotal"
                     android:orientation="vertical"
                     android:background="@drawable/shape_radius_10"
                     android:backgroundTint="@color/white"
@@ -226,7 +227,7 @@
                     android:layout_width="335dp"
                     android:layout_height="613dp">
                     <TextView
-                        android:text="薄弱知识点总评"
+                        android:text="知识点总评"
                         android:textSize="16sp"
                         android:textColor="#333333"
                         android:textStyle="bold"
@@ -469,11 +470,6 @@
                                     android:layout_height="wrap_content"/>
                             </LinearLayout>
                         </LinearLayout>
-                        <View
-                            android:background="#9ECAFC"
-                            android:layout_marginVertical="8dp"
-                            android:layout_width="1dp"
-                            android:layout_height="match_parent"/>
                         <LinearLayout
                             android:orientation="vertical"
                             android:gravity="center"
@@ -486,7 +482,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content">
                                 <ImageView
-                                    android:src="@drawable/png_icon_statistical_accuracy"
+                                    android:src="@drawable/png_icon_statistical_correct"
                                     android:layout_width="12dp"
                                     android:layout_height="13dp"/>
                                 <TextView
@@ -520,11 +516,6 @@
                                     android:layout_height="wrap_content"/>
                             </LinearLayout>
                         </LinearLayout>
-                        <View
-                            android:background="#9ECAFC"
-                            android:layout_marginVertical="8dp"
-                            android:layout_width="1dp"
-                            android:layout_height="match_parent"/>
                         <LinearLayout
                             android:orientation="vertical"
                             android:gravity="center"
@@ -537,7 +528,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content">
                                 <ImageView
-                                    android:src="@drawable/png_icon_statistical_accuracy"
+                                    android:src="@drawable/png_icon_statistical_error"
                                     android:layout_width="12dp"
                                     android:layout_height="13dp"/>
                                 <TextView
@@ -571,6 +562,52 @@
                                     android:layout_height="wrap_content"/>
                             </LinearLayout>
                         </LinearLayout>
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:gravity="center"
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:gravity="center_vertical"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
+                                <ImageView
+                                    android:src="@drawable/png_icon_daily_blank"
+                                    android:layout_width="12dp"
+                                    android:layout_height="13dp"/>
+                                <TextView
+                                    android:text="未做题数"
+                                    android:textSize="11sp"
+                                    android:textColor="#333"
+                                    android:textStyle="bold"
+                                    android:layout_marginStart="5dp"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_marginTop="8dp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:id="@+id/tvTotalBlank"
+                                    tools:text="88"
+                                    android:textSize="14sp"
+                                    android:textColor="#3BC3B6"
+                                    android:textStyle="bold"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                                <TextView
+                                    android:text="道"
+                                    android:textSize="9sp"
+                                    android:textColor="#3BC3B6"
+                                    android:textStyle="bold"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"/>
+                            </LinearLayout>
+                        </LinearLayout>
                     </LinearLayout>
 
                     <TextView
@@ -630,7 +667,8 @@
                         android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="70dp"
-                        android:layout_marginTop="48dp">
+                        android:layout_marginTop="48dp"
+                        android:baselineAligned="false">
                         <LinearLayout
                             android:orientation="vertical"
                             android:background="@drawable/shape_radius_10"
@@ -866,6 +904,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/viewTable"
                     android:orientation="vertical"
                     android:background="@drawable/shape_radius_10"
                     android:backgroundTint="@color/white"
@@ -1080,6 +1119,86 @@
                             android:layout_height="wrap_content"/>
                     </LinearLayout>
                 </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/viewWeekTable"
+                    android:orientation="vertical"
+                    android:background="@drawable/shape_radius_10"
+                    android:backgroundTint="@color/white"
+                    android:padding="16dp"
+                    android:layout_marginHorizontal="14dp"
+                    android:layout_width="335dp"
+                    android:layout_height="472dp">
+                    <TextView
+                        android:text="知识点掌握详情"
+                        android:textSize="16sp"
+                        android:textColor="#333333"
+                        android:textStyle="bold"
+                        android:background="@drawable/bg_hy_analyse_title"
+                        android:paddingStart="24dp"
+                        android:paddingEnd="4dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                    <LinearLayout
+                        android:id="@+id/tableWeekRoot"
+                        android:orientation="vertical"
+                        android:background="@drawable/bg_huyou_table_bg"
+                        android:layout_marginTop="16dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:orientation="horizontal"
+                            android:background="#50CEC2"
+                            android:layout_width="match_parent"
+                            android:layout_height="60dp">
+                            <TextView
+                                android:text="知识点名称"
+                                android:textSize="13sp"
+                                android:textColor="@color/white"
+                                android:gravity="center"
+                                android:layout_weight="135"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"/>
+                            <View
+                                android:background="#38B3A7"
+                                android:layout_width="1dp"
+                                android:layout_height="match_parent"/>
+
+                            <TextView
+                                android:text="知识点掌握状态"
+                                android:textSize="13sp"
+                                android:textColor="@color/white"
+                                android:gravity="center"
+                                android:layout_weight="179"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"/>
+
+                            <View
+                                android:background="#38B3A7"
+                                android:layout_width="1dp"
+                                android:layout_height="match_parent"/>
+
+                            <TextView
+                                android:text="正答率"
+                                android:textSize="13sp"
+                                android:textColor="@color/white"
+                                android:gravity="center"
+                                android:layout_width="48dp"
+                                android:layout_height="match_parent"/>
+                        </LinearLayout>
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/rvWeekPoint"
+                            android:orientation="vertical"
+                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                            app:reverseLayout="false"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                    </LinearLayout>
+
+                </LinearLayout>
             </LinearLayout>
         </HorizontalScrollView>
 
diff --git a/app/src/main/res/layout/item_huyou_week_point.xml b/app/src/main/res/layout/item_huyou_week_point.xml
new file mode 100644
index 0000000..416ac13
--- /dev/null
+++ b/app/src/main/res/layout/item_huyou_week_point.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="36dp"
+    tools:ignore="SmallSp,RtlSymmetry,HardcodedText">
+    <View
+        android:background="#38B3A7"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TextView
+            android:id="@+id/tvName"
+            tools:text="正数与负数"
+            android:textSize="12sp"
+            android:textColor="#333"
+            android:gravity="center_vertical"
+            android:maxLines="2"
+            android:paddingStart="6dp"
+            android:layout_weight="135"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"/>
+        <View
+            android:background="#38B3A7"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"/>
+        <FrameLayout
+            android:paddingStart="4dp"
+            android:layout_weight="179"
+            android:layout_width="0dp"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/tvState"
+                tools:text="掌握薄弱"
+                android:textSize="12sp"
+                android:textColor="@color/white"
+                android:background="@drawable/shape_radius_2"
+                android:backgroundTint="#EA5127"
+                android:paddingHorizontal="3dp"
+                android:paddingVertical="1dp"
+                android:singleLine="true"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </FrameLayout>
+        <View
+            android:background="#38B3A7"
+            android:layout_width="1dp"
+            android:layout_height="match_parent"/>
+        <TextView
+            android:id="@+id/tvHuyou"
+            android:text="-"
+            android:textSize="12sp"
+            android:textColor="#333"
+            android:gravity="center"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/libs/common/src/main/java/com/prws/common/bean/homework/StDetail.java b/libs/common/src/main/java/com/prws/common/bean/homework/StDetail.java
index 5748481..00c7228 100644
--- a/libs/common/src/main/java/com/prws/common/bean/homework/StDetail.java
+++ b/libs/common/src/main/java/com/prws/common/bean/homework/StDetail.java
@@ -21,6 +21,7 @@ public class StDetail {
 
     public int total;
     public int correct;
+    public int unfinished;
 
     public float mondayCorrection;
     public float tuesdayCorrection;