From b213c3e542fc71b31b6ad1e9da6958eaec6d5b41 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 13 一月 2021 09:24:09 +0800
Subject: [PATCH] 修改评判表数据库，只能rtkconfig sn变化的时候发送一次initdata
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 147 +++++++++++++++++++++++++++++++++----------------
1 files changed, 99 insertions(+), 48 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index a03bb1f..916b6ce 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -426,55 +426,103 @@
}
});
- failedProjViewModel.getFailedProjectsForIII(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
+// 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);
+// }
+// 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>>() {
+// @Override
+// public void onChanged(List<FailedProj_select> failedProj_selects) {
+// if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
+// 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);
+// }
+// MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
+// mHandler.obtainMessage(ADD_DATA).sendToTarget();
+// }else{
+// MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
+// item_id = 0;
+// mArrayList.clear();
+// item_conents.clear();
+// Collections.sort(mArrayList);
+// mScoreAdapter.addDatas(mArrayList);
+// mHandler.obtainMessage(ADD_DATA).sendToTarget();
+// }
+// }
+//
+// }
+// });
+
+
+
+
+
+
+
+
+ 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);
- }
- 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>>() {
- @Override
- public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
if (failedProj_selects != null && failedProj_selects.size()>0){
item_id = 0;
@@ -508,12 +556,15 @@
mScoreAdapter.addDatas(mArrayList);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
- }
}
});
+
+
+
+
examStatusViewModel = ViewModelProviders.of(this).get(ExamStatusViewModel.class);
examStatusViewModel.getExamStatus().observe(this, new Observer<List<ExamStatus>>() {
@Override
--
Gitblit v1.8.0