zhanghaochen / ParentControl

Compare View

switch
from
...
to
 
Commits (3)
Showing 3 changed files   Show diff stats
... ... @@ -24,8 +24,8 @@ android {
24 24 applicationId "com.hjx.parent"
25 25 minSdk 26
26 26 targetSdk 32
27   - versionCode 1011
28   - versionName "1.0.11"
  27 + versionCode 1012
  28 + versionName "1.0.12"
29 29  
30 30 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
31 31 }
... ...
app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
Diff comments   View file @f4ff510
... ... @@ -152,8 +152,10 @@ public class HomeworkFeedbackActivity extends BaseRxActivity<ActivityHomeworkFee
152 152 if (mList == null || mList.isEmpty()) return null;
153 153 List<CorrectionSer> maps = new ArrayList<>();
154 154 for (HomeWork item: mList) {
  155 + if (item.correction == 2) continue;
155 156 maps.add(item.toSer());
156 157 }
  158 + if (maps.isEmpty()) return null;
157 159 Gson gson = new Gson();
158 160 return gson.toJson(maps);
159 161 }
... ... @@ -168,6 +170,7 @@ public class HomeworkFeedbackActivity extends BaseRxActivity&lt;ActivityHomeworkFee
168 170 Map<String, Integer> normalTimes = new HashMap<>();
169 171 Gson gson = new Gson();
170 172 for (HomeWork homeWork: mList) {
  173 + if (homeWork.correction == 2) continue;
171 174 homeWork.formatPoints(gson);
172 175  
173 176 set.addAll(homeWork.pointsObj);
... ...
app/src/main/java/com/hjx/parent/HuyouDetailActivity.java
Diff comments   View file @f4ff510
... ... @@ -168,7 +168,7 @@ public class HuyouDetailActivity extends BaseRxActivity&lt;ActivityHuyouDetailBindi
168 168 comment = "你的薄弱知识点还需要再深入了解，有不清楚的地方及时问老师，继续加油。";
169 169 }
170 170 String percent = new DecimalFormat("0%").format(after / 100);
171   - String temp = indent + "通过学习，你的薄弱知识点掌握程度为 %s，" + comment;
  171 + String temp = indent + "通过学习，你的知识点掌握程度为 %s，" + comment;
172 172 temp = String.format(temp, fromColor(percent, "#F24E38"));
173 173 binding.tvWeakRate.setText(Html.fromHtml(temp, Html.FROM_HTML_MODE_COMPACT));
174 174 }
... ... @@ -217,16 +217,16 @@ public class HuyouDetailActivity extends BaseRxActivity&lt;ActivityHuyouDetailBindi
217 217 String encComment;
218 218 if (rate >= 90) {
219 219 rateComment = "知识点掌握得比较优秀，多练习多巩固掌握一般的知识点会有很大帮助。";
220   - encComment = "在未来的学习中，请保持这份优秀，继续挑战更难的题目，勇攀高峰";
  220 + encComment = "在未来的学习中，请保持这份优秀，继续挑战更难的题目，勇攀高峰！";
221 221 } else if (rate >= 80) {
222 222 rateComment = "知识点掌握程度有进步，还要再继续学习，多练习，不断巩固。";
223   - encComment = "在未来的学习中，请保持这份优秀，继续挑战更难的题目，勇攀高峰";
  223 + encComment = "在未来的学习中，请保持这份优秀，继续挑战更难的题目，勇攀高峰！";
224 224 } else if (rate >= 60) {
225 225 rateComment = "薄弱知识点还有进步空间，再多做一些类似题目来巩固知识点，继续努力。";
226   - encComment = "在未来的学习中，请不要灰心，继续努力";
  226 + encComment = "在未来的学习中，请不要灰心，继续努力！";
227 227 } else {
228 228 rateComment = "你的薄弱知识点还需要再深入了解，有不清楚的地方及时问老师，继续加油。";
229   - encComment = "在未来的学习中，请不要灰心，继续努力";
  229 + encComment = "在未来的学习中，请不要灰心，继续努力！";
230 230 }
231 231  
232 232 String correctNumHt = fromColor(String.valueOf(data.correct), "#3BC3B6");
... ... @@ -236,11 +236,11 @@ public class HuyouDetailActivity extends BaseRxActivity&lt;ActivityHuyouDetailBindi
236 236 .append(errNumHt).append(" 个");
237 237 if (exNo > 0) {
238 238 String ht = fromColor(String.valueOf(exNo), "#3BC3B6");
239   - pointComment.append("，").append(ht).append(" 个知识点掌握的非常棒");
  239 + pointComment.append("，").append(ht).append(" 个知识点非常棒");
240 240 }
241 241 if (weakNo > 0) {
242 242 String ht = fromColor(String.valueOf(weakNo), "#3BC3B6");
243   - pointComment.append("，").append(ht).append(" 个知识点掌握的还需努力，这部分还要再加强学习");
  243 + pointComment.append("，").append(ht).append(" 个知识点还需努力，这部分还要再加强学习");
244 244 }
245 245 pointComment.append("。");
246 246 String rateStr = new DecimalFormat("0%").format(rate / 100f);
... ...