From d4ac7ababf0900277d1968db90f5ac6e8f4f3b37 Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 10 Jan 2019 22:46:50 +0800
Subject: [PATCH] =?UTF-8?q?APK=E5=9B=BE=E7=89=87=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=BD=AE=E6=92=AD=E6=B5=81=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=8A=93=E5=8F=96,=20=E4=BC=98=E5=8C=96=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E7=BB=93=E6=9E=9C=E6=8F=90=E5=8F=96=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                           | 4 ++--
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt        | 2 +-
 app/src/main/java/com/duolebo/blyrobot/tools/OcrManager.kt | 4 ++--
 app/src/main/java/com/duolebo/blyrobot/util/AppUtil.kt     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70c94f6..02a0796 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 5749ad5..b5a7d31 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 670bfd0..8ec2a4d 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 f8a0590..32edac9 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"
-- 
2.21.0