From 802dca6731294c970e8adb81646ea7ecebf91fbd Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 22 十一月 2019 09:56:06 +0800
Subject: [PATCH] 编辑电池组信息时改变当前电池组线程状态，并且添加电池组充放电线程记录
---
platforms/android/app/src/main/java/com/socket/BattDataThread.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/socket/BattDataThread.java b/platforms/android/app/src/main/java/com/socket/BattDataThread.java
index 6d51115..31c2f08 100644
--- a/platforms/android/app/src/main/java/com/socket/BattDataThread.java
+++ b/platforms/android/app/src/main/java/com/socket/BattDataThread.java
@@ -22,6 +22,7 @@
* 鐢垫睜缁勭粍鎿嶄綔鐩稿叧绫�
*/
public class BattDataThread extends Thread{
+ public static final int TESTTYPE_NULL = 0; //
public static final int TESTTYPE_CHRTEST = 2; //鍏呯數娴嬭瘯
public static final int TESTTYPE_DISTEST = 3; //鏀剧數娴嬭瘯
public static final int TESTTYPE_RESTEST = 5; //鍐呴樆娴嬭瘯
@@ -33,17 +34,17 @@
public Handler mSocketHandler = null;
private CommSockClientThread clientThread = null;
- public boolean isInstall = false; //鏄惁瀹夎
- public int battIndex = 1; //鐢垫睜缁処D 榛樿鐢垫睜缁処D
- public Concentrator_Param param; //姹囬泦鍣ㄥ弬鏁�
- public Concentrator_State state; //姹囬泦鍣ㄧ姸鎬�
+ public boolean isInstall = false; //鏄惁瀹夎
+ public int battIndex = 1; //鐢垫睜缁処D 榛樿鐢垫睜缁処D
+ public Concentrator_Param param; //姹囬泦鍣ㄥ弬鏁�
+ public Concentrator_State state; //姹囬泦鍣ㄧ姸鎬�
public DBHelper dbHelper;
public WebView webView;
public Date lastUpdateTime = new Date(); //涓婁竴娆¤幏鍙栨暟鎹椂闂�
- public boolean isOutTime = true; //閫氳鏄惁瓒呮椂 瓒呮椂閲嶈繛鏃朵細閲嶆柊鑾峰彇璁惧鐨勭郴缁熷弬鏁�
-
+ public boolean isOutTime = true; //閫氳鏄惁瓒呮椂 瓒呮椂閲嶈繛鏃朵細閲嶆柊鑾峰彇璁惧鐨勭郴缁熷弬鏁�
+ public long loseTimeLong = 0; //鏂紑杩炴帴鏃堕暱
public BattDataThread(int battIndex, DBHelper dbHelper,WebView webView){
this.webView = webView;
@@ -52,6 +53,7 @@
param = new Concentrator_Param();
state = new Concentrator_State();
clientThread = CommSockClientThread.createClientThread(); //涓插彛閫氳绾跨▼ //姣忎釜鐢垫睜缁勯�氱敤鍚屼竴涓覆鍙ｇ嚎绋�
+
BattResDataRecordThread battResDataRecordThread = new BattResDataRecordThread(this,dbHelper);
battResDataRecordThread.start();
@@ -125,19 +127,21 @@
while(true){
try {
- //Log.e(TAG, "run: &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&install" + isInstall+"\tOutTime"+isOutTime);
+ //Log.e(TAG, "run: &&&&&&&&&&&&&&&&"+battIndex+"&&&&&&&&&&&&&&&&&&&&&&&&&&&install" + isInstall+"\tOutTime"+isOutTime);
if(isInstall){
//濡傛灉褰撳墠鐢垫睜缁勫凡瀹夎鍒欏疄鏃惰幏鍙栧綋鍓嶇數姹犵粍鐨勫崟浣撲俊鎭�
if( isOutTime ){
- //瓒呮椂涔嬪悗鍙幏鍙栧綋鍓嶇殑绯荤粺鍙傛暟
- readSystemParam(""); //璇诲彇绯荤粺鍙傛暟
+ if(runCount %15 == 0) {
+ //瓒呮椂涔嬪悗鍙幏鍙栧綋鍓嶇殑绯荤粺鍙傛暟
+ readSystemParam(""); //璇诲彇绯荤粺鍙傛暟
+ }
}else{
if(runCount %15 == 0){
//璇诲彇绯荤粺鐘舵��
readSystemState("");
}
- if(runCount % 15 == 0){
+ if(runCount % 20 == 0){
int maxCount = (int)Math.ceil((double)state.monCount/100); //鏈�澶氶渶瑕佽鍙栨鏁�
int monindex = monRCount % maxCount; //鍗曚綋绱㈠紩
//璇诲彇鍗曚綋鐢靛帇
@@ -155,14 +159,12 @@
}
runCount ++;
nowTime = new Date();
- long timeCount = (nowTime.getTime() - lastUpdateTime.getTime())/1000;
- if(timeCount > 60){
+ loseTimeLong = (nowTime.getTime() - lastUpdateTime.getTime())/1000;
+ if(loseTimeLong > 60){
isOutTime = true; //60绉掓湭閫氳鍒ゅ畾涓洪�氳瓒呮椂
}else{
isOutTime = false;
}
-
-
sleep(200);
} catch (Exception e) {
@@ -170,6 +172,7 @@
}
}
}
+
//鑾峰彇绯荤粺鍙傛暟
public void readSystemParam(String method){
@@ -235,6 +238,8 @@
Message childMsg = clientThread.mHandler.obtainMessage();
childMsg.obj = model;
+ childMsg.what = isInstall?1:0;
+ Log.e(TAG, battIndex+"sendMessageToSocketClient: isStall"+ isInstall);
return (clientThread.mHandler.sendMessage(childMsg));
}
--
Gitblit v1.9.1