From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/src/com/fgkj/dao/BattTestData.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 1c03d83..fbafbec 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -121,9 +121,10 @@
f = f.getParentFile();
}
- jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.jar"; //涓荤▼搴忎腑jar鐨勭洰褰�
+ jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.exe"; //涓荤▼搴忎腑exe鐨勭洰褰�
//strcmd = "cmd /c start "+batPath;
strcmd = ("cmd /c start ")+jarPath.replaceAll(" ", "\" \""); //淇缁濆璺緞涓瓨鍦ㄧ┖鏍兼椂鎵ц涓嶆垚鍔焍ug
+ System.out.println(strcmd);
Process child = null;
InputStream in = null;
try {
@@ -260,13 +261,45 @@
return stop_type;
}
//璁惧鐘舵�佸彉鎹㈠搴斿叧绯�
- public static String getFbsdev_Statechange(int state){
- String state_name="鍋滄";
- switch(state){
- case 0:state_name="鍋滄";break;
- case 1:state_name="鏀剧數";break;
- case 2:state_name="鍏呯數";break;
- }
+ public static String getFbsdev_Statechange(int eve_type,int state){
+ String state_name="鏈煡";
+ if(eve_type==0){
+ if(state==0){
+ state_name="鍦ㄧ嚎鐩戞祴";
+ }else if(state==1){
+ state_name="鏀剧數娴嬭瘯";
+ }else if(state==2){
+ state_name="鍏呯數娴嬭瘯";
+ }else if(state==3){
+ state_name="鍗囧帇缁埅";
+ }
+ }else if(eve_type==11){
+ if(state==0){
+ state_name="姝ｅ父";
+ }else if(state==1){
+ state_name="鏁呴殰";
+ }
+ }else if(eve_type==12){
+ if(state==0){
+ state_name="鍦ㄧ嚎";
+ }else if(state==1){
+ state_name="绂荤嚎";
+ }
+ }else if(eve_type==20){
+ state_name="0x"+Integer.toHexString(state);
+ }
return state_name;
}
+
+ //璁惧鐘舵�佸彉鎹㈠搴攅ve_type
+ public static String getEve_type_name(int eve_type){
+ String eve_type_name="鏈煡";
+ switch(eve_type){
+ case 0:eve_type_name="BTS宸ヤ綔鐘舵��";break;
+ case 11:eve_type_name="SD鍗℃晠闅�";break;
+ case 12:eve_type_name="鐢垫睜绂荤嚎鐘舵��";break;
+ case 20:eve_type_name="DCDC妯″潡鍛婅鐘舵��";break;
+ }
+ return eve_type_name;
+ }
}
--
Gitblit v1.9.1