Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/FbxAnalysis

DELL

2024-12-23 50029a1f4454f02e65cf565ec052675115ab93cf

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/FbxAnalysis

# Conflicts:
#	src/main/java/com/whyc/bts/BTS_ChargeData.java
#	src/main/java/com/whyc/bts/BTS_DisChargeData.java

 src/main/java/com/whyc/bts/BTS_ChargeData.java

@@ -43,7 +43,7 @@
     */
    public void readChrFile(String filePath)
    {
        fbsDatas.clear();
        fbsDatas = new ArrayList<BTS_BattData>();
        FileInputStream fis = null;
        try {
            File f = new File(filePath);

 src/main/java/com/whyc/bts/BTS_DisChargeData.java

@@ -45,7 +45,7 @@
     */
    public void readDisFile(String filePath)
    {
        fbsDatas.clear();
        fbsDatas=new ArrayList<BTS_BattData>();
        FileInputStream fis = null;
        try {
            File f = new File(filePath);