Merge remote-tracking branch 'origin/master'

yy1717

2020-03-20 02b1ea43844084dd8cd435a169ded172387ef617

 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java

@@ -23,8 +23,6 @@
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import androidx.work.OneTimeWorkRequest;
import androidx.work.PeriodicWorkRequest;
import androidx.work.WorkInfo;
import androidx.work.WorkManager;

import com.anyun.exam.lib.AYSdk;
@@ -38,8 +36,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;

import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
@@ -69,9 +65,6 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.TimeWorker;

import static androidx.work.PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS;

/**
 * 联网训练UI
@@ -587,10 +580,10 @@
//                    mapFragment = (MapFragment) MapFragment.newInstance();
//                }
//                start(mapFragment);
                RoadDriveMapFragment mapFragment = findFragment(RoadDriveMapFragment.class);
                RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
                MyLog.i(TAG,"查看地图");
                if (mapFragment == null) {
                    mapFragment = (RoadDriveMapFragment) RoadDriveMapFragment.newInstance();
                    mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
                }
                start(mapFragment);
                break;