From e75368154352704a05724e1268d990600abe475d Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期四, 27 二月 2020 22:15:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/app.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 81a393d..1fbb278 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -47,6 +47,7 @@
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
+import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.cEventCenter.CEvent;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
@@ -322,13 +323,26 @@
new Thread(new Runnable() {
@Override
public void run() {
- StringBuffer vebuffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.VEHICLE);
- if (vebuffer != null){
-
- AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,vebuffer.toString());
+ String carPath = ExamPlatformData.getInstance().getCarModelPath();
+ if (!TextUtils.isEmpty(carPath)){
+ MyLog.i("浣跨敤鏇存柊鍚庣殑Car妯″瀷鍦板浘"+carPath);
+ byte[] bytes = FileUtil.readFile(carPath);
+ if (bytes != null){
+ String str = new String(bytes);
+ AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,str);
+ }else{
+ MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",carPath));
+ }
}else{
- MyLog.d(TAG,String.format("杞﹁締妯″瀷妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
+ StringBuffer vebuffer =FileUtil.readAssetTxtFile(getApplicationContext(),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()));
+ }
}
+
}
}).start();
}
@@ -337,14 +351,29 @@
new Thread(new Runnable() {
@Override
public void run() {
- StringBuffer buffer =FileUtil.readAssetTxtFile(getApplicationContext(),Constant.MAP);
- if (buffer != null){
-
- AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,buffer.toString());
+ String mapPath = ExamPlatformData.getInstance().getMapPath();
+ if (!TextUtils.isEmpty(mapPath)){
+ MyLog.i("璋冪敤鏇存柊Map璺緞鍚庣殑鍦板浘"+mapPath);
+ byte[] fileContent = FileUtil.readFile(mapPath);
+ if (fileContent != null){
+ String str = new String(fileContent);
+ Log.i(TAG, "鏂囦欢鍐呭锛�"+str);
+ AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,str);
+ }else{
+ MyLog.i(String.format("鏂囦欢:%s涓嶅瓨鍦�",mapPath));
+ }
}else{
- MyLog.d(TAG,String.format("鍦板浘妯″瀷鏈嫹鍏%s]鐩綍涓�", Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+getApplicationContext().getPackageName()));
+ MyLog.i("璇诲彇Assert鐩綍涓嬪垵濮嬪寲鐨勫湴鍥�");
+ StringBuffer buffer =FileUtil.readAssetTxtFile(getApplicationContext(),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()));
+
+ }
}
+
}
}).start();
--
Gitblit v1.8.0