From 46bf3d68645d566e726288279c026033901c67b5 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 21 三月 2020 13:24:35 +0800
Subject: [PATCH] update
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 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 b4d6560..77bb4f6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -266,9 +266,56 @@
initView(view);
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) {
+ 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()));
+ item_conents.add(f.getItem_content());
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
+ }
+ //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
+ sendJKMessage0203(failedProj_selects);
+ 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.reverse(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) {
+ MyLog.i("鐜板湪鏄満鑰冪姸鎬侊紝鐩戣璺�冩暟鎹け璐ラ」鐩�");
if (failedProj_selects != null && failedProj_selects.size()>0){
item_id = 0;
@@ -291,14 +338,14 @@
currTotalScore -=item_id;
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
-// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
-// stopExam();
+ MyLog.i("鍦鸿�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+ stopExam();
}
- MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
+ MyLog.i("鍦鸿�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
}else{
- MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
+ MyLog.i(TAG,"鍦鸿�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
item_id = 0;
mArrayList.clear();
item_conents.clear();
@@ -518,6 +565,7 @@
exam_type = 2;
iv_head.getDrawable().setLevel(1);
+ ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
@@ -529,36 +577,13 @@
@Override
public void luKao() {
exam_type = 3;
+ ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
jkMessage0202.curr_exam = 1;
iv_head.getDrawable().setLevel(1);
MessageProcessor.getInstance().sendMessage(jkMessage0202);
-// if (simulateNightBean == null){
-// simulateNightBean = new SimulateNightBean();
-// }
-// simulateNightBean.setExam(0);
-//
-// final List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
-// simulateNightBean.setQuestion(list.subList(list.size()-2,list.size()-1));
-// AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
-//
-//
-//
-// tempQs.add(list.get(0));
-// int [] a =Utils.getRandomInts(4,12);
-// for (int i = 0; i < a.length; i++) {
-// tempQs.add(list.get(a[i]));
-// }
-//
-// simulateNightBean.setQuestion(tempQs);
-// mHandler.postDelayed(new Runnable() {
-// @Override
-// public void run() {
-// AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
-// tempQs.clear();
-// }
-// },10*1000);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
}
});
@@ -617,7 +642,7 @@
private void stopExam() {
MyLog.i(TAG,"缁撴潫鑰冭瘯");
-
+ sns.clear();
tv_total_score.setText(String.valueOf(currTotalScore));
iv_head.getDrawable().setLevel(0);
--
Gitblit v1.8.0