diff --git a/app/build.gradle b/app/build.gradle index e16e390..2f17554 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.uns.maincar" minSdk 26 targetSdk 32 - versionCode 22 - versionName '2.1.1' + versionCode 23 + versionName '2.1.2' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { @@ -18,7 +18,7 @@ android { cppFlags '' } } - versionNameSuffix 'beta' + versionNameSuffix '-beta' } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index ddf77a7..62daf06 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 6bcd1e7..44104e3 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 22, - "versionName": "2.1.1beta", + "versionCode": 23, + "versionName": "2.1.2-beta", "outputFile": "app-release.apk" } ], 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 03d06c9..1c59f3e 100644 --- a/app/src/main/java/com/uns/maincar/gui/MainActivity.java +++ b/app/src/main/java/com/uns/maincar/gui/MainActivity.java @@ -49,7 +49,7 @@ import com.uns.maincar.cpp_interface.TrafficSign; import com.uns.maincar.tools.ImageReleaser; import com.uns.maincar.tools.OCRDataReleaser; -import java.nio.charset.StandardCharsets; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Objects; @@ -309,7 +309,18 @@ public class MainActivity extends AppCompatActivity { // String str = OCR.DecodeImage(currImage); String str = OCR.SelfTest(this); - byte[] b_str = str.getBytes(StandardCharsets.UTF_8); + byte[] b_str; + try + { + b_str = str.getBytes("GBK"); + } + catch (UnsupportedEncodingException e) + { + ToastLog("GBK Encoding is Not Supported", false, true); + CommandEncoder encoder = new CommandEncoder(); + dtc_client.Send(encoder.GenerateCommand(Commands.OCR_TEXT_FAILED, (byte) 0x00, (byte) 0x00, (byte) 0x00)); + return; + } CommandEncoder encoder = new CommandEncoder(); dtc_client.Send(encoder.GenerateCommand(Commands.OCR_TEXT_LENGTH, (byte) b_str.length, (byte) 0x00, (byte) b_str.length)); for (int i = 0; i < b_str.length; i += 2) diff --git a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json index 97a31cd..475adcb 100644 --- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json +++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/arm64-v8a/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 869751759 + "memoizedHashCode": -1562541493 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1944165570 + "memoizedHashCode": -488127682 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -257258793 + "memoizedHashCode": 1605415251 } ] \ No newline at end of file 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 53a7f5a..ad41d7e 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": 143238636 + "memoizedHashCode": -318448305 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 2075928351 + "memoizedHashCode": 1614241410 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1420239582 + "memoizedHashCode": -1881926523 } ] \ No newline at end of file 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 61c62e9..c515b4a 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": 131443440 + "memoizedHashCode": -330243501 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -220471124 + "memoizedHashCode": -682158065 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1432034778 + "memoizedHashCode": -1893721719 } ] \ No newline at end of file diff --git a/opencv/build/intermediates/cxx/abi_configuration_311k5o12.log b/opencv/build/intermediates/cxx/abi_configuration_311k5o12.log index 7479675..a45133d 100644 --- a/opencv/build/intermediates/cxx/abi_configuration_311k5o12.log +++ b/opencv/build/intermediates/cxx/abi_configuration_311k5o12.log @@ -11,6 +11,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1845394284 + "memoizedHashCode": -586898968 } ] \ 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 d6d8842..77830cd 100644 --- a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt +++ b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt @@ -737,3 +737,16 @@ create_cxx_tasks create-initial-cxx-model completed in 94ms create_cxx_tasks completed in 95ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 39ms + create-module-model completed in 42ms + create-module-model + create-cmake-model 38ms + create-module-model completed in 40ms + [gap of 12ms] + create-initial-cxx-model completed in 108ms +create_cxx_tasks completed in 109ms + diff --git a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log index 33ad179..c752051 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": 716822591 + "memoizedHashCode": 255135650 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1509010694 + "memoizedHashCode": 1047323753 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2081495409 + "memoizedHashCode": 1751784946 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -218681339 + "memoizedHashCode": -680368280 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1111370921 + "memoizedHashCode": -1573057862 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -775390702 + "memoizedHashCode": -1237077643 } ] \ No newline at end of file