Skip to content

Commit cd2cba4

Browse files
committed
fix qrcode generate, fix commons-io
1 parent b136a45 commit cd2cba4

2 files changed

Lines changed: 21 additions & 17 deletions

File tree

src/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ ANDROIDX_RECYCLERVIEW_VERSION=1.2.1
3535
ANDROIDX_MATERIAL_VERSION=1.4.0
3636
ANDROIDX_MULTIDEX_VERSION=2.0.1
3737
FASTJSON_VERSION=1.2.79
38-
COMMON_IO_VERSION=2.11.0
38+
COMMON_IO_VERSION=2.6.0
3939
ANDROIDX_SUPPORT_V4_VERSION=1.0.0
4040
ANDROIDX_SUPPORT_CORE_UTILS_VERSION=1.0.0

src/shared/src/main/java/com/alipay/hulu/shared/node/action/OperationExecutor.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -731,24 +731,28 @@ public void run() {
731731
opContext.notifyOnFinish(new Runnable() {
732732
@Override
733733
public void run() {
734-
// 生成二维码
735-
Bitmap bitmap = BitmapUtil.generateCode(qrCode, format, 512, Color.WHITE, Color.BLACK);
736-
737-
File targetDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
738-
targetDir = new File(targetDir, "solopi");
739-
targetDir.mkdir();
740-
File saveImg = new File(targetDir, "image-" + System.currentTimeMillis() + ".jpg");
741734
try {
742-
FileOutputStream stream = new FileOutputStream(saveImg);
743-
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
744-
stream.flush();
745-
stream.close();
746-
} catch (IOException e) {
747-
LogUtil.e(TAG, "Fail to export to " + saveImg);
748-
}
735+
// 生成二维码
736+
Bitmap bitmap = BitmapUtil.generateCode(qrCode, format, 512, Color.WHITE, Color.BLACK);
737+
738+
File targetDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
739+
targetDir = new File(targetDir, "solopi");
740+
targetDir.mkdir();
741+
File saveImg = new File(targetDir, "image-" + System.currentTimeMillis() + ".jpg");
742+
try {
743+
FileOutputStream stream = new FileOutputStream(saveImg);
744+
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream);
745+
stream.flush();
746+
stream.close();
747+
} catch (IOException e) {
748+
LogUtil.e(TAG, "Fail to export to " + saveImg);
749+
}
749750

750-
BitmapUtil.notifyNewImage(saveImg);
751-
MiscUtil.sleep(500);
751+
BitmapUtil.notifyNewImage(saveImg);
752+
MiscUtil.sleep(500);
753+
} catch (Exception e) {
754+
LogUtil.w(TAG, "Fail to generate qr code", e);
755+
}
752756
}
753757
});
754758
return true;

0 commit comments

Comments
 (0)