nils/mg4
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 28 Wiki Activity

Count driving only and include charging losses

Browse Source
This commit is contained in:
TCFDONMEZ
2026-10-08 15:51:38 +03:00
parent 050fe84d6a
commit ae036b9d65
16 changed files with 104 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/evsuite/abrp/ChargeSessionTracker.java
+19 -3
View File
@@ -24,6 +24,8 @@ import java.util.UUID;
* reading the database needs to place it on a timeline — but nothing is measured from them.
*/
final class ChargeSessionTracker {
static final double CHARGING_LOSS_PERCENT = 10d;
static final double GRID_ENERGY_FACTOR = 1d + CHARGING_LOSS_PERCENT / 100d;
private static final String PREFS = "charging_sessions_v1";
private static final String ACTIVE = "active";
private static final String LAST = "last_completed";
@@ -67,6 +69,7 @@ final class ChargeSessionTracker {
final Float startSocPercent;
final Float currentSocPercent;
final double energyKwh;
final double gridEnergyKwh;
final double pricePerKwh;
final double totalCost;
final List<Point> points;
@@ -80,8 +83,9 @@ final class ChargeSessionTracker {
this.startSocPercent = startSocPercent;
this.currentSocPercent = currentSocPercent;
this.energyKwh = energyKwh;
this.gridEnergyKwh = gridEnergyKwh(energyKwh);
this.pricePerKwh = pricePerKwh;
this.totalCost = energyKwh * pricePerKwh;
this.totalCost = totalCost(energyKwh, pricePerKwh);
this.points = points;
}
}
@@ -140,6 +144,14 @@ final class ChargeSessionTracker {
return Double.longBitsToDouble(prefs.getLong(PRICE, 0L));
}
static double gridEnergyKwh(double batteryEnergyKwh) {
return batteryEnergyKwh * GRID_ENERGY_FACTOR;
}
static double totalCost(double batteryEnergyKwh, double pricePerKwh) {
return gridEnergyKwh(batteryEnergyKwh) * pricePerKwh;
}
synchronized List<JSONObject> pendingUploads() {
JSONArray array = pendingArray();
List<JSONObject> result = new ArrayList<>();
@@ -264,8 +276,12 @@ final class ChargeSessionTracker {
}
JSONObject json = new JSONObject().put("sessionId", id).put("startedAt", startedAtMs)
.put("endedAt", endedAtMs).put("durationSeconds", activeSeconds())
.put("energyKwh", energyKwh).put("pricePerKwh", pricePerKwh)
.put("totalCost", energyKwh * pricePerKwh).put("curve", curve)
.put("energyKwh", energyKwh)
.put("chargingLossPercent", CHARGING_LOSS_PERCENT)
.put("gridEnergyKwh", gridEnergyKwh(energyKwh))
.put("pricePerKwh", pricePerKwh)
.put("totalCost", totalCost(energyKwh, pricePerKwh))
.put("curve", curve)
.put("meteredSeconds", meteredSeconds)
.put("curveIntervalMs", curveIntervalMs);
if (startSoc != null) json.put("startSocPercent", startSoc);