From fc82d219f87c06888e9fb42d9f5e69b946e026da Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 06 十二月 2019 10:11:59 +0800
Subject: [PATCH] 修改后台添加开机自启功能
---
platforms/android/app/src/main/java/com/concentrator/Concentrator_State.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 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 0f1ba91..8acf8ae 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
@@ -41,8 +41,8 @@
private double sysversion; //绯荤粺鐗堟湰(0.1)
private int sysstate; //绯荤粺鐘舵�� 0-甯歌妯″紡 1-鍐呴樆妯″紡 2-缂栧潃妯″紡
- private double groupvol; //缁勭鐢靛帇(0.1)
- private double groupcurr; //缁勭鐢垫祦(0.1)
+ private float groupvol; //缁勭鐢靛帇(0.1)
+ private float groupcurr; //缁勭鐢垫祦(0.1)
public int battstate; //鐢垫睜鐘舵�� 0-娴厖 1-鏀剧數 2-鍏呯數
private int currdirection; //鐢垫祦鏂瑰悜 0-鍏呯數 1-鏀剧數
@@ -91,6 +91,11 @@
this.backup7 = state.backup7;
this.backup8 = state.backup8;
this.restestcount = state.restestcount; //鍐呴樆娴嬭瘯娆℃暟
+
+ this.groupvol = groupvol+(float)Math.random()*10; //闅忔満缁勭鐢靛帇
+ this.groupvol = (float)Math.round(groupvol*100)/100;
+ this.groupcurr = groupcurr+(float)Math.random()*5; //闅忔満缁勭鐢垫祦
+ this.groupcurr = (float)Math.round(groupcurr*100)/100;
}
//澶嶅埗鍗曚綋鐢靛帇
@@ -132,12 +137,12 @@
sysversion = ComBase.changeShortToDouble(tmpbuf.getShort())/10; //绯荤粺鐗堟湰
sysstate = ComBase.changeShortToInt(tmpbuf.getShort()); //绯荤粺鐘舵��
- groupvol = ComBase.changeShortToDouble(tmpbuf.getShort())/10; //缁勭鐢靛帇
- groupcurr = ComBase.changeShortToDouble(tmpbuf.getShort())/10; //缁勭鐢垫祦
+ groupvol = (float)ComBase.changeShortToDouble(tmpbuf.getShort())/10; //缁勭鐢靛帇
+ groupcurr = (float)ComBase.changeShortToDouble(tmpbuf.getShort())/10; //缁勭鐢垫祦
battstate = ComBase.changeShortToInt(tmpbuf.getShort()); //鐢垫睜鐘舵��
currdirection = ComBase.changeShortToInt(tmpbuf.getShort()); //鐢垫祦鏂瑰悜
- this.currdirection=1;
- this.battstate = 1;
+ this.currdirection=0;
+ this.battstate = 2;
if(currdirection == 1){
groupcurr = groupcurr *(-1); //鏀瑰彉褰撳墠鐢垫祦鏂瑰悜
}
@@ -155,36 +160,36 @@
return true;
}
- public List<BattAlarmData> makeAlarmData(BattDataThread battDataThread, AlarmParam alarmParam){
- List<BattAlarmData> alarmDatas = new ArrayList<>();
- Concentrator_State state = battDataThread.state;
+ public List<BattAlarmData> makeAlarmData(BattDataThread battDataThread, AlarmParam alarmParam){
+ List<BattAlarmData> alarmDatas = new ArrayList<>();
+ Concentrator_State state = battDataThread.state;
- //鍒ゆ柇缁勭鐢靛帇鍛婅
- AlarmParam.AlarmParamCell groupVol_param = alarmParam.alm_GroupVol.CreateAlarmParamCell(battDataThread.battinf);
- state.groupVol_AlarmData.makeAlarmData(alarmDatas,groupVol_param,state.groupvol);
+ //鍒ゆ柇缁勭鐢靛帇鍛婅
+ AlarmParam.AlarmParamCell groupVol_param = alarmParam.alm_GroupVol.CreateAlarmParamCell(battDataThread.battinf);
+ state.groupVol_AlarmData.makeAlarmData(alarmDatas,groupVol_param,state.groupvol);
- //鍒ゆ柇鐢垫睜鐢垫祦鍛婅
- AlarmParam.AlarmParamCell battCurr_param = alarmParam.alm_BattCurr.CreateAlarmParamCell(battDataThread.battinf);
- state.battCurr_AlarmData.makeAlarmData(alarmDatas,battCurr_param,state.groupcurr);
+ //鍒ゆ柇鐢垫睜鐢垫祦鍛婅
+ AlarmParam.AlarmParamCell battCurr_param = alarmParam.alm_BattCurr.CreateAlarmParamCell(battDataThread.battinf);
+ state.battCurr_AlarmData.makeAlarmData(alarmDatas,battCurr_param,state.groupcurr);
- //鍒ゆ柇鍗曚綋鍛婅
- for(int i=0;i<monCount;i++){
- //鍒ゆ柇鍗曚綋鐢靛帇鍛婅
- AlarmParam.AlarmParamCell monVol_param = alarmParam.alm_MonVol.CreateAlarmParamCell(battDataThread.battinf);
+ //鍒ゆ柇鍗曚綋鍛婅
+ for(int i=0;i<monCount;i++){
+ //鍒ゆ柇鍗曚綋鐢靛帇鍛婅
+ AlarmParam.AlarmParamCell monVol_param = alarmParam.alm_MonVol.CreateAlarmParamCell(battDataThread.battinf);
//Log.e(TAG, "makeAlarmData: monvol 鍛婅鍊糷ig"+monVol_param.alm_high_coe+"\tlow"+monVol_param.alm_low_coe );
state.monVol_AlarmData[i].makeAlarmData(alarmDatas,monVol_param,state.mon_vols[i]);
- //鍒ゆ柇鍗曚綋娓╁害鍛婅
- AlarmParam.AlarmParamCell monTmp_param = alarmParam.alm_MonTmp.CreateAlarmParamCell(battDataThread.battinf);
- state.monTmp_AlarmData[i].makeAlarmData(alarmDatas,monTmp_param,state.mon_tmps[i]);
+ //鍒ゆ柇鍗曚綋娓╁害鍛婅
+ AlarmParam.AlarmParamCell monTmp_param = alarmParam.alm_MonTmp.CreateAlarmParamCell(battDataThread.battinf);
+ state.monTmp_AlarmData[i].makeAlarmData(alarmDatas,monTmp_param,state.mon_tmps[i]);
- //鍒ゆ柇鍗曚綋鍐呴樆鍛婅
- AlarmParam.AlarmParamCell monRes_param = alarmParam.alm_MonRes.CreateAlarmParamCell(battDataThread.battinf);
- state.monRes_AlarmData[i].makeAlarmData(alarmDatas,monRes_param,state.mon_ress[i]);
+ //鍒ゆ柇鍗曚綋鍐呴樆鍛婅
+ AlarmParam.AlarmParamCell monRes_param = alarmParam.alm_MonRes.CreateAlarmParamCell(battDataThread.battinf);
+ state.monRes_AlarmData[i].makeAlarmData(alarmDatas,monRes_param,state.mon_ress[i]);
- }
- return alarmDatas;
- }
+ }
+ return alarmDatas;
+ }
public boolean putMonDataBuffer(ByteBuffer bf,int reg_addr){
if(bf.limit() < BYTE_LEN) {
@@ -321,11 +326,11 @@
this.sysstate = sysstate;
}
- public void setGroupvol(double groupvol) {
+ public void setGroupvol(float groupvol) {
this.groupvol = groupvol;
}
- public void setGroupcurr(double groupcurr) {
+ public void setGroupcurr(float groupcurr) {
this.groupcurr = groupcurr;
}
--
Gitblit v1.9.1