From 5eb9a94184ee66367c8acb644ed3005260e0cd46 Mon Sep 17 00:00:00 2001 From: UnknownObject Date: Wed, 9 Nov 2022 19:07:35 +0800 Subject: [PATCH] ocr fix --- .idea/vcs.xml | 3 +++ .../java/com/uns/maincar/constants/Commands.java | 10 +++++----- .../java/com/uns/maincar/gui/MainActivity.java | 14 +++++++++++--- .../meta/x86/generate_cxx_metadata_31_timing.txt | 2 ++ .../meta/x86/metadata_generation_record.json | 6 +++--- .../meta/x86/generate_cxx_metadata_31_timing.txt | 2 ++ .../meta/x86/metadata_generation_record.json | 6 +++--- .../cxx/create_cxx_tasks_31_timing.txt | 13 +++++++++++++ .../cxx/ndk_locator_record_50t213g5.log | 12 ++++++------ 9 files changed, 48 insertions(+), 20 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..609b4fa 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,5 +1,8 @@ + + diff --git a/app/src/main/java/com/uns/maincar/constants/Commands.java b/app/src/main/java/com/uns/maincar/constants/Commands.java index ee33e80..4cbb319 100644 --- a/app/src/main/java/com/uns/maincar/constants/Commands.java +++ b/app/src/main/java/com/uns/maincar/constants/Commands.java @@ -42,11 +42,11 @@ public class Commands public static byte TFT_PAGE_DOWN = (byte) 0xA8; - public static byte ORC_TEXT_SUCCESS = (byte) 0xA9; - public static byte ORC_TEXT_FAILED = (byte) 0xB9; - public static byte ORC_TEXT_LENGTH = (byte) 0xC9; - public static byte ORC_TEXT_DATA = (byte) 0xD9; - public static byte ORC_TEXT_FINISH = (byte) 0xE9; + public static byte OCR_TEXT_SUCCESS = (byte) 0xA9; + public static byte OCR_TEXT_FAILED = (byte) 0xB9; + public static byte OCR_TEXT_LENGTH = (byte) 0xC9; + public static byte OCR_TEXT_DATA = (byte) 0xD9; + public static byte OCR_TEXT_FINISH = (byte) 0xE9; public static final byte RECEIVE_FULL_AUTO = (byte) 0xA0; diff --git a/app/src/main/java/com/uns/maincar/gui/MainActivity.java b/app/src/main/java/com/uns/maincar/gui/MainActivity.java index 11f4875..5db6971 100644 --- a/app/src/main/java/com/uns/maincar/gui/MainActivity.java +++ b/app/src/main/java/com/uns/maincar/gui/MainActivity.java @@ -29,7 +29,6 @@ import androidx.appcompat.app.AppCompatActivity; import com.bkrcl.control_car_video.camerautil.CameraCommandUtil; import com.bkrcl.control_car_video.camerautil.SearchCameraUtil; import com.uns.maincar.R; -import com.uns.maincar.communication.Client; import com.uns.maincar.communication.CommandDecoder; import com.uns.maincar.communication.CommandEncoder; import com.uns.maincar.communication.DataTransferCore; @@ -42,12 +41,12 @@ import com.uns.maincar.constants.GlobalSignType; import com.uns.maincar.cpp_interface.CarLicense; import com.uns.maincar.cpp_interface.EnvTest; import com.uns.maincar.cpp_interface.MainCarAES; +import com.uns.maincar.cpp_interface.OCR; import com.uns.maincar.cpp_interface.QRDecoder; import com.uns.maincar.cpp_interface.ShapeColor; import com.uns.maincar.cpp_interface.TrafficLight; import com.uns.maincar.cpp_interface.TrafficSign; import com.uns.maincar.tools.ImageReleaser; -import com.uns.maincar.cpp_interface.OCR; import com.uns.maincar.tools.OCRDataReleaser; import java.nio.charset.StandardCharsets; @@ -311,7 +310,16 @@ public class MainActivity extends AppCompatActivity // String str = OCR.DecodeImage(currImage); String str = OCR.SelfTest(this); byte[] bstr = str.getBytes(StandardCharsets.UTF_8); - + CommandEncoder encoder = new CommandEncoder(); + dtc_client.Send(encoder.GenerateCommand(Commands.OCR_TEXT_LENGTH, (byte) bstr.length, (byte) 0x00, (byte) bstr.length)); + for (int i = 0; i < bstr.length; i += 2) + { + Sleep(500); + byte data_2 = ((i + 1) >= bstr.length ? 0x00 : bstr[i + 1]); + byte checksum = (byte) ((bstr[i] + data_2) % 0xFF); + byte main = ((i + 1) < bstr.length ? Commands.OCR_TEXT_DATA : Commands.OCR_TEXT_FINISH); + dtc_client.Send(encoder.GenerateCommand(main, bstr[i], data_2, checksum)); + } } private String ByteArray2String(byte[] arr) diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_31_timing.txt b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_31_timing.txt index f569247..66f45cf 100644 --- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_31_timing.txt +++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_31_timing.txt @@ -124,3 +124,5 @@ generate_cxx_metadata create-invalidation-state 11ms generate_cxx_metadata completed in 15ms +# C/C++ build system timings + diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json index 0c1750f..63511b2 100644 --- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json +++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1788125960 + "memoizedHashCode": -1639770073 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 144563755 + "memoizedHashCode": 292919642 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 943363118 + "memoizedHashCode": 1091719005 } ] \ No newline at end of file diff --git a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_31_timing.txt b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_31_timing.txt index 928686e..1956768 100644 --- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_31_timing.txt +++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_31_timing.txt @@ -65,3 +65,5 @@ generate_cxx_metadata create-invalidation-state 11ms generate_cxx_metadata completed in 19ms +# C/C++ build system timings + diff --git a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json index cd8df5e..301ec47 100644 --- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json +++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1799921156 + "memoizedHashCode": -1651565269 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 2143131576 + "memoizedHashCode": -2003479833 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 931567922 + "memoizedHashCode": 1079923809 } ] \ No newline at end of file diff --git a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt index d9917fc..284dfcd 100644 --- a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt +++ b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt @@ -650,3 +650,16 @@ create_cxx_tasks create-initial-cxx-model completed in 91ms create_cxx_tasks completed in 92ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 31ms + create-module-model completed in 35ms + create-module-model + create-cmake-model 33ms + create-module-model completed in 35ms + [gap of 10ms] + create-initial-cxx-model completed in 88ms +create_cxx_tasks completed in 89ms + diff --git a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log index 9929c43..18d761c 100644 --- a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log +++ b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1214542005 + "memoizedHashCode": -1066186118 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -422353902 + "memoizedHashCode": -273998015 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 282107291 + "memoizedHashCode": 430463178 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 2144921361 + "memoizedHashCode": -2001690048 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1252231779 + "memoizedHashCode": 1400587666 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1588211998 + "memoizedHashCode": 1736567885 } ] \ No newline at end of file