From d4c7dbd51fa93b0dae3d55f68518a12bb20ed79c Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 23 十一月 2019 11:54:57 +0800
Subject: [PATCH] 修改
---
platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java b/platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java
index fe44114..82dddec 100644
--- a/platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java
+++ b/platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java
@@ -1,7 +1,5 @@
package com.concentrator;
-import android.util.Log;
-
import com.util.ComBase;
import java.nio.ByteBuffer;
@@ -10,6 +8,8 @@
public class Concentrator_State {
+ public static final String TAG = "Concentrator_State";
+
public static final int WORKSTATE_FLOAT = 0; //娴厖
public static final int WORKSTATE_DISCH = 1; //鏀剧數
public static final int WORKSTATE_CHARG = 2; //鍏呯數
@@ -29,8 +29,8 @@
public int test_record_count; //褰撳墠娴嬭瘯娆℃暟(鍖呮嫭鍏呮斁鐢�)
public Integer record_num; //璁板綍绗旀暟
-
public int monCount = 24; //鍗曚綋鏁伴噺
+
private double sysversion; //绯荤粺鐗堟湰(0.1)
private int sysstate; //绯荤粺鐘舵�� 0-甯歌妯″紡 1-鍐呴樆妯″紡 2-缂栧潃妯″紡
@@ -57,6 +57,8 @@
public int min_monnum; //鏈�灏忓崟浣撶數鍘嬬紪鍙�
public double min_monvol; //鏈�灏忓崟浣撶數鍘�
+ public int isOutTime = 0; //鏄惁瓒呮椂
+
//澶嶅埗璁惧鐘舵��
public void cloneSystemState(Concentrator_State state){
this.sysversion = state.sysversion; //绯荤粺鐗堟湰(0.1)
@@ -77,23 +79,24 @@
this.restestcount = state.restestcount; //鍐呴樆娴嬭瘯娆℃暟
}
- //澶嶅埗鍗曚綋娓╁害
- public void cloneMonVol(Concentrator_State state){
- for(int i=0;i<mon_vols.length;i++){
+ //澶嶅埗鍗曚綋鐢靛帇
+ public void cloneMonVol(Concentrator_State state,int index){
+ for(int i=index;i<(index+100) && i<300;i++){
this.mon_vols[i] = state.mon_vols[i]; //鍗曚綋鐢靛帇
}
+ initmonvols();
}
//澶嶅埗鍗曚綋鍗曚綋娓╁害
- public void cloneMonTmp(Concentrator_State state){
- for(int i=0;i<mon_tmps.length;i++){
+ public void cloneMonTmp(Concentrator_State state,int index){
+ for(int i=index;i<(index+100);i++){
this.mon_tmps[i] = state.mon_tmps[i]; //鍗曚綋娓╁害
}
}
//澶嶅埗鍗曚綋鍗曚綋鍐呴樆
- public void cloneMonRes(Concentrator_State state){
- for(int i=0;i<mon_ress.length;i++){
+ public void cloneMonRes(Concentrator_State state,int index){
+ for(int i=index;i<(index +100);i++){
this.mon_ress[i] = state.mon_ress[i]; //鍗曚綋鍐呴樆
}
}
@@ -163,7 +166,6 @@
switch (dataType){
case 1:{
mon_vols[index*100+i] = ComBase.changeShortToDouble(bf.getShort())/1000;
- initmonvols();
}break;
case 2:{
mon_tmps[index*100+i] = ComBase.changeShortToDouble(bf.getShort())/10;
@@ -173,25 +175,29 @@
}break;
}
}
+ if(dataType == 1){
+ initmonvols();
+ }
return true;
}
//缁熻褰撳墠鐢垫睜缁勭殑鏈�鍊�
public void initmonvols(){
- max_monnum = 1;
- max_monvol = mon_vols[0];
- min_monnum = 1;
- min_monvol = mon_vols[0];
- for (int i=0;i<monCount;i++){
- if(mon_vols[i] > max_monvol){
- max_monvol = mon_vols[i];
- max_monnum = i+1;
+ this.max_monnum = 1;
+ this.max_monvol = this.mon_vols[0];
+ this.min_monnum = 1;
+ this.min_monvol = this.mon_vols[0];
+ for (int i=0;i<this.monCount;i++){
+ if(this.mon_vols[i] > this.max_monvol){
+ this.max_monvol = this.mon_vols[i];
+ this.max_monnum = i+1;
}
- if(mon_vols[i]<min_monvol){
- min_monvol = mon_vols[i];
- min_monnum = i+1;
+ if(this.mon_vols[i]<this.min_monvol){
+ this.min_monvol = this.mon_vols[i];
+ this.min_monnum = i+1;
}
}
+ //Log.e(TAG, "initmonvols: 鍒濆鍖栨渶澶ф渶灏忓�糾axmonvol:"+max_monvol+"\tminmonvol:"+min_monvol);
}
public int getBYTE_LEN() {
--
Gitblit v1.9.1