数据,文案,布局调整

shixianjie
1 parent 6824327776
Showing 4 changed files with 39 additions and 22 deletions Show diff stats
app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
app/src/main/res/layout/activity_huyou_detail.xml
app/src/main/res/layout/activity_huyou_detail_a4.xml
app/src/main/res/layout/item_huyou_week_point.xml
@@ -176,16 +176,31 @@ public class HuyouDetailActivity extends BaseRxActivity&lt;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&lt;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&lt;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&lt;ActivityHuyouDetailBindi
             }
  
             DecimalFormat format1 = new DecimalFormat("0%");
-            holder.setText(R.id.tvHuyou, format1.format(point.afterState));
+            holder.setText(R.id.tvHuyou, format1.format(point.beforeState));
         }
     }
  
@@ -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"/>
  
@@ -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"/>
  
@@ -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
...	...	@@ -176,16 +176,31 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
176	176	int exNo = 0, goodNo = 0, normalNo = 0, weakNo = 0;
177	177	float total = 0;
178	178	if (data.points != null) {
179		- for (StDetail.Point point: data.points) {
180		- total += point.afterState;
181		- if (point.afterState >= 0.9) {
182		- exNo ++;
183		- } else if (point.afterState >= 0.8) {
184		- goodNo ++;
185		- } else if (point.afterState >= 0.6) {
186		- normalNo ++;
187		- } else {
188		- weakNo ++;
	179	+ if (type == 0) {
	180	+ for (StDetail.Point point: data.points) {
	181	+ total += point.beforeState;
	182	+ if (point.beforeState >= 0.9) {
	183	+ exNo ++;
	184	+ } else if (point.beforeState >= 0.8) {
	185	+ goodNo ++;
	186	+ } else if (point.beforeState >= 0.6) {
	187	+ normalNo ++;
	188	+ } else {
	189	+ weakNo ++;
	190	+ }
	191	+ }
	192	+ } else {
	193	+ for (StDetail.Point point: data.points) {
	194	+ total += point.afterState;
	195	+ if (point.afterState >= 0.9) {
	196	+ exNo ++;
	197	+ } else if (point.afterState >= 0.8) {
	198	+ goodNo ++;
	199	+ } else if (point.afterState >= 0.6) {
	200	+ normalNo ++;
	201	+ } else {
	202	+ weakNo ++;
	203	+ }
189	204	}
190	205	}
191	206	}
...	...	@@ -220,10 +235,12 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
220	235	.append(correctNumHt).append(" 个，答错题目 ")
221	236	.append(errNumHt).append(" 个");
222	237	if (exNo > 0) {
223		- pointComment.append("，").append(exNo).append(" 个知识点掌握的非常棒");
	238	+ String ht = fromColor(String.valueOf(exNo), "#3BC3B6");
	239	+ pointComment.append("，").append(ht).append(" 个知识点掌握的非常棒");
224	240	}
225	241	if (weakNo > 0) {
226		- pointComment.append("，").append(weakNo).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
	242	+ String ht = fromColor(String.valueOf(weakNo), "#3BC3B6");
	243	+ pointComment.append("，").append(ht).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
227	244	}
228	245	pointComment.append("。");
229	246	String rateStr = new DecimalFormat("0%").format(rate / 100f);
...	...	@@ -460,13 +477,13 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
460	477	holder.setText(R.id.tvName, point.pointName);
461	478
462	479	TextView after = holder.getView(R.id.tvState);
463		- if (point.afterState >= 0.9) {
	480	+ if (point.beforeState >= 0.9) {
464	481	after.setText("掌握优秀");
465	482	after.setBackgroundTintList(ColorStateList.valueOf(0xFF4FBB7A));
466		- } else if (point.afterState >= 0.8) {
	483	+ } else if (point.beforeState >= 0.8) {
467	484	after.setText("掌握良好");
468	485	after.setBackgroundTintList(ColorStateList.valueOf(0xFF489AFA));
469		- } else if (point.afterState >= 0.6) {
	486	+ } else if (point.beforeState >= 0.6) {
470	487	after.setText("掌握一般");
471	488	after.setBackgroundTintList(ColorStateList.valueOf(0xFFF58725));
472	489	} else {
...	...	@@ -475,7 +492,7 @@ public class HuyouDetailActivity extends BaseRxActivity<ActivityHuyouDetailBindi
475	492	}
476	493
477	494	DecimalFormat format1 = new DecimalFormat("0%");
478		- holder.setText(R.id.tvHuyou, format1.format(point.afterState));
	495	+ holder.setText(R.id.tvHuyou, format1.format(point.beforeState));
479	496	}
480	497	}
481	498
...	...
...	...	@@ -1154,7 +1154,7 @@
1154	1154	android:textSize="13sp"
1155	1155	android:textColor="@color/white"
1156	1156	android:gravity="center"
1157		- android:layout_weight="135"
	1157	+ android:layout_weight="5"
1158	1158	android:layout_width="0dp"
1159	1159	android:layout_height="match_parent"/>
1160	1160	<View
...	...	@@ -1167,7 +1167,7 @@
1167	1167	android:textSize="13sp"
1168	1168	android:textColor="@color/white"
1169	1169	android:gravity="center"
1170		- android:layout_weight="179"
	1170	+ android:layout_weight="4"
1171	1171	android:layout_width="0dp"
1172	1172	android:layout_height="match_parent"/>
1173	1173
...	...
...	...	@@ -1159,7 +1159,7 @@
1159	1159	android:textSize="13sp"
1160	1160	android:textColor="@color/white"
1161	1161	android:gravity="center"
1162		- android:layout_weight="135"
	1162	+ android:layout_weight="5"
1163	1163	android:layout_width="0dp"
1164	1164	android:layout_height="match_parent"/>
1165	1165	<View
...	...	@@ -1172,7 +1172,7 @@
1172	1172	android:textSize="13sp"
1173	1173	android:textColor="@color/white"
1174	1174	android:gravity="center"
1175		- android:layout_weight="179"
	1175	+ android:layout_weight="4"
1176	1176	android:layout_width="0dp"
1177	1177	android:layout_height="match_parent"/>
1178	1178
...	...
...	...	@@ -22,7 +22,7 @@
22	22	android:gravity="center_vertical"
23	23	android:maxLines="2"
24	24	android:paddingStart="6dp"
25		- android:layout_weight="135"
	25	+ android:layout_weight="5"
26	26	android:layout_width="0dp"
27	27	android:layout_height="match_parent"/>
28	28	<View
...	...	@@ -31,7 +31,7 @@
31	31	android:layout_height="match_parent"/>
32	32	<FrameLayout
33	33	android:paddingStart="4dp"
34		- android:layout_weight="179"
	34	+ android:layout_weight="4"
35	35	android:layout_width="0dp"
36	36	android:layout_height="match_parent">
37	37	<TextView
...	...