From bac1fe7cb379f0372c27659f3c0d1e1596dce3b1 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 29 Oct 2023 15:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8sysapi?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xypower/mpapp/MicroPhotoService.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index b83e1ad8..7b64c8bd 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -772,16 +772,6 @@ public class MicroPhotoService extends Service { boolean isXyPlatform = !mModelName.startsWith("ELE-"); StringBuilder sb = new StringBuilder(); - if (isXyPlatform) { - sb.append("&J_CV=" + SysApi.getChargingVoltage()); // ChargeVol - sb.append("&J_CC=" + SysApi.getChargingCurrent()); // ChargeCurrent - sb.append("&J_CP=" + SysApi.getChargingPower()); // ChargePower: - sb.append("&J_CBV=" + SysApi.getChargingBusVoltage()); // ChargeBusVol - sb.append("&J_BV=" + SysApi.getBatteryVoltage()); // BatVol - sb.append("&J_BC=" + SysApi.getBatteryCurrent()); // BatCurrent - sb.append("&J_BP=" + SysApi.getBatteryPower()); // BattaryPower - sb.append("&J_BBV=" + SysApi.getBatteryBusVoltage()); // BattaryBusVol - } IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); Intent intent = getApplicationContext().registerReceiver(null, intentFilter); @@ -829,6 +819,18 @@ public class MicroPhotoService extends Service { if (css != null && css.size() > 0) { } + + if (isXyPlatform) { + sb.append("&J_CV=" + SysApi.getChargingVoltage()); // ChargeVol + sb.append("&J_CC=" + SysApi.getChargingCurrent()); // ChargeCurrent + sb.append("&J_CP=" + SysApi.getChargingPower()); // ChargePower: + sb.append("&J_CBV=" + SysApi.getChargingBusVoltage()); // ChargeBusVol + sb.append("&J_BV=" + SysApi.getBatteryVoltage()); // BatVol + sb.append("&J_BC=" + SysApi.getBatteryCurrent()); // BatCurrent + sb.append("&J_BP=" + SysApi.getBatteryPower()); // BattaryPower + sb.append("&J_BBV=" + SysApi.getBatteryBusVoltage()); // BattaryBusVol + } + // SysApi.getCpuRate(); return sb.toString();