diff --git a/app/build.gradle b/app/build.gradle index ff41d19..4bacb14 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.uns.maincar" minSdk 26 targetSdk 32 - versionCode 20 - versionName '2.0.0' + versionCode 21 + versionName '2.1.0' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index cad14fc..8aeae00 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 f3d801b..fc8d67b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 20, - "versionName": "2.0.0alpha", + "versionCode": 21, + "versionName": "2.1.0alpha", "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 1ff5758..03d06c9 100644 --- a/app/src/main/java/com/uns/maincar/gui/MainActivity.java +++ b/app/src/main/java/com/uns/maincar/gui/MainActivity.java @@ -87,7 +87,7 @@ public class MainActivity extends AppCompatActivity //串口通信的设备名 private final String SerialPortPath = "/dev/ttyS4"; //通信通道标志，true为Wifi，false为串口 - private boolean CommunicationUsingWifi = true; + private final boolean CommunicationUsingWifi = true; //调试用16进制数组 private final String[] byte_str = { "0x00", "0x01", "0x02", "0x03", "0x04", "0x05", "0x06", "0x07", "0x08", "0x09", "0x0A", "0x0B", "0x0C", "0x0D", "0x0E", "0x0F", 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 66f45cf..aa66802 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 @@ -126,3 +126,9 @@ generate_cxx_metadata completed in 15ms # C/C++ build system timings +# C/C++ build system timings + +# C/C++ build system timings + +# 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 63511b2..6dd88d5 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": -1639770073 + "memoizedHashCode": 434260067 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 292919642 + "memoizedHashCode": -1928017514 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1091719005 + "memoizedHashCode": -1129218151 } ] \ 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 1956768..bc5b80d 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 @@ -67,3 +67,7 @@ generate_cxx_metadata completed in 19ms # C/C++ build system timings +# C/C++ build system timings + +# 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 301ec47..3b11088 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": -1651565269 + "memoizedHashCode": 422464871 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2003479833 + "memoizedHashCode": 70550307 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1079923809 + "memoizedHashCode": -1141013347 } ] \ 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 284dfcd..d961431 100644 --- a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt +++ b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt @@ -663,3 +663,52 @@ create_cxx_tasks create-initial-cxx-model completed in 88ms create_cxx_tasks completed in 89ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 34ms + create-module-model completed in 37ms + create-module-model + create-cmake-model 33ms + create-module-model completed in 35ms + [gap of 12ms] + create-initial-cxx-model completed in 92ms +create_cxx_tasks completed in 94ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 37ms + create-module-model completed in 38ms + create-module-model + create-cmake-model 33ms + create-module-model completed in 36ms + 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 33ms + create-module-model completed in 35ms + create-module-model + create-cmake-model 36ms + create-module-model completed in 37ms + create-initial-cxx-model completed in 86ms +create_cxx_tasks completed in 86ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model + create-cmake-model 36ms + create-module-model completed in 39ms + create-module-model + create-cmake-model 34ms + create-module-model completed in 36ms + create-initial-cxx-model completed in 87ms +create_cxx_tasks completed in 88ms + diff --git a/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log b/opencv/build/intermediates/cxx/ndk_locator_record_50t213g5.log index 18d761c..4305f89 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": -1066186118 + "memoizedHashCode": 1007844022 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -273998015 + "memoizedHashCode": 1800032125 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 430463178 + "memoizedHashCode": -1790473978 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2001690048 + "memoizedHashCode": 72340092 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1400587666 + "memoizedHashCode": -820349490 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1736567885 + "memoizedHashCode": -484369271 } ] \ No newline at end of file