内部系统数据的key和osd统一

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -44,6 +44,7 @@ import com.dev.devapi.api.SysApi;
 
 import java.io.File;
 import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -805,16 +806,16 @@ public class MicroPhotoService extends Service {
 
         float bcaVal = (bca < 0) ? ((-bca)/1000000000) : (bca / 1000000000);
 
-        sb.append("&J_BC=" + Float.toString(bcaVal));
-        sb.append("&J_BV=" + Float.toString(((float)bv) / 1000));
-        sb.append("&J_BP=" + level);
-        sb.append("&J_BS=" + scale);
-        sb.append("&J_BCS=" + isCahrging);
+        sb.append("&BC=" + Float.toString(bcaVal));
+        sb.append("&BV=" + Float.toString(((float)bv) / 1000));
+        sb.append("&BP=" + level);
+        sb.append("&BS=" + scale);
+        sb.append("&CS=" + isCahrging);
 
         ConnectivityManager cm = (ConnectivityManager)getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
         boolean isMetered = cm.isActiveNetworkMetered();
 
-        sb.append("&J_ConnState=" + (isMetered ? "1" : "0"));
+        sb.append("&NS=" + (isMetered ? "1" : "0"));
 
         final TelephonyManager telephonyManager = (TelephonyManager) getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
 
@@ -822,18 +823,19 @@ public class MicroPhotoService extends Service {
         // List<CellSignalStrength> css = ss.getCellSignalStrengths();
 
         int signalLevel = ss.getLevel();
-        sb.append("&J_Signal4G=" + signalLevel);
-        sb.append("&J_Signal2G=" + signalLevel);
+        sb.append("&Signal4G=" + signalLevel);
+        sb.append("&Signal2G=" + signalLevel);
+        sb.append("&SL=" + signalLevel);
 
         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
+            sb.append("&CV=" + SysApi.getChargingVoltage() / 200.0);      // ChargeVol  *5/1000
+            sb.append("&CC=" + SysApi.getChargingCurrent());     // ChargeCurrent
+            sb.append("&CP=" + SysApi.getChargingPower());        // ChargePower:
+            sb.append("&CBV=" + SysApi.getChargingBusVoltage());        // ChargeBusVol
+            sb.append("&BV=" + SysApi.getBatteryVoltage() * 3.0 / 1000.0);       // BatVol
+            sb.append("&BC=" + SysApi.getBatteryCurrent());       // BatCurrent
+            sb.append("&BP=" + SysApi.getBatteryPower());         // BattaryPower
+            sb.append("&BBV=" + SysApi.getBatteryBusVoltage());   // BattaryBusVol
         }
 
         // SysApi.getCpuRate();