commit

3 years ago · 8b88cd79eb
parent 810a5d5f11
commit 8b88cd79eb
24 changed files with 220 additions and 28 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -3,7 +3,9 @@
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">
      <map>
+        <entry key="..\:/Android-APK/MainCar/app/src/main/res/drawable-v24/belowbutton_img.xml" value="0.1365" />
        <entry key="..\:/Android-APK/MainCar/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.205" />
+        <entry key="..\:/Android-APK/MainCar/app/src/main/res/drawable-v24/log_box_shape.xml" value="0.1365" />
        <entry key="..\:/Android-APK/MainCar/app/src/main/res/drawable/ic_launcher_background.xml" value="0.203" />
        <entry key="..\:/Android-APK/MainCar/app/src/main/res/layout/activity_main.xml" value="0.296195652173913" />
        <entry key="..\:/Android-APK/MainCar/app/src/main/res/layout/activity_movement_controller.xml" value="0.31567028985507245" />
--- a/app/build.gradle
+++ b/app/build.gradle
@ -9,8 +9,8 @@ android {
        applicationId "com.uns.maincar"
        minSdk 26
        targetSdk 32
-        versionCode 24
-        versionName '2.1.3'
+        versionCode 25
+        versionName '2.2.2'

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        externalNativeBuild {
--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@ -11,8 +11,8 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 24,
-      "versionName": "2.1.3-beta",
+      "versionCode": 25,
+      "versionName": "2.2.2-beta",
      "outputFile": "app-release.apk"
    }
  ],
--- a/app/src/main/cpp/opencv_libqr/cv_qrcode.cpp
+++ b/app/src/main/cpp/opencv_libqr/cv_qrcode.cpp
@ -11,7 +11,7 @@
 // Third party copyrights are property of their respective owners.

 //This file is exported by UnknownObject for Multiple-QRCode-Detection in Android
-//File Split & Simplfied by UnknownObject at 2022-10-11
+//File Split & Simplified by UnknownObject at 2022-10-11

 #include "cv_qrcode.h"

--- a/app/src/main/cpp/opencv_libqr/private.h
+++ b/app/src/main/cpp/opencv_libqr/private.h
@ -47,7 +47,7 @@
 //M*/

 //This file is exported by UnknownObject for Multiple-QRCode-Detection in Android
-//File Split & Simplfied by UnknownObject at 2022-10-11
+//File Split & Simplified by UnknownObject at 2022-10-11

 #ifndef MAINCAR_PRIVATE_H
 #define MAINCAR_PRIVATE_H
@ -60,6 +60,10 @@

 #include <opencv2/core/utils/trace.hpp>

+#ifdef HAVE_IPP
+#undef HAVE_IPP
+#endif
+
 #ifdef ENABLE_INSTRUMENTATION
 #include "opencv2/core/utils/instrumentation.hpp"
 #endif
--- a/app/src/main/res/drawable-v24/log_box_shape.xml
+++ b/app/src/main/res/drawable-v24/log_box_shape.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2022. UnknownNetworkService Group
+  ~ This file is created by UnknownObject at 2022 - 12 - 9
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:height="20dp"
+        android:width="20dp" />
+    <stroke
+        android:color="@color/teal_700"
+        android:width="2dp" />
+    <corners android:radius="10dp" />
+</shape>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -268,7 +268,8 @@
        android:id="@+id/text_toast"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_margin="10dp"
+        android:layout_margin="5dp"
+        android:background="@drawable/log_box_shape"
        android:fadeScrollbars="false"
        android:scrollbars="vertical"
        android:textAlignment="center"
--- a/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_292_timing.txt
+++ b/opencv/build/intermediates/cxx/Debug/6x33t2q6/meta/x86/generate_cxx_metadata_292_timing.txt
@ -8,3 +8,5 @@

 # C/C++ build system timings

+# C/C++ build system timings
+
--- 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
@ -158,3 +158,24 @@ generate_cxx_metadata completed in 14ms

 # C/C++ build system timings

+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 10ms
+generate_cxx_metadata completed in 17ms
+
+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 11ms
+generate_cxx_metadata completed in 17ms
+
+# C/C++ build system timings
+
+# C/C++ build system timings
+
+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 15ms
+generate_cxx_metadata completed in 23ms
+
+# C/C++ build system timings
+
--- 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": 931437989
+    "memoizedHashCode": -76695078
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1430839592
+    "memoizedHashCode": 1855994637
  },
  {
    "level_": 0,
@ -39,6 +39,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -632040229
+    "memoizedHashCode": -1640173296
  }
 ]
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/generate_cxx_metadata_439_timing.txt
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/generate_cxx_metadata_439_timing.txt
@ -1,3 +1,8 @@
 # C/C++ build system timings
 generate_cxx_metadata 11ms

+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 12ms
+generate_cxx_metadata completed in 16ms
+
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/generate_cxx_metadata_900_timing.txt
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/generate_cxx_metadata_900_timing.txt
@ -4,3 +4,8 @@ generate_cxx_metadata 12ms
 # C/C++ build system timings
 generate_cxx_metadata 12ms

+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 16ms
+generate_cxx_metadata completed in 20ms
+
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/arm64-v8a/metadata_generation_record.json
@ -11,7 +11,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1232277264
+    "memoizedHashCode": 1515426010
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 889822124
+    "memoizedHashCode": -657441898
  },
  {
    "level_": 0,
@ -39,6 +39,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 1935679480
+    "memoizedHashCode": 388415458
  }
 ]
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/armeabi-v7a/generate_cxx_metadata_900_timing.txt
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/armeabi-v7a/generate_cxx_metadata_900_timing.txt
@ -5,3 +5,8 @@ generate_cxx_metadata completed in 17ms

 # C/C++ build system timings

+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 10ms
+generate_cxx_metadata completed in 12ms
+
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/armeabi-v7a/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/armeabi-v7a/metadata_generation_record.json
@ -11,7 +11,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 1878132364
+    "memoizedHashCode": 330868342
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 628917064
+    "memoizedHashCode": -918346958
  },
  {
    "level_": 0,
@ -39,6 +39,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1490228586
+    "memoizedHashCode": 1257474688
  }
 ]
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_292_timing.txt
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_292_timing.txt
@ -5,3 +5,5 @@ generate_cxx_metadata 13ms

 # C/C++ build system timings

+# C/C++ build system timings
+
--- 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
@ -88,3 +88,20 @@ generate_cxx_metadata 10ms

 # C/C++ build system timings

+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 12ms
+generate_cxx_metadata completed in 18ms
+
+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 13ms
+generate_cxx_metadata completed in 20ms
+
+# C/C++ build system timings
+
+# C/C++ build system timings
+generate_cxx_metadata
+  create-invalidation-state 11ms
+generate_cxx_metadata completed in 17ms
+
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_900_timing.txt
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86/generate_cxx_metadata_900_timing.txt
@ -2,3 +2,5 @@

 # C/C++ build system timings

+# C/C++ build system timings
+
--- 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": 919642793
+    "memoizedHashCode": -88490274
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 567728229
+    "memoizedHashCode": -440404838
  },
  {
    "level_": 0,
@ -39,6 +39,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -643835425
+    "memoizedHashCode": -1651968492
  }
 ]
--- a/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86_64/metadata_generation_record.json
+++ b/opencv/build/intermediates/cxx/RelWithDebInfo/4h3t2zj4/meta/x86_64/metadata_generation_record.json
@ -11,7 +11,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -2105926786
+    "memoizedHashCode": 641776488
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1159913866
+    "memoizedHashCode": 1587789408
  },
  {
    "level_": 0,
@ -39,6 +39,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 1852100145
+    "memoizedHashCode": 304836123
  }
 ]
--- a/opencv/build/intermediates/cxx/create_cxx_tasks_292_timing.txt
+++ b/opencv/build/intermediates/cxx/create_cxx_tasks_292_timing.txt
@ -119,3 +119,15 @@ create_cxx_tasks
  create-initial-cxx-model completed in 81ms
 create_cxx_tasks completed in 82ms

+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 33ms
+    create-module-model completed in 34ms
+    create-module-model
+      create-cmake-model 32ms
+    create-module-model completed in 34ms
+  create-initial-cxx-model completed in 84ms
+create_cxx_tasks completed in 85ms
+
--- a/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt
+++ b/opencv/build/intermediates/cxx/create_cxx_tasks_31_timing.txt
@ -877,3 +877,103 @@ 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 33ms
+    create-module-model completed in 36ms
+    create-module-model
+      create-cmake-model 43ms
+    create-module-model completed in 45ms
+    [gap of 11ms]
+  create-initial-cxx-model completed in 102ms
+create_cxx_tasks completed in 103ms
+
+# 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 36ms
+    create-module-model completed in 39ms
+    [gap of 10ms]
+  create-initial-cxx-model completed in 95ms
+create_cxx_tasks completed in 97ms
+
+# 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 34ms
+    create-module-model completed in 35ms
+  create-initial-cxx-model completed in 86ms
+create_cxx_tasks completed in 88ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 34ms
+    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 89ms
+create_cxx_tasks completed in 90ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 37ms
+    create-module-model completed in 40ms
+    create-module-model
+      create-cmake-model 34ms
+    create-module-model completed in 35ms
+  create-initial-cxx-model completed in 89ms
+create_cxx_tasks completed in 90ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 57ms
+    create-module-model completed in 63ms
+    create-module-model
+      create-cmake-model 49ms
+    create-module-model completed in 52ms
+    [gap of 14ms]
+  create-initial-cxx-model completed in 141ms
+create_cxx_tasks completed in 144ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 56ms
+    create-module-model completed in 58ms
+    create-module-model
+      create-cmake-model 52ms
+    create-module-model completed in 54ms
+    [gap of 13ms]
+  create-initial-cxx-model completed in 136ms
+create_cxx_tasks completed in 139ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 42ms
+    create-module-model completed in 43ms
+    create-module-model
+      create-cmake-model 43ms
+    create-module-model completed in 45ms
+  create-initial-cxx-model completed in 102ms
+create_cxx_tasks completed in 104ms
+
--- 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": 1505021944
+    "memoizedHashCode": 496888877
  },
  {
    "level_": 0,
@ -25,7 +25,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1997757249
+    "memoizedHashCode": 1289076980
  },
  {
    "level_": 0,
@ -39,7 +39,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -1293296056
+    "memoizedHashCode": 1993538173
  },
  {
    "level_": 0,
@ -53,7 +53,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 569518014
+    "memoizedHashCode": -438615053
  },
  {
    "level_": 0,
@ -67,7 +67,7 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": -323171568
+    "memoizedHashCode": -1331304635
  },
  {
    "level_": 0,
@ -81,6 +81,6 @@
      "fieldsDescending": {}
    },
    "memoizedSize": -1,
-    "memoizedHashCode": 12808651
+    "memoizedHashCode": -995324416
  }
 ]