📄 Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.
Android项目升级v1.0.1 输入参数resize改为maxSideLen,与C++项目一致 增加支持mobile rec模型
benjaminwanc009c7e3e55c
diff --git a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/build.gradle b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/build.gradleold mode 100755new mode 100644index 395cd8a..652528d--- a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/build.gradle+++ b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/build.gradle@@ -9,8 +9,8 @@ android {defaultConfig {minSdkVersion 21targetSdkVersion 30- versionCode 1- versionName "1.0"+ versionCode 2+ versionName "1.1"testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"consumerProguardFiles "consumer-rules.pro"diff --git a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/OcrLite.cpp b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/OcrLite.cppold mode 100755new mode 100644index fa980f9..7c462b6--- a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/OcrLite.cpp+++ b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/OcrLite.cpp@@ -67,8 +67,7 @@ OcrResult OcrLite::detect(cv::Mat &src, cv::Rect &originRect, ScaleParam &scale,Logger("---------- step: dbNet getTextBoxes ----------");double startTime = getCurrentTime();- std::vector<TextBox> textBoxes = dbNet.getTextBoxes(src, scale, boxScoreThresh,- boxThresh, unClipRatio);+ std::vector<TextBox> textBoxes = dbNet.getTextBoxes(src, scale, boxScoreThresh, boxThresh, unClipRatio);Logger("TextBoxesSize(%ld)", textBoxes.size());double endDbNetTime = getCurrentTime();double dbNetTime = endDbNetTime - startTime;@@ -96,8 +95,7 @@ OcrResult OcrLite::detect(cv::Mat &src, cv::Rect &originRect, ScaleParam &scale,//Log Anglesfor (int i = 0; i < angles.size(); ++i) {- Logger("angle[%d][index(%d), score(%f), time(%fms)]", i, angles[i].index, angles[i].score,- angles[i].time);+ Logger("angle[%d][index(%d), score(%f), time(%fms)]", i, angles[i].index, angles[i].score, angles[i].time);}//Rotate partImgs@@ -128,17 +126,12 @@ OcrResult OcrLite::detect(cv::Mat &src, cv::Rect &originRect, ScaleParam &scale,for (int i = 0; i < textLines.size(); ++i) {std::vector<cv::Point> boxPoint = std::vector<cv::Point>(4);int padding = originRect.x;//padding conversion- boxPoint[0] = cv::Point(textBoxes[i].boxPoint[0].x - padding,- textBoxes[i].boxPoint[0].y - padding);- boxPoint[1] = cv::Point(textBoxes[i].boxPoint[1].x - padding,- textBoxes[i].boxPoint[1].y - padding);- boxPoint[2] = cv::Point(textBoxes[i].boxPoint[2].x - padding,- textBoxes[i].boxPoint[2].y - padding);- boxPoint[3] = cv::Point(textBoxes[i].boxPoint[3].x - padding,- textBoxes[i].boxPoint[3].y - padding);+ boxPoint[0] = cv::Point(textBoxes[i].boxPoint[0].x - padding, textBoxes[i].boxPoint[0].y - padding);+ boxPoint[1] = cv::Point(textBoxes[i].boxPoint[1].x - padding, textBoxes[i].boxPoint[1].y - padding);+ boxPoint[2] = cv::Point(textBoxes[i].boxPoint[2].x - padding, textBoxes[i].boxPoint[2].y - padding);+ boxPoint[3] = cv::Point(textBoxes[i].boxPoint[3].x - padding, textBoxes[i].boxPoint[3].y - padding);TextBlock textBlock{boxPoint, textBoxes[i].score, angles[i].index, angles[i].score,- angles[i].time, textLines[i].text, textLines[i].charScores,- textLines[i].time,+ angles[i].time, textLines[i].text, textLines[i].charScores, textLines[i].time,angles[i].time + textLines[i].time};textBlocks.emplace_back(textBlock);}diff --git a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/main.cpp b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/main.cppold mode 100755new mode 100644index 19b7c32..8427e74--- a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/main.cpp+++ b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/cpp/src/main.cpp@@ -41,22 +41,27 @@ cv::Mat makePadding(cv::Mat &src, const int padding) {extern "C"JNIEXPORT jobject JNICALL-Java_com_benjaminwan_ocrlibrary_OcrEngine_detect(JNIEnv *env, jobject thiz, jobject input,- jobject output,- jint padding, jint reSize,- jfloat boxScoreThresh, jfloat boxThresh,- jfloat unClipRatio, jboolean doAngle,- jboolean mostAngle) {- Logger("padding(%d),reSize(%d),boxScoreThresh(%f),boxThresh(%f),unClipRatio(%f),doAngle(%d),mostAngle(%d)",- padding, reSize, boxScoreThresh, boxThresh, unClipRatio, doAngle, mostAngle);+Java_com_benjaminwan_ocrlibrary_OcrEngine_detect(JNIEnv *env, jobject thiz, jobject input, jobject output,+ jint padding, jint maxSideLen, jfloat boxScoreThresh, jfloat boxThresh,+ jfloat unClipRatio, jboolean doAngle, jboolean mostAngle) {+ Logger("padding(%d),maxSideLen(%d),boxScoreThresh(%f),boxThresh(%f),unClipRatio(%f),doAngle(%d),mostAngle(%d)",+ padding, maxSideLen, boxScoreThresh, boxThresh, unClipRatio, doAngle, mostAngle);cv::Mat imgRGBA, imgBGR, imgOut;bitmapToMat(env, input, imgRGBA);cv::cvtColor(imgRGBA, imgBGR, cv::COLOR_RGBA2BGR);- cv::Rect originRect(padding, padding, imgBGR.cols, imgBGR.rows);- cv::Mat src = makePadding(imgBGR, padding);+ int originMaxSide = (std::max)(imgBGR.cols, imgBGR.rows);+ int resize;+ if (maxSideLen <= 0 || maxSideLen > originMaxSide) {+ resize = originMaxSide;+ } else {+ resize = maxSideLen;+ }+ resize += 2*padding;+ cv::Rect paddingRect(padding, padding, imgBGR.cols, imgBGR.rows);+ cv::Mat paddingSrc = makePadding(imgBGR, padding);//按比例缩小图像,减少文字分割时间- ScaleParam s = getScaleParam(src, reSize);//例:按长或宽缩放 src.cols=不缩放,src.cols/2=长度缩小一半- OcrResult ocrResult = ocrLite->detect(src, originRect, s, boxScoreThresh, boxThresh,+ ScaleParam s = getScaleParam(paddingSrc, resize);//例:按长或宽缩放 src.cols=不缩放,src.cols/2=长度缩小一半+ OcrResult ocrResult = ocrLite->detect(paddingSrc, paddingRect, s, boxScoreThresh, boxThresh,unClipRatio, doAngle, mostAngle);cv::cvtColor(ocrResult.boxImg, imgOut, cv::COLOR_BGR2RGBA);@@ -69,14 +74,14 @@ extern "C" JNIEXPORT jdouble JNICALLJava_com_benjaminwan_ocrlibrary_OcrEngine_benchmark(JNIEnv *env, jobject thiz, jobject input,jint loop) {int padding = 50;- int reSize = 0;+ int paddingRect= 0;float boxScoreThresh = 0.6;float boxThresh = 0.3;float unClipRatio = 2.0;bool doAngle = true;bool mostAngle = true;- LOGI("padding(%d),reSize(%d),boxScoreThresh(%f),boxThresh(%f),unClipRatio(%f),doAngle(%d),mostAngle(%d)",- padding, reSize, boxScoreThresh, boxThresh, unClipRatio, doAngle, mostAngle);+ LOGI("padding(%d),paddingRect(%d),boxScoreThresh(%f),boxThresh(%f),unClipRatio(%f),doAngle(%d),mostAngle(%d)",+ padding, paddingRect, boxScoreThresh, boxThresh, unClipRatio, doAngle, mostAngle);cv::Mat imgRGBA, imgBGR, imgOut;bitmapToMat(env, input, imgRGBA);cv::cvtColor(imgRGBA, imgBGR, cv::COLOR_RGBA2BGR);@@ -86,8 +91,7 @@ Java_com_benjaminwan_ocrlibrary_OcrEngine_benchmark(JNIEnv *env, jobject thiz, jScaleParam s = getScaleParam(src, src.cols);//例:按长或宽缩放 src.cols=不缩放,src.cols/2=长度缩小一半LOGI("=====warmup=====");- OcrResult result = ocrLite->detect(src, originRect, s,- boxScoreThresh, boxThresh,+ OcrResult result = ocrLite->detect(src, originRect, s, boxScoreThresh, boxThresh,unClipRatio, doAngle, mostAngle);LOGI("dbNetTime(%f) detectTime(%f)\n", result.dbNetTime, result.detectTime);double dbTime = 0.0f;@@ -95,8 +99,7 @@ Java_com_benjaminwan_ocrlibrary_OcrEngine_benchmark(JNIEnv *env, jobject thiz, jint loopCount = loop;for (int i = 0; i < loopCount; ++i) {LOGI("=====loop:%d=====", i + 1);- OcrResult ocrResult = ocrLite->detect(src, originRect, s,- boxScoreThresh, boxThresh,+ OcrResult ocrResult = ocrLite->detect(src, originRect, s, boxScoreThresh, boxThresh,unClipRatio, doAngle, mostAngle);LOGI("dbNetTime(%f) detectTime(%f)\n", ocrResult.dbNetTime, ocrResult.detectTime);dbTime += ocrResult.dbNetTime;diff --git a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/java/com/benjaminwan/ocrlibrary/OcrEngine.kt b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/java/com/benjaminwan/ocrlibrary/OcrEngine.ktold mode 100755new mode 100644index 3a1467d..c345314--- a/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/java/com/benjaminwan/ocrlibrary/OcrEngine.kt+++ b/android/BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/java/com/benjaminwan/ocrlibrary/OcrEngine.kt@@ -15,7 +15,7 @@ class OcrEngine(context: Context) {context.assets, numThread,"ch_ppocr_mobile_v2.0_det_infer.onnx","ch_ppocr_mobile_v2.0_cls_infer.onnx",- "ch_ppocr_server_v2.0_rec_infer.onnx",+ "ch_ppocr_mobile_v2.0_rec_infer.onnx","ppocr_keys_v1.txt")if (!ret) throw IllegalArgumentException()@@ -28,9 +28,9 @@ class OcrEngine(context: Context) {var doAngle: Boolean = truevar mostAngle: Boolean = true- fun detect(input: Bitmap, output: Bitmap, reSize: Int) =+ fun detect(input: Bitmap, output: Bitmap, maxSideLen: Int) =detect(- input, output, padding, reSize,+ input, output, padding, maxSideLen,boxScoreThresh, boxThresh,unClipRatio, doAngle, mostAngle)@@ -42,7 +42,7 @@ class OcrEngine(context: Context) {): Booleanexternal fun detect(- input: Bitmap, output: Bitmap, padding: Int, reSize: Int,+ input: Bitmap, output: Bitmap, padding: Int, maxSideLen: Int,boxScoreThresh: Float, boxThresh: Float,unClipRatio: Float, doAngle: Boolean, mostAngle: Boolean): OcrResultdiff --git a/android/BaiPiaoOcrAndroidOnnx/README.md b/android/BaiPiaoOcrAndroidOnnx/README.mdold mode 100755new mode 100644index f8fda45..1065ab3--- a/android/BaiPiaoOcrAndroidOnnx/README.md+++ b/android/BaiPiaoOcrAndroidOnnx/README.md@@ -19,7 +19,7 @@ onnxruntime框架[https://github.com/microsoft/onnxruntime](https://github.com/m* det模型用于分割文字块,有两种模型(server和mobile),其中server体积大且较慢但效果好,mobile体积小且较快但效果差点。* cls模型用于检测文字方向,只有一种模型-* rec模型用于文字识别,虽然有两种模型(server和mobile),但mobile由于转换失败,目前只有server模型。未来转换工具成熟后可以直接支持mobile模型。+* rec模型用于文字识别,有两种模型(server和mobile),其中server体积大且较慢但效果好,mobile体积小且较快但效果差点。### 模型下载@@ -28,9 +28,10 @@ onnxruntime框架[https://github.com/microsoft/onnxruntime](https://github.com/m```BaiPiaoOcrAndroidOnnx/OcrLibrary/src/main/assets├── ch_ppocr_mobile_v2.0_cls_infer.onnx- ├── ch_ppocr_mobile_v2.0_det_infer.onnx 二选一- ├── ch_ppocr_server_v2.0_det_infer.onnx 二选一- ├── ch_ppocr_server_v2.0_rec_infer.onnx+ ├── ch_ppocr_mobile_v2.0_det_infer.onnx det二选一+ ├── ch_ppocr_server_v2.0_det_infer.onnx det二选一+ ├── ch_ppocr_mobile_v2.0_rec_infer.onnx rec二选一+ ├── ch_ppocr_server_v2.0_rec_infer.onnx rec二选一└── ppocr_keys_v1.txt```* 代码中配置使用哪个模型@@ -40,7 +41,7 @@ val ret = init(context.assets, numThread,"ch_ppocr_mobile_v2.0_det_infer.onnx","ch_ppocr_mobile_v2.0_cls_infer.onnx",- "ch_ppocr_server_v2.0_rec_infer.onnx",+ "ch_ppocr_mobile_v2.0_rec_infer.onnx","ppocr_keys_v1.txt")```@@ -56,7 +57,7 @@ val ret = init(### 编译说明-1. AndroidStudio 4.1或以上+1. AndroidStudio 4.1.2或以上2. NDK3. cmake 3.4.1或以上4. 下载opencv-3.4.10-android-sdk-static-lite.7z,[下载地址](https://gitee.com/benjaminwan/ocr-lite-android-onnx/releases/v1.0.0.20201022)diff --git a/android/BaiPiaoOcrAndroidOnnx/app/build.gradle b/android/BaiPiaoOcrAndroidOnnx/app/build.gradleold mode 100755new mode 100644index 8f23f66..4178ec9--- a/android/BaiPiaoOcrAndroidOnnx/app/build.gradle+++ b/android/BaiPiaoOcrAndroidOnnx/app/build.gradle@@ -20,8 +20,8 @@ android {applicationId "com.benjaminwan.ocr.onnx"minSdkVersion 21targetSdkVersion 30- versionCode 1- versionName "1.0.0"+ versionCode 2+ versionName "1.0.1"signingConfig signingConfigs.ocrtestInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"}diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/CameraActivity.kt b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/CameraActivity.ktold mode 100755new mode 100644index 4bf1b3c..e53ca21--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/CameraActivity.kt+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/CameraActivity.kt@@ -51,11 +51,11 @@ class CameraActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeekpaddingSeekBar.setOnSeekBarChangeListener(this)boxScoreThreshSeekBar.setOnSeekBarChangeListener(this)boxThreshSeekBar.setOnSeekBarChangeListener(this)- scaleSeekBar.setOnSeekBarChangeListener(this)+ maxSideLenSeekBar.setOnSeekBarChangeListener(this)scaleUnClipRatioSeekBar.setOnSeekBarChangeListener(this)viewFinder = findViewById(R.id.viewFinder)cameraLensView.postDelayed({- updateScale(100)+ updateMaxSideLen(100)}, 500)}@@ -96,10 +96,10 @@ class CameraActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeekR.id.detectBtn -> {val width = cameraLensView.measuredWidth * 9 / 10val height = cameraLensView.measuredHeight * 9 / 10- val scale = scaleSeekBar.progress.toFloat() / 100.toFloat()+ val ratio = maxSideLenSeekBar.progress.toFloat() / 100.toFloat()val maxSize = max(width, height)- val reSize = (scale * maxSize).toInt()- detect(reSize)+ val maxSideLen = (ratio * maxSize).toInt()+ detect(maxSideLen)}R.id.resultBtn -> {val result = ocrResult ?: return@@ -123,8 +123,8 @@ class CameraActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeekoverride fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {seekBar ?: returnwhen (seekBar.id) {- R.id.scaleSeekBar -> {- updateScale(progress)+ R.id.maxSideLenSeekBar -> {+ updateMaxSideLen(progress)}R.id.paddingSeekBar -> {updatePadding(progress)@@ -149,14 +149,14 @@ class CameraActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeekoverride fun onStopTrackingTouch(seekBar: SeekBar?) {}- private fun updateScale(progress: Int) {+ private fun updateMaxSideLen(progress: Int) {val width = cameraLensView.measuredWidth * 9 / 10val height = cameraLensView.measuredHeight * 9 / 10- val scale = progress.toFloat() / 100.toFloat()+ val ratio = progress.toFloat() / 100.toFloat()val maxSize = max(width, height)- val reSize = (scale * maxSize).toInt()- Logger.i("======$width,$height,$scale,$maxSize,$reSize")- scaleTv.text = "Size:$reSize(${scale * 100}%)"+ val maxSideLen = (ratio * maxSize).toInt()+ Logger.i("======$width,$height,$ratio,$maxSize,$maxSideLen")+ maxSideLenTv.text = "MaxSideLen:$maxSideLen(${ratio * 100}%)"}private fun updatePadding(progress: Int) {diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/GalleryActivity.kt b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/GalleryActivity.ktold mode 100755new mode 100644index 2803873..5fe5405--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/GalleryActivity.kt+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/GalleryActivity.kt@@ -47,7 +47,7 @@ class GalleryActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeepaddingSeekBar.setOnSeekBarChangeListener(this)boxScoreThreshSeekBar.setOnSeekBarChangeListener(this)boxThreshSeekBar.setOnSeekBarChangeListener(this)- scaleSeekBar.setOnSeekBarChangeListener(this)+ maxSideLenSeekBar.setOnSeekBarChangeListener(this)scaleUnClipRatioSeekBar.setOnSeekBarChangeListener(this)doAngleSw.setOnCheckedChangeListener { _, isChecked ->App.ocrEngine.doAngle = isChecked@@ -71,10 +71,10 @@ class GalleryActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSee}R.id.detectBtn -> {val img = selectedImg ?: return- val scale = scaleSeekBar.progress.toFloat() / 100.toFloat()+ val ratio = maxSideLenSeekBar.progress.toFloat() / 100.toFloat()val maxSize = max(img.width, img.height)- val reSize = (scale * maxSize).toInt()- detect(img, reSize)+ val maxSideLen = (ratio * maxSize).toInt()+ detect(img, maxSideLen)}R.id.resultBtn -> {val result = ocrResult ?: return@@ -108,8 +108,8 @@ class GalleryActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeeoverride fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {seekBar ?: returnwhen (seekBar.id) {- R.id.scaleSeekBar -> {- updateScale(progress)+ R.id.maxSideLenSeekBar -> {+ updateMaxSideLen(progress)}R.id.paddingSeekBar -> {updatePadding(progress)@@ -134,15 +134,15 @@ class GalleryActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeeoverride fun onStopTrackingTouch(seekBar: SeekBar?) {}- private fun updateScale(progress: Int) {- val scale = progress.toFloat() / 100.toFloat()+ private fun updateMaxSideLen(progress: Int) {+ val ratio = progress.toFloat() / 100.toFloat()if (selectedImg != null) {val img = selectedImg ?: returnval maxSize = max(img.width, img.height)- val reSize = (scale * maxSize).toInt()- scaleTv.text = "Size:$reSize(${scale * 100}%)"+ val maxSizeLen = (ratio * maxSize).toInt()+ maxSideLenTv.text = "MaxSideLen:$maxSizeLen(${ratio * 100}%)"} else {- scaleTv.text = "Size:0(${scale * 100}%)"+ maxSideLenTv.text = "MaxSideLen:0(${ratio * 100}%)"}}@@ -178,7 +178,7 @@ class GalleryActivity : AppCompatActivity(), View.OnClickListener, SeekBar.OnSeeRequestOptions().skipMemoryCache(true).diskCacheStrategy(DiskCacheStrategy.NONE)Glide.with(this).load(imgUri).apply(options).into(imageView)selectedImg = decodeUri(imgUri)- updateScale(scaleSeekBar.progress)+ updateMaxSideLen(maxSideLenSeekBar.progress)clearLastResult()}}diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/IdCardFrontActivity.kt b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/IdCardFrontActivity.ktold mode 100755new mode 100644index fcf15c3..9b91f7b--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/IdCardFrontActivity.kt+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/java/com/benjaminwan/ocr/onnx/IdCardFrontActivity.kt@@ -137,7 +137,7 @@ class IdCardFrontActivity : AppCompatActivity(), View.OnClickListener {stopBtn.setOnClickListener(this)clearNameBtn.setOnClickListener(this)clearGenderBtn.setOnClickListener(this)- clearNameBtn.setOnClickListener(this)+ clearNationBtn.setOnClickListener(this)clearBirthBtn.setOnClickListener(this)clearAddressBtn.setOnClickListener(this)clearNumberBtn.setOnClickListener(this)@@ -158,7 +158,7 @@ class IdCardFrontActivity : AppCompatActivity(), View.OnClickListener {R.id.clearGenderBtn -> {genderEdit.setText("")}- R.id.clearNameBtn -> {+ R.id.clearNationBtn -> {nationEdit.setText("")}R.id.clearBirthBtn -> {@@ -192,7 +192,7 @@ class IdCardFrontActivity : AppCompatActivity(), View.OnClickListener {numberEdit.isEnabled = !isStartclearNameBtn.isEnabled = !isStartclearGenderBtn.isEnabled = !isStart- clearNameBtn.isEnabled = !isStart+ clearNationBtn.isEnabled = !isStartclearBirthBtn.isEnabled = !isStartclearAddressBtn.isEnabled = !isStartclearNumberBtn.isEnabled = !isStartdiff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_camera.xml b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_camera.xmlold mode 100755new mode 100644index 553c224..541e4d8--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_camera.xml+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_camera.xml@@ -56,16 +56,16 @@android:orientation="horizontal"><TextView- android:id="@+id/scaleTv"+ android:id="@+id/maxSideLenTv"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:text="Size:0(100%)" />+ android:text="MaxSideLen:0(100%)" /><SeekBar- android:id="@+id/scaleSeekBar"+ android:id="@+id/maxSideLenSeekBar"android:layout_width="match_parent"android:layout_height="wrap_content"- android:max="200"+ android:max="100"android:min="10"android:progress="100" />diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_gallery.xml b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_gallery.xmlold mode 100755new mode 100644index 8c12898..654ffc1--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_gallery.xml+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_gallery.xml@@ -28,16 +28,16 @@android:orientation="horizontal"><TextView- android:id="@+id/scaleTv"+ android:id="@+id/maxSideLenTv"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:text="Size:0(100%)" />+ android:text="MaxSideLen:0(100%)" /><SeekBar- android:id="@+id/scaleSeekBar"+ android:id="@+id/maxSideLenSeekBar"android:layout_width="match_parent"android:layout_height="wrap_content"- android:max="200"+ android:max="100"android:min="10"android:progress="100" />diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_idcard_front.xml b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_idcard_front.xmlold mode 100755new mode 100644index 19bab5e..7509e3f--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_idcard_front.xml+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/layout/activity_idcard_front.xml@@ -181,7 +181,7 @@android:textSize="18sp" /><ImageButton- android:id="@+id/cleaNationBtn"+ android:id="@+id/clearNationBtn"android:layout_width="38dp"android:layout_height="38dp"android:layout_marginEnd="2dp"diff --git a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/values/strings.xml b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/values/strings.xmlold mode 100755new mode 100644index e5607d3..07b196a--- a/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/values/strings.xml+++ b/android/BaiPiaoOcrAndroidOnnx/app/src/main/res/values/strings.xml@@ -2,7 +2,6 @@<string name="app_name">BaiPiaoOcrOnnx</string><string name="box_score_thresh">框置信度门限</string>- <string name="min_area">最小区域门限</string><string name="box_un_clip_ratio">框大小倍率</string><string name="app_permission">获取相机权限</string><string name="do_angle">文字方向检测</string>