million/QTagger_Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

추가 수정사항 적용

Browse Source
This commit is contained in:
DESKTOP-1A3P75F\lee
2022-11-05 00:18:51 +09:00
parent 0eae7b5870
commit af3011791c
33 changed files with 420 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/misc.xml generated
View File

@@ -118,7 +118,11 @@
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_account_list.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_account_modify.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_db_setting.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_layout_test.xml" value="0.28125" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_main.xml" value="0.31302083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_more.xml" value="0.28125" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_picture_info.xml" value="0.28125" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_setting.xml" value="0.28125" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_sync.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_sync_upload.xml" value="0.34427083333333336" />
<entry key="..\:/QTagger/a/QTagger_Android12/app/src/main/res/layout/activity_test2.xml" value="0.31302083333333336" />

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1213_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1377_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_1499_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_30_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_605_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/generate_cxx_metadata_946_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

6
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/arm64-v8a/metadata_generation_record.json
View File

@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 2135426332
"memoizedHashCode": 144155405
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -962953399
"memoizedHashCode": 1340742970
},
{
"level_": 0,
@@ -39,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1056834885
"memoizedHashCode": 1246861484
}
]

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/armeabi-v7a/generate_cxx_metadata_1377_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

148
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/armeabi-v7a/metadata_generation_record.json
View File

@@ -11,11 +11,11 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -40743516
"memoizedHashCode": -439822984
},
{
"level_": 0,
"message_": "rebuilding JSON D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\android_gradle_build.json due to:",
"message_": "JSON \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\android_gradle_build.json\u0027 was up-to-date",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
@@ -25,147 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 89978650
},
{
"level_": 0,
"message_": "- expected json D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\android_gradle_build.json file is not present, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -169434306
},
{
"level_": 0,
"message_": "- missing previous command file D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\metadata_generation_command.txt, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1012814052
},
{
"level_": 0,
"message_": "- command changed from previous, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1170862316
},
{
"level_": 0,
"message_": "removing stale contents from \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\u0027",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -762856762
},
{
"level_": 0,
"message_": "created folder \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\u0027",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1445165266
},
{
"level_": 0,
"message_": "executing cmake Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003darmeabi-v7a\n-DCMAKE_ANDROID_ARCH_ABI\u003darmeabi-v7a\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\armeabi-v7a\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\armeabi-v7a\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 672625715
},
{
"level_": 0,
"message_": "Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003darmeabi-v7a\n-DCMAKE_ANDROID_ARCH_ABI\u003darmeabi-v7a\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\armeabi-v7a\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\armeabi-v7a\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 748326898
},
{
"level_": 0,
"message_": "Exiting generation of D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\compile_commands.json.bin normally",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -445616216
},
{
"level_": 0,
"message_": "done executing cmake",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1483208567
},
{
"level_": 0,
"message_": "write command file D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\armeabi-v7a\\metadata_generation_command.txt",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|armeabi-v7a",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1427611662
"memoizedHashCode": -2047669915
},
{
"level_": 0,
@@ -179,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 454864517
"memoizedHashCode": 55785049
}
]

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/x86/generate_cxx_metadata_1377_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

6
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/x86/metadata_generation_record.json
View File

@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -701062986
"memoizedHashCode": -41098528
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1799663965
"memoizedHashCode": -1139699507
},
{
"level_": 0,
@@ -39,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -909173821
"memoizedHashCode": -249209363
}
]

2
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/x86_64/generate_cxx_metadata_1377_timing.txt Normal file
View File

@@ -0,0 +1,2 @@
# C/C++ build system timings

148
OpenCV/build/intermediates/cxx/Debug/a3l26472/meta/x86_64/metadata_generation_record.json
View File

@@ -11,11 +11,11 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 873028396
"memoizedHashCode": 473948928
},
{
"level_": 0,
"message_": "rebuilding JSON D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\android_gradle_build.json due to:",
"message_": "JSON \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\android_gradle_build.json\u0027 was up-to-date",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
@@ -25,147 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1459955972
},
{
"level_": 0,
"message_": "- expected json D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\android_gradle_build.json file is not present, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -825428902
},
{
"level_": 0,
"message_": "- missing previous command file D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\metadata_generation_command.txt, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 89939928
},
{
"level_": 0,
"message_": "- command changed from previous, will remove stale json folder",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -327481545
},
{
"level_": 0,
"message_": "removing stale contents from \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\u0027",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -238384746
},
{
"level_": 0,
"message_": "created folder \u0027D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\u0027",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -369413110
},
{
"level_": 0,
"message_": "executing cmake Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003dx86_64\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86_64\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\x86_64\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\x86_64\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -2095027897
},
{
"level_": 0,
"message_": "Executable : C:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\cmake.exe\narguments : \n-HD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\n-DCMAKE_SYSTEM_NAME\u003dAndroid\n-DCMAKE_EXPORT_COMPILE_COMMANDS\u003dON\n-DCMAKE_SYSTEM_VERSION\u003d21\n-DANDROID_PLATFORM\u003dandroid-21\n-DANDROID_ABI\u003dx86_64\n-DCMAKE_ANDROID_ARCH_ABI\u003dx86_64\n-DANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_ANDROID_NDK\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\n-DCMAKE_TOOLCHAIN_FILE\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\ndk\\21.4.7075529\\build\\cmake\\android.toolchain.cmake\n-DCMAKE_MAKE_PROGRAM\u003dC:\\Users\\lee\\AppData\\Local\\Android\\Sdk\\cmake\\3.18.1\\bin\\ninja.exe\n-DCMAKE_LIBRARY_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\x86_64\n-DCMAKE_RUNTIME_OUTPUT_DIRECTORY\u003dD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\build\\intermediates\\cxx\\Debug\\a3l26472\\obj\\x86_64\n-DCMAKE_BUILD_TYPE\u003dDebug\n-BD:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\n-GNinja\n-DANDROID_STL\u003dc++_shared\njvmArgs : \n\n",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1258761384
},
{
"level_": 0,
"message_": "Exiting generation of D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\compile_commands.json.bin normally",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1407628992
},
{
"level_": 0,
"message_": "done executing cmake",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -639827796
},
{
"level_": 0,
"message_": "write command file D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\.cxx\\Debug\\a3l26472\\x86_64\\metadata_generation_command.txt",
"file_": "D:\\QTagger\\a\\QTagger_Android12\\OpenCV\\libcxx_helper\\CMakeLists.txt",
"tag_": "debug|x86_64",
"diagnosticCode_": 0,
"memoizedIsInitialized": 1,
"unknownFields": {
"fields": {},
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1805742854
"memoizedHashCode": 520598567
},
{
"level_": 0,
@@ -179,6 +39,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1298245288
"memoizedHashCode": 899165820
}
]

2
OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log
View File

@@ -11,6 +11,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 874439679
"memoizedHashCode": -1116831248
}
]

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_1060_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 24ms
create_cxx_tasks completed in 25ms

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_1343_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 20ms
create_cxx_tasks completed in 20ms

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_1377_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 18ms
create_cxx_tasks completed in 19ms

8
OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt
View File

@@ -402,3 +402,11 @@ create_cxx_tasks
create-initial-cxx-model completed in 57ms
create_cxx_tasks completed in 58ms
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model
[gap of 29ms]
create-X86-model 24ms
create-initial-cxx-model completed in 56ms
create_cxx_tasks completed in 57ms

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_451_timing.txt Normal file
View File

@@ -0,0 +1,5 @@
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 32ms
create_cxx_tasks completed in 33ms

5
OpenCV/build/intermediates/cxx/create_cxx_tasks_777_timing.txt
View File

@@ -3,3 +3,8 @@ create_cxx_tasks
create-initial-cxx-model 25ms
create_cxx_tasks completed in 26ms
# C/C++ build system timings
create_cxx_tasks
create-initial-cxx-model 24ms
create_cxx_tasks completed in 25ms

12
OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log
View File

@@ -11,7 +11,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1716474297
"memoizedHashCode": -274796630
},
{
"level_": 0,
@@ -25,7 +25,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1786304896
"memoizedHashCode": 517391473
},
{
"level_": 0,
@@ -39,7 +39,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": -1081843703
"memoizedHashCode": 1221852666
},
{
"level_": 0,
@@ -53,7 +53,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 780970367
"memoizedHashCode": -1210300560
},
{
"level_": 0,
@@ -67,7 +67,7 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 1057998215
"memoizedHashCode": -933272712
},
{
"level_": 0,
@@ -81,6 +81,6 @@
"fieldsDescending": {}
},
"memoizedSize": -1,
"memoizedHashCode": 224261004
"memoizedHashCode": -1767009923
}
]

2
app/src/main/java/com/qtagger/Activity/SearchActivity.java
View File

@@ -198,6 +198,8 @@ public class SearchActivity extends AppCompatActivity {
if (dataManager.searchTabPosition != -1) {
tabs.getTabAt(dataManager.searchTabPosition).select();
}
CommonNavigationView.setAccountRefresh(this);
}
@Override

21
app/src/main/java/com/qtagger/Activity/SyncActivity.java
View File

@@ -56,19 +56,22 @@ public class SyncActivity extends AppCompatActivity {
Intent intent = getIntent();
syncTestEnum = TestEnum.getByLabel(intent.getStringExtra("TestEnumLabel"));
PkgNoList = (ArrayList <PkgNoCheck>) getIntent(). getSerializableExtra("PkgNoCheckList");
((TextView) findViewById(R.id.textViewTestType)).setText(syncTestEnum.getKey());
pkgList = dataManager.dbHelper.getAllTest(syncTestEnum);
Thread oracleData = new Thread(() ->{
OracleGet(syncTestEnum);
});
oracleData.start();
try {
oracleData.join();
if(PkgNoList == null || PkgNoList.size() == 0) {
Thread oracleData = new Thread(() -> {
OracleGet(syncTestEnum);
});
oracleData.start();
try {
oracleData.join();
} catch (InterruptedException e) {
e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
listPkg = findViewById(R.id.list_pkg);
for (PkgNoCheck pkg: PkgNoList ) {

61
app/src/main/java/com/qtagger/Activity/SyncUploadActivity.java
View File

@@ -22,6 +22,7 @@ import com.qtagger.Data.PkgNoCheck;
import com.qtagger.Data.TestEnum;
import com.qtagger.Database.ImageFile;
import com.qtagger.R;
import com.qtagger.util.CommonHelper;
import com.qtagger.util.DataManager;
import org.apache.poi.util.IOUtils;
@@ -308,25 +309,28 @@ public class SyncUploadActivity extends AppCompatActivity {
Map<String,String> dataMap = new HashMap<>();
dataMap.put("PKG_NO",pkgNo);
dataMap.put("FORM_CODE",testEnumLabel);
ImageFile maxFile = null;
Double maxValue = -1.0;
for (ImageFile file:
files){
if(file.getType().contains("Filling") )
{
Double fileData = Double.parseDouble(file.getPkgData());
if(fileData>maxValue)
maxFile = file;
}
else if(!file.getType().contains("Nothing"))
{
dataMap.put(file.getType(),file.getPkgData());
}
}
if(maxFile != null)
ImageFile filling = CommonHelper.getMaxFile(files,"Filling");
ImageFile surface = CommonHelper.getMaxFile(files,"Surface");
ImageFile weight = CommonHelper.getMaxFile(files,"Weight");
if(filling != null)
{
dataMap.put(maxFile.getType(),maxFile.getPkgData());
String title = CommonHelper.getUploadType(testEnumLabel,"Filling");
if(title != null)
dataMap.put(title,filling.getPkgData());
}
if(weight != null)
{
String title = CommonHelper.getUploadType(testEnumLabel,"Weight");
if(title != null)
dataMap.put(title,weight.getPkgData());
}
if(surface != null)
{
String title = CommonHelper.getUploadType(testEnumLabel,"Surface");
if(title != null)
dataMap.put(title,surface.getPkgData());
}
data.add(dataMap);
@@ -339,19 +343,18 @@ public class SyncUploadActivity extends AppCompatActivity {
image.put("FORM_CODE",testEnumLabel);
String type = file.getType();
if(type.contains("Surface") || type.contains("M1") || type.contains("Weight"))
image.put("FILE_NAME",pkgNo+"&"+file.getType()+"&"+file.getType()+".jpg");
else
image.put("FILE_NAME",pkgNo+"&"+file.getType()+"-"+file.getPkgData()+"&"+file.getType()+"-"+file.getPkgData()+".jpg");
Bitmap bm = BitmapFactory.decodeFile(file.getFilePath());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
bm.compress(Bitmap.CompressFormat.JPEG, 100, baos); // bm is the bitmap object
String encodedImage = Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
image.put("FILE_BASE64",encodedImage);
images.add(image);
String filename = CommonHelper.getFileName(pkgNo,file,testEnumLabel);
if(filename != null)
{
image.put("FILE_NAME",filename);
Bitmap bm = BitmapFactory.decodeFile(file.getFilePath());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
bm.compress(Bitmap.CompressFormat.JPEG, 100, baos); // bm is the bitmap object
String encodedImage = Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
image.put("FILE_BASE64",encodedImage);
images.add(image);
}
}

1
app/src/main/java/com/qtagger/Activity/TestActivity.java
View File

@@ -282,6 +282,7 @@ public class TestActivity extends AppCompatActivity {
{
tabs.getTabAt(dataManager.testTabPosition).select();
}
CommonNavigationView.setAccountRefresh(this);
}
public void testEnumButtonBackgroundChange()

5
app/src/main/java/com/qtagger/Activity/TestSelectActivity.java
View File

@@ -179,4 +179,9 @@ public class TestSelectActivity extends AppCompatActivity {
}
@Override
protected void onStart() {
super.onStart();
CommonNavigationView.setAccountRefresh(this);
}
}

132
app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java
View File

@@ -6,11 +6,13 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Build;
import android.os.Environment;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.RequiresApi;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
@@ -22,12 +24,15 @@ import com.qtagger.Activity.DbSettingActivity;
import com.qtagger.Activity.MoreActivity;
import com.qtagger.Activity.SyncActivity;
import com.qtagger.Activity.SyncUploadActivity;
import com.qtagger.Data.PkgNoCheck;
import com.qtagger.Data.TestEnum;
import com.qtagger.Database.AccountData;
import com.qtagger.Database.PKG;
import com.qtagger.MainActivity;
import com.qtagger.R;
import com.qtagger.util.DataManager;
import com.qtagger.util.ExcelExport;
import com.qtagger.util.OracleQueryStr;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
@@ -38,9 +43,16 @@ import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
public class CommonNavigationView {
@@ -112,12 +124,47 @@ public class CommonNavigationView {
syncTestEnum[0] = TestEnum.getByName(testEnumKeys[which]);
}
}).setPositiveButton("확인", new DialogInterface.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.N)
@Override
public void onClick(DialogInterface dialog, int which) {
if(syncTestEnum[0] != TestEnum.선택안함) {
Intent intent = new Intent(activity.getApplicationContext(), SyncActivity.class);
intent.putExtra("TestEnumLabel", syncTestEnum[0].label());
activity.startActivity(intent);
ProgressDialog progressDialog = new ProgressDialog(activity);
progressDialog.setMessage("서버 연결중입니다.");
progressDialog.setCancelable(false);
progressDialog.setProgressStyle(android.R.style.Widget_ProgressBar_Horizontal);
progressDialog.show();
Thread downloadThread = new Thread(() ->{
List<PkgNoCheck> result = OracleGet(syncTestEnum[0]);
progressDialog.dismiss();
String errorMessage = "";
if(result == null)
{
errorMessage = "서버와 연결이 실패하였습니다.";
}
else if(result.size() == 0)
{
errorMessage = "새로운 데이터가 없습니다.";
}
else {
Intent intent = new Intent(activity.getApplicationContext(), SyncActivity.class);
intent.putExtra("TestEnumLabel", syncTestEnum[0].label());
intent.putExtra("PkgNoCheckList", (Serializable) result);
activity.startActivity(intent);
return;
}
String finalErrorMessage = errorMessage;
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
new AlertDialog.Builder(activity).setTitle(finalErrorMessage).setPositiveButton("확인",null).show();
}
});
});
downloadThread.start();
}
}
}).setNegativeButton("취소", null).show();
@@ -244,4 +291,83 @@ public class CommonNavigationView {
});
}
public static void setAccountRefresh(Activity activity)
{
//textview_id
AccountData account = dataManager.loginAccount;
TextView textId = activity.findViewById(R.id.textview_id);
TextView textDapt = activity.findViewById(R.id.textview_dapt);
TextView textName = activity.findViewById(R.id.textview_name);
if(account == null)
{
textId.setText("");
textDapt.setText("");
textName.setText("");
}
else
{
textId.setText(account.getAccountId());
textDapt.setText(account.getAccountDapt());
textName.setText(account.getAccountName());
}
}
@RequiresApi(api = Build.VERSION_CODES.N)
private static List<PkgNoCheck> OracleGet(TestEnum testEnum){
if(testEnum == TestEnum.선택안함)
return null;
List<PkgNoCheck> PkgNoList = new ArrayList<>();
List<PKG> pkgList = dataManager.dbHelper.getAllTest(testEnum);
Connection conn = null;
PreparedStatement psmt = null;
ResultSet rs = null;
String url = dataManager.connectionString.getUrl();
String id = dataManager.connectionString.getDbId();
String pw = dataManager.connectionString.getDbPw();
try {
// 3. JDBC 드라이버 로딩
Class.forName("oracle.jdbc.driver.OracleDriver");
// 4. 접속
// - Connection 객체 생성 + 접속 작업.
conn = DriverManager.getConnection(url, id, pw);
// 5. SQL
String sql = OracleQueryStr.GetPkgNoListQuery(testEnum);
psmt = conn.prepareStatement(sql);
rs = psmt.executeQuery();
if(rs != null) {
while (rs.next())
{
String dbPkgNoStr = rs.getString("PKG_NO");
boolean includeChecker = true;
for (PKG pkg:pkgList
) {
if(pkg.getPKG_NO().compareTo(dbPkgNoStr) == 0)
{
includeChecker = false;
break;
}
}
if(includeChecker) {
PkgNoList.add(new PkgNoCheck(dbPkgNoStr, false));
}
}
}
// 6. 접속종료
conn.close();
return PkgNoList;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}

4
app/src/main/java/com/qtagger/Data/PkgNoCheck.java
View File

@@ -1,6 +1,8 @@
package com.qtagger.Data;
public class PkgNoCheck {
import java.io.Serializable;
public class PkgNoCheck implements Serializable {
String PkgNo;
boolean check;

21
app/src/main/java/com/qtagger/MainActivity.java
View File

@@ -150,26 +150,6 @@ public class MainActivity extends AppCompatActivity {
});
CommonNavigationView.setDefaultViewEvent(this);
/*
//계정 추가
findViewById(R.id.text_accountInsert).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//계정추가 페이지 이동
Intent intent = new Intent(getApplicationContext(), AccountAdd.class);
startActivity(intent);
}
});
//계정 목록 보는 페이지
findViewById(R.id.text_accountList).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), AccountList.class);
startActivity(intent);
}
});*/
if(getConnectStatus())//온라인 모드
{
@@ -197,6 +177,7 @@ public class MainActivity extends AppCompatActivity {
mSpinner.setAdapter(aa_items);
button_login.setBackgroundResource(R.drawable.button_new_default_disable_background);
CommonNavigationView.setAccountRefresh(this);
}

144
app/src/main/java/com/qtagger/util/CommonHelper.java
View File

@@ -29,6 +29,8 @@ import com.hoho.android.usbserial.driver.UsbSerialDriver;
import com.hoho.android.usbserial.driver.UsbSerialPort;
import com.hoho.android.usbserial.driver.UsbSerialProber;
import com.qtagger.Data.CustomProber;
import com.qtagger.Data.TestEnum;
import com.qtagger.Database.ImageFile;
import com.qtagger.Database.NuclideData;
import java.io.File;
@@ -168,4 +170,146 @@ public class CommonHelper {
return dir;
}
public static ImageFile getMaxFile(List<ImageFile> files, String type)
{
ImageFile result = null;
double maxValue = -1;
for (ImageFile file:
files) {
if(file.getType().contains(type))
{
double temp = Double.parseDouble(file.getPkgData());
if(maxValue < temp)
{
maxValue = temp;
result = file;
}
}
}
return result;
}
public static String getUploadType(String testEnumLabel, String type)
{
String result = null;
TestEnum t1 = TestEnum.getByLabel(testEnumLabel);
if(type.contains("Surface"))
{
if(t1 == TestEnum.발생지특성규명)
{
result ="ORIGIN_PKG_SURFC_RD";
}
else if(t1 == TestEnum.예비검사)
{
result ="PREPAR_SURFC_RD_RATE";
}
else if(t1 == TestEnum.인수검사)
{
result ="ACCEPT_SURFC_RD_RATE";
}
}
else if(type.contains("Filling"))
{
if(t1 == TestEnum.발생지특성규명)
{
result ="ORIGIN_PKG_FILLRATE_P";
}
else if(t1 == TestEnum.예비검사)
{
result ="PREPAR_APT_PER";
}
else if(t1 == TestEnum.인수검사)
{
result ="ACCEPT_APT_PER";
}
}
else if(type.contains("Weight"))
{
if(t1 == TestEnum.발생지특성규명)
{
result ="ORIGIN_TOTAL_WEIGHT";
}
else if(t1 == TestEnum.예비검사)
{
result ="PREPAR_TOT_WT";
}
else if(t1 == TestEnum.인수검사)
{
result ="ACCEPT_TEST_TOT_WT";
}
}
return result;
}
public static String getFileName(String pkgNo,ImageFile file, String testLabel )
{
String middle = middleName(file);
String last = lastName(file,pkgNo,TestEnum.getByLabel(testLabel).name());
if(middle != null && last != null)
{
return pkgNo+"&" + middle + "&" + last;
}
return null;
}
private static String middleName(ImageFile file)
{
if(file.getType().contains("Surface"))
{
return file.getType().replace("Surface","표면방사선량률사진");
}
else if(file.getType().contains("M1"))
{
return file.getType().replace("M1","1m방사선량률사진");
}
else if(file.getType().contains("Weight"))
{
return "무게사진";
}
else if(file.getType().contains("Filling"))
{
return "채움률사진";
}
else if(file.getType().contains("Nothing"))
{
return "기타사진";
}
return null;
}
private static String lastName(ImageFile file, String pkgNo,String testLabel)
{
if(file.getType().contains("Surface"))
{
return pkgNo+"_"+ testLabel+"_"+ file.getType().replace("Surface","");
}
else if(file.getType().contains("M1"))
{
return pkgNo+"_"+ testLabel+"_"+ file.getType().replace("M1","");
}
else if(file.getType().contains("Weight"))
{
return pkgNo+"_"+ testLabel+"_"+ "무게사진";
}
else if(file.getType().contains("Filling"))
{
return pkgNo+"_"+ testLabel+"_"+"채움률사진"+"_" + file.getPkgData();
}
else if(file.getType().contains("Nothing"))
{
return pkgNo+"_"+ testLabel+"_"+"기타사진"+ file.getPkgData();
}
return null;
}
}

15
app/src/main/java/com/qtagger/util/ExcelExport.java
View File

@@ -19,6 +19,7 @@ public class ExcelExport {
private static int surfaceIndex = 2;
private static int m1Index = 15;
private static int weightIndex = 28;
private static int fillingIndex = 29;
public static void ExcelDefaultForm(Workbook wb, Sheet sheet)
{
@@ -70,6 +71,7 @@ public class ExcelExport {
SetCellData(row2,26,"BOTTOM-LEFT");
SetCellData(row2,27,"BOTTOM-RIGHT");
SetCellData(row2,28,"무게");
SetCellData(row2,29,"채움률");
}
@@ -84,8 +86,10 @@ public class ExcelExport {
pkgNoList) {
ImageFile maxSurfaceImageFile = null;
ImageFile max1mImageFile = null;
ImageFile maxFillingFile = null;
double surfaceMaxValue = 0;
double m1MaxValue = 0;
double fillingMaxValue = 0;
//Row추가
Row row = sheet.createRow(startRow++);
SetCellData(row,1,pkgNo);
@@ -113,6 +117,14 @@ public class ExcelExport {
}
SetCellData(row,getIndexPosition(m1Index,file.getType()),file.getPkgData()+" μSv/hr");
}
else if(file.getType().contains("Filling"))
{
double fileValue = Double.parseDouble(file.getPkgData());
if(fillingMaxValue<fileValue)
{
maxFillingFile = file;
}
}
else if(file.getType().contains("Weight"))
{
SetCellData(row, weightIndex,file.getPkgData()+" kg");
@@ -125,6 +137,9 @@ public class ExcelExport {
if(max1mImageFile != null)
SetCellData(row,m1Index,max1mImageFile.getPkgData()+" μSv/hr");
if(maxFillingFile != null)
SetCellData(row,fillingIndex,maxFillingFile.getPkgData()+"%");
}
}

BIN
app/src/main/res/drawable/loading_rfid_24.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB