From a889e603481b5f3f6cf0074af1f25f94b571db8c Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 21 一月 2020 15:01:46 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 3f2ec67..cc85f64 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -79,6 +79,7 @@
private int currTotalScore = 100;
private List<ScoreBean> mArrayList = new ArrayList<>();
private static final int SPEED_DATA = 2;
+ private FailedProjViewModel failedProjViewModel;
public static SupportFragment newInstance() {
return new NetWorkTrainFragment();
@@ -109,7 +110,7 @@
View view = inflater.inflate(R.layout.layout_train_fragment, container, false);
initView(view);
- FailedProjViewModel failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
+ failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
@@ -288,6 +289,7 @@
switch (v.getId()) {
case R.id.btn_start:
examStatusViewModel.updateStartExam(Constant.HAS_BEEN_START_EXAM);
+ failedProjViewModel.deleteAll();
sendExamJson(1);
iv_head.getDrawable().setLevel(1);
break;
@@ -297,6 +299,7 @@
break;
case R.id.view_map:
MapFragment mapFragment = findFragment(MapFragment.class);
+ MyLog.i(TAG,"鏌ョ湅鍦板浘");
if (mapFragment == null) {
mapFragment = (MapFragment) MapFragment.newInstance();
}
--
Gitblit v1.8.0