From c3e207bd4a37f4f4cafbf43b897592ac3c582e45 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 02 二月 2021 13:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 116 ++++++++++++++++------------------------------------------
1 files changed, 32 insertions(+), 84 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 85bcc23..baa117d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -344,100 +344,48 @@
failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
- failedProjViewModel.getFailedProjectsForIII(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
- @Override
- public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
- MyLog.i("鐜板湪鏄矾鑰冪姸鎬侊紝鐩戣璺�冩暟鎹け璐ラ」鐩�");
- if (failedProj_selects != null && failedProj_selects.size()>0){
-
- item_id = 0;
- currTotalScore = 100;
- mArrayList.clear();
- item_conents.clear();
- for (FailedProj_select f :
- failedProj_selects) {
- item_id += f.getScore_deducting();
- Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
- item_conents.add(f.getItem_content());
- Collections.sort(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
- currTotalScore -=item_id;
- MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
- if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
-
- }
- MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"璺�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
- item_id = 0;
-// mArrayList.clear();
-// item_conents.clear();
-// Collections.sort(mArrayList);
-// mScoreAdapter.addDatas(mArrayList);
-// mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }
- }
-
- }
- });
- failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
+ failedProjViewModel.getFailedProjects(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
- MyLog.i("鐜板湪鏄満鑰冪姸鎬侊紝鐩戣鏁版嵁澶辫触椤圭洰");
- if (failedProj_selects != null && failedProj_selects.size()>0){
-
- item_id = 0;
- currTotalScore = 100;
- mArrayList.clear();
- item_conents.clear();
- for (FailedProj_select f :
- failedProj_selects) {
- item_id += f.getScore_deducting();
- Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
- item_conents.add(f.getItem_content());
- Collections.sort(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
- currTotalScore -=item_id;
- MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
- if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("鍦鸿�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
- ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
- stopExam();
-
- }
- MyLog.i("鍦鸿�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"鍦鸿�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
- item_id = 0;
-// mArrayList.clear();
-// item_conents.clear();
-// Collections.sort(mArrayList);
-// mScoreAdapter.addDatas(mArrayList);
-// mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ if (failedProj_selects != null && failedProj_selects.size()>0){
+ item_id = 0;
+ currTotalScore = 100;
+ mArrayList.clear();
+ item_conents.clear();
+ for (FailedProj_select f :
+ failedProj_selects) {
+ item_id += f.getScore_deducting();
+ Log.i(TAG, "onChanged: " + f.toString());
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
+ item_conents.add(f.getItem_content());
+ Collections.sort(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
}
- }
+ MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
+ currTotalScore -=item_id;
+ MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i("浣庝簬80锛屼笉鍚堟牸,缁撴潫鑰冭瘯"+currTotalScore);
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
+ }
+ MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ }else{
+ MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
+ item_id = 0;
+ }
}
});
+
+
+
examStatusViewModel = ViewModelProviders.of(this).get(ExamStatusViewModel.class);
examStatusViewModel.getExamStatus().observe(this, new Observer<List<ExamStatus>>() {
@Override
--
Gitblit v1.8.0