From 7a2a9a1f6d5e1bc15b9f0454903dd82f5ad716ef Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 11 Jul 2024 14:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/AppMaster.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index b243e340..6480ee0b 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -496,7 +496,7 @@ public class AppMaster { SysApi.reboot(mService.getApplicationContext()); } else if (TextUtils.equals(cmd, CMD_UPLOAD_LOGS)) { String url = jsonObject.optString("url", null); - mService.logger.warning("Recv Upload Log" + url); + mService.logger.warning("Recv Upload Log " + url); int noSpecData = jsonObject.optInt("noSpecData", 0); uploadLogs(url, noSpecData == 0); // uploadMasterLogs(url); @@ -1074,7 +1074,13 @@ public class AppMaster { SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); Date dt = new Date(ts); - final String fileName = mCmdid + "_" + format.format(dt) + ".zip"; + String fileName = ""; + if (paths.size() != 1) { + fileName = mCmdid + "_" + format.format(dt) + ".zip"; + } else { + File file = new File(paths.get(0)); + fileName = mCmdid + "_" + format.format(dt) + "_" + file.getName() + ".zip"; + } final File file = File.createTempFile(fileName, null, new File(appDir)); if (file == null) { return;