lizhanwei
2020-02-10 c8e28803082ae89fba714c893402064757d8ece1
修改二进制文件读取方式,编码为ISO-8859-1
2个文件已修改
33 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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());
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 源文件路径包括文件名(绝对路径)