From c8e28803082ae89fba714c893402064757d8ece1 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 10 二月 2020 18:31:14 +0800
Subject: [PATCH] 修改二进制文件读取方式，编码为ISO-8859-1
---
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java | 31 +++++++++++++++++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 2 +-
2 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index ff1144a..3e6fbfe 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -65,7 +65,7 @@
((BaseSettingFragment)getParentFragment()).startBrotherFragment(SignalConfigFragment.newInstance());
break;
case R.id.btn_mcu_upgrade:
- StringBuffer stringBuffer = FileUtil.readTxtFileFromSD(getContext(),"dfu.bin",true);
+ StringBuffer stringBuffer = FileUtil.readMCUtFileFromSD(getContext(),"dfu.bin");
if (stringBuffer != null){
AYSdk.getInstance().sendCmd(Constant.UPGRADE_MCU_CONTENT_FILE, stringBuffer.toString());
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 7c68423..72036c1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
@@ -102,7 +102,38 @@
}
return stringBuffer;
}
+ public static StringBuffer readMCUtFileFromSD(Context context,String fileName){
+ String lineTxt = null;
+ StringBuffer stringBuffer = new StringBuffer();
+ try {
+ String dir = Environment.getExternalStorageDirectory().getAbsolutePath()+"/";
+ InputStream inputStream = null;
+ File file = new File(dir,fileName);
+ if (!file.exists()){
+ MyLog.d(TAG,dir+"鐩綍涓�"+fileName+"鏂囦欢涓嶅瓨鍦�");
+ return null;
+ }
+ try {
+ inputStream = new FileInputStream(file);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ InputStreamReader inputStreamReader = new InputStreamReader(inputStream,"ISO-8859-1");
+ BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+ while((lineTxt = bufferedReader.readLine()) != null){
+
+ stringBuffer.append(lineTxt);
+
+ }
+ inputStreamReader.close();
+ bufferedReader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return stringBuffer;
+ }
/**
*
* @param fromFile 婧愭枃浠惰矾寰勫寘鎷枃浠跺悕锛堢粷瀵硅矾寰勶級
--
Gitblit v1.8.0