From 2dd6fa41c2391ae53569260e671402a900a7a143 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期三, 28 四月 2021 22:49:27 +0800
Subject: [PATCH] routeline放在包名下，在设置里进行手动更新线路
---
app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java b/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
index 9006ca0..f4f3b63 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/route/RouteInitWorker.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation.DB.route;
import android.content.Context;
+import android.os.Environment;
import android.util.Log;
import androidx.annotation.NonNull;
@@ -11,6 +12,8 @@
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -18,6 +21,7 @@
import java.util.List;
import okhttp3.Route;
+import safeluck.drive.evaluation.DB.Constant;
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.bean.RouteCollect;
@@ -39,9 +43,21 @@
public Result doWork() {
Log.i(TAG, "doWork: "+Thread.currentThread().getId());
try {
- InputStream inputStream = getApplicationContext().getAssets().open("routeline.json");
+ File file = new File(Environment.getExternalStorageDirectory()+File.separator+getApplicationContext().getPackageName()+
+ File.separator+ Constant.ROUTELINE_JSON);
+
+ if (!file.exists()){
+ return Result.failure();
+ }
+ InputStream inputStream = null;
+ try {
+ inputStream =new FileInputStream(file);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
JsonReader jsonReader = new JsonReader(inputStreamReader);
+
Gson gson = new Gson();
Type type = new TypeToken<List<RouteCollect>>(){}.getType();
@@ -71,7 +87,7 @@
routeCross.setActive(bean.getActive());
routeCross.setIdx(bean.getIdx());
routeCross.setRoad(bean.getRoad());
- routeCross.setRouteline_id(i+1);
+ routeCross.setRouteline_id(route.getId());
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getRouteCrooDao().insertRouteCross(routeCross);
}
}
@@ -79,7 +95,7 @@
}
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
return Result.failure();
}
--
Gitblit v1.8.0