diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index b3868d0..1d00bfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index b3868d0..1d00bfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 7942090..3184d2c 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -32,6 +32,7 @@ private static File waterImageDir; private static File downloadDir; private static File videoDir; + private static int index = 1; public static void initFileConfig(Context context) { FileUtils.context = context; @@ -132,11 +133,11 @@ static File getWaterImageFile() { //如果第一次初始化文件夹未创建成功,那就调用的时候再单独创建一次文件夹 if (waterImageDir == null) { - File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Demo"); + File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); if (!parentDir.exists()) { boolean mkdir = parentDir.mkdir(); if (mkdir) { - Log.d(TAG, "getWaterImageFile: 创建Demo文件夹"); + Log.d(TAG, "getWaterImageFile: 创建Casic文件夹"); } } waterImageDir = new File(parentDir, "WaterImageFile"); @@ -148,7 +149,8 @@ } } String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); + //index用来区分for循环太快会导致多想图片覆盖压缩问题 + File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + "_" + (index++) + ".png"); if (!imageFile.exists()) { try { imageFile.createNewFile(); diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index b3868d0..1d00bfc 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 7942090..3184d2c 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -32,6 +32,7 @@ private static File waterImageDir; private static File downloadDir; private static File videoDir; + private static int index = 1; public static void initFileConfig(Context context) { FileUtils.context = context; @@ -132,11 +133,11 @@ static File getWaterImageFile() { //如果第一次初始化文件夹未创建成功,那就调用的时候再单独创建一次文件夹 if (waterImageDir == null) { - File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Demo"); + File parentDir = new File(context.getFilesDir().getAbsolutePath(), "Casic"); if (!parentDir.exists()) { boolean mkdir = parentDir.mkdir(); if (mkdir) { - Log.d(TAG, "getWaterImageFile: 创建Demo文件夹"); + Log.d(TAG, "getWaterImageFile: 创建Casic文件夹"); } } waterImageDir = new File(parentDir, "WaterImageFile"); @@ -148,7 +149,8 @@ } } String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()); - File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + ".png"); + //index用来区分for循环太快会导致多想图片覆盖压缩问题 + File imageFile = new File(waterImageDir + File.separator + "IMG_" + timeStamp + "_" + (index++) + ".png"); if (!imageFile.exists()) { try { imageFile.createNewFile(); diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index b7778b5..c542ac3 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -93,6 +93,7 @@ @Override public void onNext(File file) { +// Log.d("TAG", "onNext: " + file.getPath()); //压缩图片 Luban.with(context).load(file.getPath()).ignoreBy(100) .setTargetDir(FileUtils.getImageCompressPath())