diff --git a/app/build.gradle b/app/build.gradle index 70c94f6aa244da45673de4a42331cd28a68f9997..02a07965b61f26e9f239783a896ad358a24af4ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.duolebo.bylrobot" minSdkVersion 15 targetSdkVersion 22 - versionCode 20 - versionName "1.6.2" + versionCode 23 + versionName "1.6.3" } signingConfigs { diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt index 5749ad58cdd780b1bc6032f2dec7a225657c414f..b5a7d3186776252fef72eed1a0ab1a58af541dc1 100644 --- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt +++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt @@ -441,7 +441,7 @@ class Task : Thread, IAppBaseCallback { private fun imageOcrToNumber() { val channelArr = this.reportJson.optJSONArray("channels") - for ( i in 0..channelArr.length()) { + for ( i in 0 until channelArr.length()) { try { val channelJson = channelArr.optJSONObject(i) var imagePath = this.taskPath + "/" + channelJson.optString("channelImage") diff --git a/app/src/main/java/com/duolebo/blyrobot/tools/OcrManager.kt b/app/src/main/java/com/duolebo/blyrobot/tools/OcrManager.kt index 670bfd0522114454c25d621c3c72455af35bcc4f..8ec2a4d89deb0b7375d1e5872aae8e823bcc3fcc 100644 --- a/app/src/main/java/com/duolebo/blyrobot/tools/OcrManager.kt +++ b/app/src/main/java/com/duolebo/blyrobot/tools/OcrManager.kt @@ -70,7 +70,7 @@ class OcrManager { val num = result.getInt("words_result_num") if (wordsResult != null && num > 0) { val len = wordsResult.length() - for ( i in 0..len) { + for ( i in 0 until len) { val wordsObject = wordsResult.getJSONObject(i) try { val rawWords = wordsObject.getString("words") @@ -79,7 +79,7 @@ class OcrManager { val p = Pattern.compile(regEx) val m = p.matcher(rawWords) val newWords = m.replaceAll("").trim() - if (newWords.length == 11) { + if (newWords.length == 10) { words = newWords break } diff --git a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt index f8a0590f0d40d9a7cfd71d610fa7d2e595e7a40d..32edac905958b2e86044b937a0075da4095611cf 100644 --- a/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt +++ b/app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt @@ -100,7 +100,7 @@ object AppUtil { val bitmap = BitmapFactory.decodeFile(imagePath) try { val height = bitmap.height - val cropBitmap = Bitmap.createBitmap(bitmap, 0, height - 100, 1024, 100) + val cropBitmap = Bitmap.createBitmap(bitmap, 0, height - 100, bitmap.width, 100) val index = imagePath.lastIndexOf('.') val partName = imagePath.substring(0, index) val newPath = partName + "_ocr.jpg"