فهرست منبع

[功能修复]修复power判断

liuf 1 سال پیش
والد
کامیت
3a68686d96
1فایلهای تغییر یافته به همراه14 افزوده شده و 2 حذف شده
  1. 14 2
      src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgCharngingRunner.java

+ 14 - 2
src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgCharngingRunner.java

@@ -220,10 +220,22 @@ public class MsgCharngingRunner {
         if(port==1){
              voltage = statusJSON.getInteger("voltage");
         }else{
-             voltage = statusJSON.getInteger("voltage");
+
+            voltage = statusJSON.getInteger("voltage_1");
+            if(voltage==null){
+                voltage = statusJSON.getInteger("voltage");
+            }
+        }
+
+        if(port == 1){
+            power = statusJSON.getInteger("power");
+        }else{
+            power = statusJSON.getInteger("power_1");
+            if(power==null){
+                power = statusJSON.getInteger("power");
+            }
         }
 
-        power = statusJSON.getInteger("power");
         if(power==null){
             power = 0;
         }