From 02b1ea43844084dd8cd435a169ded172387ef617 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 20 三月 2020 18:06:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 11 ++---------
1 files changed, 2 insertions(+), 9 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 c92fa93..99bb189 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/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;
--
Gitblit v1.8.0