fixed bugs and release version 0.0.5

baolanlequang · Feb 4, 2022 · 33fe781 · 33fe781
1 parent aa12aa2
commit 33fe781
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/JcampConverter/JcampConverter/src/main/java/com/baolan2005/jcampconverter/Jcamp.kt b/JcampConverter/JcampConverter/src/main/java/com/baolan2005/jcampconverter/Jcamp.kt
@@ -307,20 +307,17 @@ class Jcamp {
     private fun scanner(strVal: String): ArrayList<String> {
         var result = ArrayList<String>()
 
-
         var tmpStr = ""
-        val scanStr = strVal
 
         var startPoint = -1
 
-        for ((idx, c) in scanStr.withIndex()) {
-            if (idx == startPoint-1) {
+        for ((idx, c) in strVal.withIndex()) {
+            if (idx == startPoint - 1) {
                 continue
             }
             if (c.isNumberic() || c.equals('.', true)) {
                 tmpStr = tmpStr.plus(c)
-            }
-            else {
+            } else {
                 if (tmpStr != "") {
                     tmpStr = tmpStr.trim()
                     result.add(tmpStr)
@@ -330,35 +327,33 @@ class Jcamp {
                 val charString = c.toString()
                 if (Constants.DUP.containsKey(charString)) {
                     var nextChars = ""
-                    if (idx < scanStr.length - 1) {
-                        startPoint = idx+1
-                        while (scanStr[startPoint].isNumberic()) {
-                            nextChars = nextChars.plus(scanStr[idx+1])
+                    if (idx < strVal.length - 1) {
+                        startPoint = idx + 1
+                        while (strVal[startPoint].isNumberic()) {
+                            nextChars = nextChars.plus(strVal[idx + 1])
                             startPoint += 1
                         }
                     }
                     val dupVal: Int = Constants.DUP[charString]!!
                     val strDupValFull = "%d%s".format(Locale.getDefault(), dupVal, nextChars)
                     var dupValInt: Int = dupVal
                     try {
-                        strDupValFull.toInt()
-                    }
-                    catch (e: Exception) {
+                        dupValInt = strDupValFull.toInt()
+                    } catch (e: Exception) {
 
                     }
                     //Check DUP
                     for (i in 0 until dupValInt-1) {
                         val lastTmpStr = result.last()
+//                        Log.d("baolanlequang", lastTmpStr)
                         if (!lastTmpStr.isNullOrEmpty()) {
                             result.add(lastTmpStr)
                         }
                     }
-                }
-                else if (Constants.SQZ.containsKey(charString)) {
+                } else if (Constants.SQZ.containsKey(charString)) {
                     val sqzVal = Constants.SQZ[charString]
                     tmpStr = tmpStr.plus(sqzVal)
-                }
-                else {
+                } else {
                     tmpStr = tmpStr.plus(c)
                 }
             }

diff --git a/...in/assets/testdata/test_file_10_failed.dx → .../src/main/assets/testdata/test_file_10.dx b/...in/assets/testdata/test_file_10_failed.dx → .../src/main/assets/testdata/test_file_10.dx
diff --git a/JcampConverter/app/src/main/java/com/baolan2005/jcampconverter/MainActivity.kt b/JcampConverter/app/src/main/java/com/baolan2005/jcampconverter/MainActivity.kt
@@ -9,7 +9,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val input = assets.open("testdata/test_file_10_failed.dx")
+        val input = assets.open("testdata/test_file_20.dx")
 
         val reader = JcampReader(input)
         val jcamp = reader.jcamp