From 962e5ad2ba4750bf1cfed1a42c82f78fb8db03fe Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 13 一月 2020 10:21:32 +0800
Subject: [PATCH] 1.app启动的时候创建包目录,用以存放地图模型和车辆模型;2.有assert目录读取地图和车辆模型改为SD卡包名目下读取

---
 app/src/main/java/safeluck/drive/evaluation/app.java           |   21 ++++++++--
 .idea/vcs.xml                                                  |    6 +++
 app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java |   49 ++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index f54bb1e..e89276f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -1,6 +1,7 @@
 package safeluck.drive.evaluation;
 
 import android.app.Application;
+import android.os.Environment;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -80,6 +81,7 @@
 
             //鏁版嵁搴撴搷浣�
             MyLog.i(TAG, "onCreate111");
+            FileUtil.createdirs(getApplicationContext());
             failedProjRepository = new FailedProjRepository(this);
             rtkWorkRepository = new RTKWorkRepository(this);
         }
@@ -144,12 +146,23 @@
                 break;
             case Constant.FETCH_MAP_INFO:
 
-                StringBuffer buffer =FileUtil.readAssetTxtFile(this,Constant.MAP);
-                AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
+                StringBuffer buffer =FileUtil.readTxtFileFromSD(this,Constant.MAP);
+                if (buffer != null){
+
+                    AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
+                }else{
+                    MyLog.d(TAG,String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
+
+                }
                 break;
             case Constant.REQ_VECHILE_PROFILE:
-                StringBuffer vebuffer =FileUtil.readAssetTxtFile(this,Constant.VEHICLE);
-                AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,vebuffer.toString());
+                StringBuffer vebuffer =FileUtil.readTxtFileFromSD(this,Constant.VEHICLE);
+                if (vebuffer != null){
+
+                    AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,vebuffer.toString());
+                }else{
+                    MyLog.d(TAG,String.format("杞﹁締妯″瀷妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
+                }
                 break;
             case Constant.GPS_INFO:
                 Data gpsData = new Data.Builder().putString(Constant.GPS_INFO_DATA,json).build();
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
index ea5345b..6055ddb 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
@@ -3,6 +3,10 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Environment;
+import android.util.Log;
+
+import com.anyun.exam.lib.MyLog;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,6 +18,7 @@
 import java.io.OutputStream;
 
 public class FileUtil {
+    private static final String TAG = "FileUtil";
     /**
      * 璇诲彇assert鐩綍涓� txt鏂囨湰鏂囦欢鍐呭
      * @param context
@@ -47,6 +52,50 @@
         return stringBuffer;
     }
 
+    public static void createdirs(Context context){
+        String dir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+context.getPackageName();
+
+        File file = new File(dir);
+        if (!file.exists()){
+            file.mkdir();
+        }else{
+            Log.i(TAG, "createdirs: 鐩綍宸茬粡瀛樺湪");
+        }
+
+    }
+
+    public static StringBuffer readTxtFileFromSD(Context context,String fileName){
+        String lineTxt = null;
+        StringBuffer stringBuffer = new StringBuffer();
+        try {
+            InputStream inputStream = null;
+            String dir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+context.getPackageName();
+            File file = new File(dir,fileName);
+            if (!file.exists()){
+                MyLog.d(TAG,fileName+"鏂囦欢涓嶅瓨鍦�");
+                return null;
+            }
+            try {
+                inputStream = new FileInputStream(file);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
+            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+            while((lineTxt = bufferedReader.readLine()) != null){
+                System.out.println(lineTxt);
+                stringBuffer.append(lineTxt);
+
+            }
+            inputStreamReader.close();
+            bufferedReader.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return stringBuffer;
+    }
+
     /**
      *
      * @param fromFile 婧愭枃浠惰矾寰勫寘鎷枃浠跺悕锛堢粷瀵硅矾寰勶級

--
Gitblit v1.8.0