From aeb8e49b81586c7de22a5c5dc67253a072c15e7f Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 8 May 2025 14:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B5=E6=B1=A0=E7=94=B5?= =?UTF-8?q?=E5=8E=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mpmaster/src/main/cpp/mpmaster.cpp | 2 +- mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mpmaster/src/main/cpp/mpmaster.cpp b/mpmaster/src/main/cpp/mpmaster.cpp index 8f827bc3..55e5accb 100644 --- a/mpmaster/src/main/cpp/mpmaster.cpp +++ b/mpmaster/src/main/cpp/mpmaster.cpp @@ -239,7 +239,7 @@ Java_com_xypower_mpmaster_MpMasterService_getBatteryInfo(JNIEnv *env, jclass cla return NULL; } std::vector data; - data.resize(0, sizeof(int) + sizeof(int) + sizeof(uint64_t)); + data.resize(sizeof(int) + sizeof(int) + sizeof(uint64_t), 0); size_t length = fread(&data[0], 1, data.size(), file); fclose(file); if (length < data.size()) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index ec28fb33..bd3e758e 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -281,12 +281,12 @@ public class AppMaster { try { long[] batteryInfo = MpMasterService.getBatteryInfo(); - String battery = ""; if (batteryInfo.length == 3 && batteryInfo[2] > 0) { - battery = Float.toString(batteryInfo[0] / 1000) + "V/" + Float.toString(batteryInfo[1] / 1000) + "V"; + String battery = Float.toString(batteryInfo[0] / 1000) + "V/" + Float.toString(batteryInfo[1] / 1000) + "V"; + postParams.add(new Pair("battery", battery)); + postParams.add(new Pair("bvTime", Long.toString(batteryInfo[2]))); } - postParams.add(new Pair("battery", battery)); } catch (Exception ex) { ex.printStackTrace(); }