From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattTestData.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 3723b1c..8912670 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -1,7 +1,10 @@
package com.fgkj.dao;
public class BattTestData {
-final public static int BATT_MON_COUNT_MAX = 512;
+ final public static int BATT_DISCHARGE=3;//鏀剧數娴嬭瘯
+ final public static int BATT_RES=5;//鍐呴樆娴嬭瘯
+
+ final public static int BATT_MON_COUNT_MAX = 512;
final public static byte BATTDATA_NULL = 0;
final public static byte BATTDATA_FLOAT = 1;
--
Gitblit v1.9.1