From 40eb16208b55967ec994c00b4e873db9a1e175d0 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期日, 22 三月 2020 11:15:27 +0800
Subject: [PATCH] 优化log；实现联网考试、单机训练科二科三考试
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 187 +++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 87 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 9ef6df9..2d8e244 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -283,46 +283,98 @@
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) {
+ 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()));
+ item_conents.add(f.getItem_content());
+ Collections.reverse(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.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) {
- if (failedProj_selects != null && failedProj_selects.size()>0){
+ 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()));
- item_conents.add(f.getItem_content());
- Collections.reverse(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
+ 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);
+ 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;
+ mArrayList.clear();
+ item_conents.clear();
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
- MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
- item_id = 0;
- mArrayList.clear();
- item_conents.clear();
- Collections.reverse(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
+
}
});
@@ -395,53 +447,6 @@
return view;
}
-// private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
-//// JKMessage0203 jkMessage0203 = new JKMessage0203();
-//// jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
-//// jkMessage0203.ID = ExamPlatformData.getInstance().getID();
-//// jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
-////
-//// for (int i = 0; i < failedProj_selects.size(); i++) {
-//// if (hasSnEqulas(failedProj_selects.get(i).getSn())){
-//// MyLog.i("sn鐩稿悓"+failedProj_selects.get(i).getSn());
-//// }else{
-//// ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
-//// failedProj_selects.get(i).getScore_deducting()==100?"涓嶅悎鏍�":"鎵�"+
-//// failedProj_selects.get(i).getScore_deducting()+"鍒�"));
-//// MyLog.i("娌℃湁鐩稿悓鐨剆n锛屽彂閫�"+failedProj_selects.get(i).getSn());
-//// ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
-//// String utc = failedProj_selects.get(i).getUtc();
-//// if (!TextUtils.isEmpty(utc)&&utc.length()>12){
-//// utc =utc.substring(0,12);
-//// }
-//// jkMessage0203.timeBCD = utc ;
-////
-//// jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
-//// jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
-//// jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
-//// }
-////
-//// }
-//
-//// MessageProcessor.getInstance().sendMessage(jkMessage0203);
-//// }
-//
-//// private boolean hasSnEqulas(int failedProjSn){
-//// if (ExamPlatformData.getInstance().getSns().size() > 0){
-//// for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
-//// MyLog.i("宸插瓨鍦ㄧ殑sn"+ExamPlatformData.getInstance().getSns().get(j));
-//// if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
-//// MyLog.i("sn鐩稿悓锛屼笉鍙�"+ExamPlatformData.getInstance().getSns().get(j));
-//// return true;
-// }else{
-// continue;
-// }
-// }
-//
-// }
-// return false;
-//
-// }
@@ -532,6 +537,7 @@
public void changKao() {
exam_type = 2;
iv_head.getDrawable().setLevel(1);
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
@@ -546,6 +552,7 @@
@Override
public void luKao() {
exam_type = 3;
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
@@ -570,12 +577,21 @@
break;
case R.id.view_map:
- MapFragment mapFragment = findFragment(MapFragment.class);
- MyLog.i(TAG,"鏌ョ湅鍦板浘");
- if (mapFragment == null) {
- mapFragment = (MapFragment) MapFragment.newInstance();
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
+ MyLog.i(TAG,"鏌ョ湅璺�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
+ }
+ start(mapFragment);
+ }else{
+ MapFragment mapFragment = findFragment(MapFragment.class);
+ MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (MapFragment) MapFragment.newInstance();
+ }
+ start(mapFragment);
}
- start(mapFragment);
break;
case R.id.btn_return:
_mActivity.onBackPressed();
@@ -604,10 +620,7 @@
}
private void stopExam() {
- MyLog.i(TAG,"缁撴潫鑰冭瘯");
-
- //娓呯┖sns
- ExamPlatformData.getInstance().clearSns();
+ MyLog.i(TAG,"缁撴潫璁粌");
//璁剧疆妯″紡涓篘ONE 0
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
--
Gitblit v1.8.0