参数补充

shixianjie
1 parent f60bd9dc2b
Showing 3 changed files with 31 additions and 0 deletions Show diff stats
app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
libs/common/src/main/java/com/prws/common/bean/homework/CorrectionSer.java
libs/common/src/main/java/com/prws/common/bean/homework/HomeWork.java
@@ -21,6 +21,7 @@ import com.hjx.parent.rx.BaseRxActivity;
 import com.prws.common.bean.Student;
 import com.prws.common.bean.homework.Correction;
 import com.prws.common.bean.homework.CorrectionPoint;
+import com.prws.common.bean.homework.CorrectionSer;
 import com.prws.common.bean.homework.HomeWork;
 import com.prws.common.bean.homework.HomeworkList;
 import com.prws.common.bean.homework.KeyValue;
@@ -97,6 +98,7 @@ public class HomeworkFeedbackActivity extends BaseRxActivity&lt;ActivityHomeworkFee
         body.put("stuId", student.stuId);
         body.put("points", countPoint());
         body.put("correctionList", corrections);
+        body.put("extra", buildExtra());
         NetWorks.service_url.uploadHomeworkFeedback(NetWorks.getHeader(), body)
                 .compose(transformSingle())
                 .subscribe((response, th) -> {
@@ -121,6 +123,16 @@ public class HomeworkFeedbackActivity extends BaseRxActivity&lt;ActivityHomeworkFee
                 });
     }
  
+    private String buildExtra() {
+        if (mList == null || mList.isEmpty()) return null;
+        List<CorrectionSer> maps = new ArrayList<>();
+        for (HomeWork item: mList) {
+            maps.add(item.toSer());
+        }
+        Gson gson = new Gson();
+        return gson.toJson(maps);
+    }
+
     @SuppressLint("CheckResult")
     private List<CorrectionPoint> countPoint() {
         Set<KeyValue> set = new HashSet<>();
@@ -0,0 +1,16 @@
+package com.prws.common.bean.homework;
+
+public class CorrectionSer {
+    public String brief;
+    public int correction; // 0 对, 1 错
+    public int state; // 1: 已听懂; 2: 基本听懂; 3: 一般听懂
+
+    public CorrectionSer() {
+    }
+
+    public CorrectionSer(String brief, int correction, int state) {
+        this.brief = brief;
+        this.correction = correction;
+        this.state = state;
+    }
+}
@@ -38,4 +38,7 @@ public class HomeWork implements Serializable {
         }
     }
  
+    public CorrectionSer toSer() {
+        return new CorrectionSer(brief, check ? 1 : 0, state);
+    }
 }
...	...	@@ -21,6 +21,7 @@ import com.hjx.parent.rx.BaseRxActivity;
21	21	import com.prws.common.bean.Student;
22	22	import com.prws.common.bean.homework.Correction;
23	23	import com.prws.common.bean.homework.CorrectionPoint;
	24	+import com.prws.common.bean.homework.CorrectionSer;
24	25	import com.prws.common.bean.homework.HomeWork;
25	26	import com.prws.common.bean.homework.HomeworkList;
26	27	import com.prws.common.bean.homework.KeyValue;
...	...	@@ -97,6 +98,7 @@ public class HomeworkFeedbackActivity extends BaseRxActivity<ActivityHomeworkFee
97	98	body.put("stuId", student.stuId);
98	99	body.put("points", countPoint());
99	100	body.put("correctionList", corrections);
	101	+ body.put("extra", buildExtra());
100	102	NetWorks.service_url.uploadHomeworkFeedback(NetWorks.getHeader(), body)
101	103	.compose(transformSingle())
102	104	.subscribe((response, th) -> {
...	...	@@ -121,6 +123,16 @@ public class HomeworkFeedbackActivity extends BaseRxActivity<ActivityHomeworkFee
121	123	});
122	124	}
123	125
	126	+ private String buildExtra() {
	127	+ if (mList == null \|\| mList.isEmpty()) return null;
	128	+ List<CorrectionSer> maps = new ArrayList<>();
	129	+ for (HomeWork item: mList) {
	130	+ maps.add(item.toSer());
	131	+ }
	132	+ Gson gson = new Gson();
	133	+ return gson.toJson(maps);
	134	+ }
	135	+
124	136	@SuppressLint("CheckResult")
125	137	private List<CorrectionPoint> countPoint() {
126	138	Set<KeyValue> set = new HashSet<>();
...	...
...	...	@@ -0,0 +1,16 @@
	1	+package com.prws.common.bean.homework;
	2	+
	3	+public class CorrectionSer {
	4	+ public String brief;
	5	+ public int correction; // 0 对, 1 错
	6	+ public int state; // 1: 已听懂; 2: 基本听懂; 3: 一般听懂
	7	+
	8	+ public CorrectionSer() {
	9	+ }
	10	+
	11	+ public CorrectionSer(String brief, int correction, int state) {
	12	+ this.brief = brief;
	13	+ this.correction = correction;
	14	+ this.state = state;
	15	+ }
	16	+}
...	...
...	...	@@ -38,4 +38,7 @@ public class HomeWork implements Serializable {
38	38	}
39	39	}
40	40
	41	+ public CorrectionSer toSer() {
	42	+ return new CorrectionSer(brief, check ? 1 : 0, state);
	43	+ }
41	44	}
...	...