diff --git a/.idea/misc.xml b/.idea/misc.xml index 60be16a..4f2e8be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,12 +43,15 @@ + + + @@ -63,6 +66,7 @@ + @@ -71,7 +75,7 @@ - + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt new file mode 100644 index 0000000..6443fc5 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt @@ -0,0 +1,3 @@ +# C/C++ build system timings +generate_cxx_metadata 14ms + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt @@ -1,2 +1,4 @@ # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt @@ -1,2 +1,4 @@ # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json index 1d61e91..2d53876 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -780626890 + "memoizedHashCode": -1973867061 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -417137208 + "memoizedHashCode": -1610377379 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 322079189 + "memoizedHashCode": -871160982 } ] \ 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 4cac6aa..82d2686 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": -2000428813 + "memoizedHashCode": 1101298312 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt new file mode 100644 index 0000000..695c14b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt new file mode 100644 index 0000000..c42cba7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 27ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 22ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt new file mode 100644 index 0000000..713f975 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt new file mode 100644 index 0000000..59c7b0d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt new file mode 100644 index 0000000..88bbee0 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt index 02aef73..a397ee6 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt @@ -186,3 +186,19 @@ create_cxx_tasks create-initial-cxx-model completed in 55ms create_cxx_tasks completed in 57ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 24ms] + create-ARMEABI_V7A-model 25ms + 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 + create-module-model 11ms + [gap of 36ms] + create-initial-cxx-model completed in 47ms +create_cxx_tasks completed in 48ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt new file mode 100644 index 0000000..810890e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt new file mode 100644 index 0000000..87db03f --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 27ms +create_cxx_tasks completed in 28ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt new file mode 100644 index 0000000..438d127 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt new file mode 100644 index 0000000..7b0b2cd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt index 9691afc..f75b6e7 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt @@ -3,3 +3,8 @@ create_cxx_tasks create-initial-cxx-model 17ms create_cxx_tasks completed in 17ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt index 13e41fc..9afd6e8 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt @@ -6,3 +6,8 @@ create_cxx_tasks create-initial-cxx-model completed in 31ms create_cxx_tasks completed in 31ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt new file mode 100644 index 0000000..635b424 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt new file mode 100644 index 0000000..976358b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log index 3f49791..2f7cf18 100644 --- a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log +++ b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1158394195 + "memoizedHashCode": 1943332930 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -366206092 + "memoizedHashCode": -1559446263 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 338255101 + "memoizedHashCode": -854985070 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2093898125 + "memoizedHashCode": 1007829000 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1816870277 + "memoizedHashCode": 1284856848 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1644359808 + "memoizedHashCode": 451119637 } ] \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/AccountAdd.java b/app/src/main/java/com/qtagger/Activity/AccountAdd.java index 39cda3c..b59cf5e 100644 --- a/app/src/main/java/com/qtagger/Activity/AccountAdd.java +++ b/app/src/main/java/com/qtagger/Activity/AccountAdd.java @@ -2,7 +2,9 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.utils.widget.ImageFilterButton; +import androidx.core.content.ContextCompat; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.EditText; @@ -27,6 +29,48 @@ public class AccountAdd extends AppCompatActivity { editAccountDapt = (EditText) findViewById(R.id.textView_AccountDapt); backBtn = (ImageFilterButton) findViewById(R.id.imageFilterButton_Back); + editAccountId.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountId.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountId.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + + editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountName.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountName.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + + editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountDapt.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountDapt.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + findViewById(R.id.button_save).setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java index 53143c0..9ce8ab0 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java @@ -118,8 +118,6 @@ public class BarcodeFragment extends Fragment { barcodeReadData(); else openDialogChecker = false; - - } private void showCustomDialog() { @@ -193,6 +191,9 @@ public class BarcodeFragment extends Fragment { dataManager.selPkg = searchPkg; ((SearchActivity) getActivity()).callTestActivity(); } else { + + //방폐물 추가가 + /* new AlertDialog.Builder(context).setTitle("해당 방폐물을 추가하시겠습니까?").setPositiveButton("확인", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -200,7 +201,7 @@ public class BarcodeFragment extends Fragment { } }).setNegativeButton("취소", null).show(); - + */ } } else { diff --git a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java index 6e5fede..a3b64ad 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java @@ -16,6 +16,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; @@ -46,8 +47,9 @@ public class RfidFragment extends Fragment { DataManager dataManager = DataManager.getInstance(); private String rfidStr = ""; private Context context; - Button button_RfidReader; + ImageView button_RfidReader; View thumbView; + SeekBar seekBar; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -94,61 +96,34 @@ public class RfidFragment extends Fragment { Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_rfid, container, false); context = container.getContext(); - TextView textViewPower = view.findViewById(R.id.textView_RfidPower); - TextView textViewRfidText = view.findViewById(R.id.textView_RfidText); - SeekBar seekBar = view.findViewById(R.id.seekbar_reader_type); + seekBar = view.findViewById(R.id.seekbar_reader_type); button_RfidReader = view.findViewById(R.id.button_RfidReader); - thumbView =inflater.inflate(R.layout.layout_seekbar_thumb, null, false); - try { - ApplicationClass.rfidSetOperationTime(); - int power = rfidReader.getPower(); - if(power == -1){ - sleep(500); - rfidReader.setPower(100); - power = rfidReader.getPower(); - } - seekBar.setProgress(power); - textViewPower.setText("강도 : " + power); - if(rfidReader.getAction() != ActionState.Stop) - { - rfidReader.stop(); - rfidReader.removeEventListener(); + thumbView = inflater.inflate(R.layout.layout_seekbar_thumb, null, false); + ApplicationClass.rfidSetOperationTime(); + + + rfidReader.setEventListener(new RfidReaderEventListener() { + @Override + public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) { + Log.d("상태 변경", connectionState + ""); } + @Override + public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) { + Log.d("태그 변경", actionState + ""); + } - rfidReader.setEventListener(new RfidReaderEventListener() { - @Override - public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) { - Log.d("상태 변경",connectionState+""); - } + @Override + public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) { + rfidStr = s; + } - @Override - public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) { - Log.d("태그 변경",actionState+""); - } + @Override + public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) { - @Override - public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) { - rfidStr = s; - textViewRfidText.setText(s); - } - @Override - public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) { - - } - }); - - - } catch (ATRfidReaderException e) { - e.printStackTrace(); - - } - catch (Exception ex) - { - //연결이 안된상황 - ex.printStackTrace(); - } + } + }); button_RfidReader.setOnClickListener(new View.OnClickListener() { @Override @@ -173,7 +148,6 @@ public class RfidFragment extends Fragment { try { seekBar.setThumb(getThumb(progress)); rfidReader.setPower(progress); - textViewPower.setText("강도 : " + rfidReader.getPower()); } catch (ATRfidReaderException e) { e.printStackTrace(); @@ -191,7 +165,7 @@ public class RfidFragment extends Fragment { } }); - +/* view.findViewById(R.id.button_Ok).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -219,7 +193,7 @@ public class RfidFragment extends Fragment { Toast.makeText(context, "RFID를 인식해주세요.", Toast.LENGTH_SHORT).show(); } } - }); + });*/ // Inflate the layout for this fragment return view; } @@ -234,6 +208,28 @@ public class RfidFragment extends Fragment { thumbView.draw(canvas); return new BitmapDrawable(getResources(), bitmap); + } + + @Override + public void onStart() { + super.onStart(); + + int power = 0; + try { + power = rfidReader.getPower(); + if(power == -1){ + sleep(500); + rfidReader.setPower(100); + power = rfidReader.getPower(); + } + seekBar.setProgress(power); + } catch (ATRfidReaderException e) { + e.printStackTrace(); + } + + + + } @Override diff --git a/app/src/main/java/com/qtagger/Activity/SearchActivity.java b/app/src/main/java/com/qtagger/Activity/SearchActivity.java index 4f01587..b1be391 100644 --- a/app/src/main/java/com/qtagger/Activity/SearchActivity.java +++ b/app/src/main/java/com/qtagger/Activity/SearchActivity.java @@ -1,71 +1,123 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import android.content.Intent; +import android.graphics.Typeface; import android.os.Bundle; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; +import com.google.android.material.navigation.NavigationView; import com.google.android.material.tabs.TabLayout; import com.qtagger.Activity.Search.BarcodeFragment; import com.qtagger.Activity.Search.ListFragment; import com.qtagger.Activity.Search.RfidFragment; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.R; import com.qtagger.util.DataManager; public class SearchActivity extends AppCompatActivity { + DrawerLayout drawerLayout; + NavigationView navigationView; Fragment rfidFragment, barcodeFragment, listFragment; TabLayout tabs; boolean skipCheck; DataManager dataManager = DataManager.getInstance(); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_search); Intent intent = getIntent(); - skipCheck = intent.getBooleanExtra("boolean",true); + skipCheck = intent.getBooleanExtra("boolean", true); + + drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); + navigationView = (NavigationView) findViewById(R.id.navigationView); rfidFragment = new RfidFragment(); barcodeFragment = new BarcodeFragment(); listFragment = new ListFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.frame,barcodeFragment).commit(); - if(dataManager.searchTabPosition == -1) + getSupportFragmentManager().beginTransaction().add(R.id.frame, barcodeFragment).commit(); + if (dataManager.searchTabPosition == -1) dataManager.searchTabPosition = 0; tabs = (TabLayout) findViewById(R.id.tabs); + for (int i = 0; i < tabs.getTabCount(); i++) { + + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + + TextView tabTextView = new TextView(this); + tab.setCustomView(tabTextView); + + tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.setText(tab.getText()); + } + } + findViewById(R.id.imageFilterButton_Setting).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), MoreActivity.class); - startActivity(intent); + //Intent intent = new Intent(getApplicationContext(), MoreActivity.class); + //startActivity(intent); + drawerLayout.openDrawer(navigationView,true); } }); + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { + + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(16); + } + } + + + + int position = tab.getPosition(); dataManager.searchTabPosition = position; Fragment selected = null; - if(position == 0){ + if (position == 0) { selected = barcodeFragment; - }else if (position == 1){ + } else if (position == 1) { selected = rfidFragment; - }else if (position == 2){ + } else if (position == 2) { selected = listFragment; } - if(selected != null) { + if (selected != null) { getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit(); } } @Override public void onTabUnselected(TabLayout.Tab tab) { + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(14); + } + } } @@ -82,9 +134,10 @@ public class SearchActivity extends AppCompatActivity { } }); + CommonNavigationView.setDefaultViewEvent(this); } - public void callTestActivity(){ + public void callTestActivity() { //데이터 초기화, 없으면 null String pkgNo = dataManager.selPkg.getPKG_NO(); @@ -93,7 +146,7 @@ public class SearchActivity extends AppCompatActivity { dataManager.selACCEPT_TEST = dataManager.dbHelper.getACCEPT_TEST(pkgNo); dataManager.selPREPAR_TEST = dataManager.dbHelper.getPREPAR_TEST(pkgNo); - if(skipCheck) { + if (skipCheck) { Intent intent = new Intent(getApplicationContext(), TestActivity.class); startActivity(intent); } @@ -103,8 +156,30 @@ public class SearchActivity extends AppCompatActivity { @Override protected void onStart() { super.onStart(); - if(dataManager.searchTabPosition != -1) - { + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + for (int i = 0; i < tabs.getTabCount(); i++) { + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(i); + int tabChildsCount = vgTab.getChildCount(); + for (int j = 0; j < tabChildsCount; j++) { + View tabViewChild = vgTab.getChildAt(j); + if (tabViewChild instanceof TextView) { + if(i==0) + { + ((TextView) tabViewChild).setTextSize(16); + } + else{ + ((TextView) tabViewChild).setTextSize(14); + } + } + } + } + } + + + + if (dataManager.searchTabPosition != -1) { tabs.getTabAt(dataManager.searchTabPosition).select(); } } @@ -113,16 +188,14 @@ public class SearchActivity extends AppCompatActivity { public boolean onKeyUp(int keyCode, KeyEvent event) { if (keyCode == 138) { //키 입력시 - if(dataManager.searchTabPosition == 0) - { - ((BarcodeFragment)barcodeFragment).KeyUpEvent(); - } - else if(dataManager.searchTabPosition == 1) - { + if (dataManager.searchTabPosition == 0) { + ((BarcodeFragment) barcodeFragment).KeyUpEvent(); + } else if (dataManager.searchTabPosition == 1) { //rfidFragment } } return super.onKeyUp(keyCode, event); } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/TestActivity.java b/app/src/main/java/com/qtagger/Activity/TestActivity.java index b9c2850..6a7cdf1 100644 --- a/app/src/main/java/com/qtagger/Activity/TestActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestActivity.java @@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import com.google.android.material.tabs.TabLayout; import com.hoho.android.usbserial.driver.UsbSerialDriver; @@ -42,16 +43,11 @@ import com.qtagger.util.TextUtil; public class TestActivity extends AppCompatActivity { - - - Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment; - TextView textViewRadiation,textView_TestEnum,textView_TestEnum2; + TextView textViewRadiation; TabLayout tabs; DataManager dataManager = DataManager.getInstance(); - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -64,8 +60,6 @@ public class TestActivity extends AppCompatActivity { pictureFragment = new PhotographFragment(); infoFragment = new InfoFragment(); textViewRadiation = findViewById(R.id.textViewRadiation); - textView_TestEnum = findViewById(R.id.textView_TestEnum); - textView_TestEnum2 = findViewById(R.id.textView_TestEnum2); findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { @Override @@ -74,10 +68,6 @@ public class TestActivity extends AppCompatActivity { } }); - - - - textViewRadiation.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -100,10 +90,34 @@ public class TestActivity extends AppCompatActivity { getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit(); tabs = (TabLayout) findViewById(R.id.tabs); + for (int i = 0; i < tabs.getTabCount(); i++) { + + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + + TextView tabTextView = new TextView(this); + tab.setCustomView(tabTextView); + tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.setText(tab.getText()); + } + } + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { int position = tab.getPosition(); + + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(16); + } + } + Fragment selected = null; dataManager.testTabPosition = position; if(position == 0){ @@ -132,7 +146,15 @@ public class TestActivity extends AppCompatActivity { @Override public void onTabUnselected(TabLayout.Tab tab) { - + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(14); + } + } } @Override @@ -149,6 +171,28 @@ public class TestActivity extends AppCompatActivity { protected void onStart() { super.onStart(); + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + for (int i = 0; i < tabs.getTabCount(); i++) { + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(i); + int tabChildsCount = vgTab.getChildCount(); + for (int j = 0; j < tabChildsCount; j++) { + View tabViewChild = vgTab.getChildAt(j); + if (tabViewChild instanceof TextView) { + if(i==0) + { + ((TextView) tabViewChild).setTextSize(16); + } + else{ + ((TextView) tabViewChild).setTextSize(14); + } + } + } + } + } + + if(dataManager.testEnum != TestEnum.선택안함) { if(dataManager.selPkg != null) @@ -156,39 +200,11 @@ public class TestActivity extends AppCompatActivity { textViewRadiation.setText(dataManager.selPkg.getPKG_NO()); } } - //textView_TestEnum - if(dataManager.testEnum == TestEnum.발생지특성규명) - { - textView_TestEnum.setVisibility(View.VISIBLE); - textView_TestEnum2.setVisibility(View.GONE); - } - else if(dataManager.testEnum != TestEnum.선택안함) - { - textView_TestEnum.setVisibility(View.INVISIBLE); - textView_TestEnum2.setVisibility(View.VISIBLE); - - if(dataManager.testEnum == TestEnum.처분검사) - { - textView_TestEnum2.setText("처분검사"); - } - else if(dataManager.testEnum == TestEnum.인수검사) - { - textView_TestEnum2.setText("인수검사"); - } - else if(dataManager.testEnum == TestEnum.예비검사) - { - textView_TestEnum2.setText("예비검사"); - } - } if(dataManager.testTabPosition != -1) { tabs.getTabAt(dataManager.testTabPosition).select(); } - - - - } @Override diff --git a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java index f46a73a..97e1a53 100644 --- a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java @@ -20,6 +20,7 @@ import androidx.core.content.ContextCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.Data.TestEnum; import com.qtagger.Database.PKG; import com.qtagger.R; @@ -111,13 +112,14 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { drawerLayout.openDrawer(navigationView,true); - /* Intent intent = new Intent(getApplicationContext(), MoreActivity.class); startActivity(intent);*/ } }); + CommonNavigationView.setDefaultViewEvent(this); + } //권한 점검 및 실행 diff --git a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java index 73140cf..5719746 100644 --- a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java +++ b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java @@ -6,26 +6,52 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.view.View; +import android.widget.TextView; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; +import com.qtagger.Activity.AccountAdd; +import com.qtagger.Activity.AccountModify; +import com.qtagger.Activity.DbSettingActivity; import com.qtagger.Activity.MoreActivity; import com.qtagger.Activity.SyncActivity; import com.qtagger.Data.TestEnum; +import com.qtagger.Database.AccountData; import com.qtagger.R; +import com.qtagger.util.DataManager; public class CommonNavigationView { - + public static DataManager dataManager = DataManager.getInstance(); public static void setDefaultViewEvent(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()); + } + activity.findViewById(R.id.button_serverInfo).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Intent intent = new Intent(activity.getApplicationContext(), DbSettingActivity.class); + activity.startActivity(intent); } }); activity.findViewById(R.id.button_Upload).setOnClickListener(new View.OnClickListener() { @@ -68,12 +94,31 @@ public class CommonNavigationView { activity.findViewById(R.id.button_AccountAdd).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Intent intent = new Intent(activity.getApplicationContext(), AccountAdd.class); + activity.startActivity(intent); } }); activity.findViewById(R.id.button_AccountModify).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + if(dataManager.loginAccount == null) + { + //알림 줄것 + } + else + { + Intent intent = new Intent(activity.getApplicationContext(), AccountModify.class); + intent.putExtra("Id",dataManager.loginAccount.getId()); + activity.startActivity(intent); + } + } + }); + activity.findViewById(R.id.button_small_close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout); + NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView); + drawerLayout.closeDrawer(navigationView,true); } }); diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index c5d1cec..59d5dfe 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -5,11 +5,13 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; import android.os.Bundle; import android.view.View; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ImageView; @@ -18,6 +20,7 @@ import android.widget.Toast; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; @@ -27,6 +30,7 @@ import com.qtagger.Activity.CameraActivity; import com.qtagger.Activity.LayoutTestActivity; import com.qtagger.Activity.NavigationActivity; import com.qtagger.Activity.TestSelectActivity; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.Data.OracleConnectionString; import com.qtagger.Database.AccountData; import com.qtagger.Database.DBHelper; @@ -44,11 +48,13 @@ import java.nio.file.Files; import java.util.List; public class MainActivity extends AppCompatActivity { + Context context; private Spinner mSpinner; private Button btnLogin; private DataManager dataManager= DataManager.getInstance(); private List accountList; private ImageView imageview_navTab; + Button button_login; DrawerLayout drawerLayout; NavigationView navigationView; @@ -62,6 +68,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + context = this; mSpinner = findViewById(R.id.spinner_account); CommonHelper.usbDevicePermission(this); CommonHelper.FolderClear(); @@ -70,6 +77,7 @@ public class MainActivity extends AppCompatActivity { drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); navigationView = (NavigationView) findViewById(R.id.navigationView); imageview_navTab = findViewById(R.id.imageview_navTab); + button_login = findViewById(R.id.button_login); imageview_navTab.setOnClickListener(new View.OnClickListener() { @Override @@ -92,8 +100,30 @@ public class MainActivity extends AppCompatActivity { }); + mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if(position == 0) + { + button_login.setBackgroundResource(R.drawable.button_new_default_disable_background); + button_login.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor)); + + } + else + { + button_login.setBackgroundResource(R.drawable.button_new_default_background); + button_login.setTextColor(Color.WHITE); + } + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + //로그인 - findViewById(R.id.button_login).setOnClickListener(new View.OnClickListener() { + button_login.setOnClickListener(new View.OnClickListener() { @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onClick(View v) { @@ -109,13 +139,13 @@ public class MainActivity extends AppCompatActivity { dataManager.loginAccount = accountList.get(selId-1); Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class); startActivity(intent); - finish(); - //Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class); - //startActivity(intent2); + //finish(); } } }); + CommonNavigationView.setDefaultViewEvent(this); + /* //계정 추가 findViewById(R.id.text_accountInsert).setOnClickListener(new View.OnClickListener() { @Override @@ -133,7 +163,7 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(getApplicationContext(), AccountList.class); startActivity(intent); } - }); + });*/ if(getConnectStatus())//온라인 모드 { @@ -152,6 +182,7 @@ public class MainActivity extends AppCompatActivity { ArrayAdapter aa_items = new ArrayAdapter(this, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item); aa_items.add("사용자를 선택해주세요"); + dataManager.loginAccount = null; //초기 데이터 세팅 accountList = dataManager.dbHelper.getAllAccount(); @@ -160,6 +191,7 @@ public class MainActivity extends AppCompatActivity { } mSpinner.setAdapter(aa_items); + button_login.setBackgroundResource(R.drawable.button_new_default_disable_background); } diff --git a/app/src/main/res/drawable-v24/btn_close.png b/app/src/main/res/drawable-v24/btn_close.png new file mode 100644 index 0000000..bf48d1e Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_close.png differ diff --git a/app/src/main/res/drawable-v24/btn_close_white.png b/app/src/main/res/drawable-v24/btn_close_white.png new file mode 100644 index 0000000..e98742e Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_close_white.png differ diff --git a/app/src/main/res/drawable-v24/btn_list_del.png b/app/src/main/res/drawable-v24/btn_list_del.png new file mode 100644 index 0000000..9479a95 Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_list_del.png differ diff --git a/app/src/main/res/drawable-v24/btn_retake.png b/app/src/main/res/drawable-v24/btn_retake.png new file mode 100644 index 0000000..51fdb59 Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_retake.png differ diff --git a/app/src/main/res/drawable-v24/btn_save.png b/app/src/main/res/drawable-v24/btn_save.png new file mode 100644 index 0000000..60f3388 Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_save.png differ diff --git a/app/src/main/res/drawable-v24/img_barcode.png b/app/src/main/res/drawable-v24/img_barcode.png new file mode 100644 index 0000000..dc91f64 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_barcode.png differ diff --git a/app/src/main/res/drawable-v24/img_cam01.png b/app/src/main/res/drawable-v24/img_cam01.png new file mode 100644 index 0000000..9e37eac Binary files /dev/null and b/app/src/main/res/drawable-v24/img_cam01.png differ diff --git a/app/src/main/res/drawable-v24/img_cam02.png b/app/src/main/res/drawable-v24/img_cam02.png new file mode 100644 index 0000000..4fa503c Binary files /dev/null and b/app/src/main/res/drawable-v24/img_cam02.png differ diff --git a/app/src/main/res/drawable-v24/img_data_export.png b/app/src/main/res/drawable-v24/img_data_export.png new file mode 100644 index 0000000..b684fb5 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_data_export.png differ diff --git a/app/src/main/res/drawable-v24/img_data_import.png b/app/src/main/res/drawable-v24/img_data_import.png new file mode 100644 index 0000000..68274fa Binary files /dev/null and b/app/src/main/res/drawable-v24/img_data_import.png differ diff --git a/app/src/main/res/drawable-v24/img_drum_list.png b/app/src/main/res/drawable-v24/img_drum_list.png new file mode 100644 index 0000000..1a87c13 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_drum_list.png differ diff --git a/app/src/main/res/drawable-v24/img_excel_down.png b/app/src/main/res/drawable-v24/img_excel_down.png new file mode 100644 index 0000000..a73370a Binary files /dev/null and b/app/src/main/res/drawable-v24/img_excel_down.png differ diff --git a/app/src/main/res/drawable-v24/img_infor_edit.png b/app/src/main/res/drawable-v24/img_infor_edit.png new file mode 100644 index 0000000..950a534 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_infor_edit.png differ diff --git a/app/src/main/res/drawable-v24/img_rfid.png b/app/src/main/res/drawable-v24/img_rfid.png new file mode 100644 index 0000000..472c2c4 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_rfid.png differ diff --git a/app/src/main/res/drawable-v24/img_search.png b/app/src/main/res/drawable-v24/img_search.png new file mode 100644 index 0000000..19010f8 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_search.png differ diff --git a/app/src/main/res/drawable-v24/img_user_add.png b/app/src/main/res/drawable-v24/img_user_add.png new file mode 100644 index 0000000..c71afd3 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_user_add.png differ diff --git a/app/src/main/res/drawable-v24/img_user_logout.png b/app/src/main/res/drawable-v24/img_user_logout.png new file mode 100644 index 0000000..2db863e Binary files /dev/null and b/app/src/main/res/drawable-v24/img_user_logout.png differ diff --git a/app/src/main/res/drawable-v24/img_user_server.png b/app/src/main/res/drawable-v24/img_user_server.png new file mode 100644 index 0000000..1b1fa49 Binary files /dev/null and b/app/src/main/res/drawable-v24/img_user_server.png differ diff --git a/app/src/main/res/drawable-v24/logo_nse.png b/app/src/main/res/drawable-v24/logo_nse.png new file mode 100644 index 0000000..df5689f Binary files /dev/null and b/app/src/main/res/drawable-v24/logo_nse.png differ diff --git a/app/src/main/res/drawable-v24/logo_qtagger.png b/app/src/main/res/drawable-v24/logo_qtagger.png new file mode 100644 index 0000000..da1c67c Binary files /dev/null and b/app/src/main/res/drawable-v24/logo_qtagger.png differ diff --git a/app/src/main/res/drawable-v24/main_menu01.png b/app/src/main/res/drawable-v24/main_menu01.png new file mode 100644 index 0000000..c28bc62 Binary files /dev/null and b/app/src/main/res/drawable-v24/main_menu01.png differ diff --git a/app/src/main/res/drawable-v24/main_menu02.png b/app/src/main/res/drawable-v24/main_menu02.png new file mode 100644 index 0000000..30c992d Binary files /dev/null and b/app/src/main/res/drawable-v24/main_menu02.png differ diff --git a/app/src/main/res/drawable-v24/main_menu03.png b/app/src/main/res/drawable-v24/main_menu03.png new file mode 100644 index 0000000..6294b7c Binary files /dev/null and b/app/src/main/res/drawable-v24/main_menu03.png differ diff --git a/app/src/main/res/drawable-v24/main_menu04.png b/app/src/main/res/drawable-v24/main_menu04.png new file mode 100644 index 0000000..a3afe93 Binary files /dev/null and b/app/src/main/res/drawable-v24/main_menu04.png differ diff --git a/app/src/main/res/drawable-v24/sub_menu01.png b/app/src/main/res/drawable-v24/sub_menu01.png new file mode 100644 index 0000000..9143df2 Binary files /dev/null and b/app/src/main/res/drawable-v24/sub_menu01.png differ diff --git a/app/src/main/res/drawable-v24/sub_menu02.png b/app/src/main/res/drawable-v24/sub_menu02.png new file mode 100644 index 0000000..85844db Binary files /dev/null and b/app/src/main/res/drawable-v24/sub_menu02.png differ diff --git a/app/src/main/res/drawable-v24/sub_menu03.png b/app/src/main/res/drawable-v24/sub_menu03.png new file mode 100644 index 0000000..02758c2 Binary files /dev/null and b/app/src/main/res/drawable-v24/sub_menu03.png differ diff --git a/app/src/main/res/drawable-v24/sub_menu04.png b/app/src/main/res/drawable-v24/sub_menu04.png new file mode 100644 index 0000000..05a61d0 Binary files /dev/null and b/app/src/main/res/drawable-v24/sub_menu04.png differ diff --git a/app/src/main/res/drawable/account_edit_background.xml b/app/src/main/res/drawable/account_edit_background.xml new file mode 100644 index 0000000..ac31f1b --- /dev/null +++ b/app/src/main/res/drawable/account_edit_background.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/account_edit_focus_background.xml b/app/src/main/res/drawable/account_edit_focus_background.xml new file mode 100644 index 0000000..003f352 --- /dev/null +++ b/app/src/main/res/drawable/account_edit_focus_background.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/button_new_default_disable_background.xml b/app/src/main/res/drawable/button_new_default_disable_background.xml new file mode 100644 index 0000000..09d8cde --- /dev/null +++ b/app/src/main/res/drawable/button_new_default_disable_background.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml index 70f4f7e..2b8dd42 100644 --- a/app/src/main/res/drawable/dialog_background.xml +++ b/app/src/main/res/drawable/dialog_background.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> - + diff --git a/app/src/main/res/drawable/squrebutton_background.xml b/app/src/main/res/drawable/squrebutton_background.xml index 9de458a..6c3ccde 100644 --- a/app/src/main/res/drawable/squrebutton_background.xml +++ b/app/src/main/res/drawable/squrebutton_background.xml @@ -12,9 +12,9 @@ android:topRightRadius="12dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml index d163bba..2792953 100644 --- a/app/src/main/res/layout/activity_account_add.xml +++ b/app/src/main/res/layout/activity_account_add.xml @@ -1,24 +1,25 @@ - - + + - + - + - + + + @@ -92,13 +106,13 @@ android:layout_marginTop="100dp" android:layout_marginEnd="16dp" android:text="등록" - android:background="@color/black" - android:textColor="#FFFFFF" + android:background="@drawable/button_new_default_disable_background" + android:textColor="@color/defaultDisableTextColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView_AccountDapt" /> + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_layout_test.xml b/app/src/main/res/layout/activity_layout_test.xml index bde0e8b..0b0f0e9 100644 --- a/app/src/main/res/layout/activity_layout_test.xml +++ b/app/src/main/res/layout/activity_layout_test.xml @@ -3,10 +3,10 @@ + app:srcCompat="@drawable/logo_qtagger" /> - - - - - - + app:srcCompat="@drawable/logo_nse" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index ee668e0..fa799dd 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,91 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml index eb234af..b3482e4 100644 --- a/app/src/main/res/layout/activity_test2.xml +++ b/app/src/main/res/layout/activity_test2.xml @@ -1,144 +1,122 @@ - + tools:context=".Activity.TestActivity"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical" + tools:context=".Activity.TestActivity"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml index 688c3fb..f8f41c7 100644 --- a/app/src/main/res/layout/activity_test_select.xml +++ b/app/src/main/res/layout/activity_test_select.xml @@ -8,52 +8,52 @@ android:orientation="vertical" tools:context=".Activity.TestSelectActivity"> - + android:orientation="vertical"> - - - + tools:context=".Activity.TestSelectActivity"> + + - + + + + + @@ -74,12 +74,11 @@ android:layout_marginBottom="2dp" android:layout_weight="1" android:background="@drawable/squrebutton_background" - android:foreground="@drawable/originchrct_86" + android:foreground="@drawable/main_menu01" android:foregroundGravity="center" android:gravity="center|bottom" - android:text="발생지특성 규명" - android:textStyle="bold" - android:textSize="20sp" /> + android:text="발생지 특성 규명" + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> - - + @@ -26,10 +27,9 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="172dp" android:layout_marginTop="12dp" - android:layout_marginEnd="181dp" android:text="Barcode 인식" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/imageView2" /> @@ -38,9 +38,7 @@ android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="172dp" android:layout_marginTop="8dp" - android:layout_marginEnd="181dp" android:text="Barcode를 인식해주세요" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_rfid.xml b/app/src/main/res/layout/fragment_rfid.xml index 2d455b4..056c1db 100644 --- a/app/src/main/res/layout/fragment_rfid.xml +++ b/app/src/main/res/layout/fragment_rfid.xml @@ -4,108 +4,81 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="10dp" android:background="@drawable/default_fragment_background" tools:context=".Activity.Search.RfidFragment"> - - - - + android:layout_height="match_parent" + android:background="@color/defaultBackgroundColor" + > - - - - - - + app:layout_constraintTop_toBottomOf="@+id/textView" /> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_dialog.xml b/app/src/main/res/layout/layout_dialog.xml index de0e085..542037e 100644 --- a/app/src/main/res/layout/layout_dialog.xml +++ b/app/src/main/res/layout/layout_dialog.xml @@ -2,8 +2,8 @@ + android:text="포장물 ID" + android:textColor="@color/dialogTitleColor" + android:textSize="13sp" /> + android:textColor="@color/dialogIdColor" + android:textSize="20sp" /> @@ -53,6 +58,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" + android:layout_marginBottom="50dp" android:background="@color/black"/> @@ -60,8 +66,8 @@ @@ -55,48 +61,48 @@ android:id="@+id/button_serverInfo" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_server" android:background="@android:color/transparent" android:paddingLeft="10dp" - android:text=" 서버 정보" + android:text=" 서버정보" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> @@ -115,24 +121,24 @@ android:id="@+id/button_AccountAdd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_add" android:background="@android:color/transparent" android:paddingLeft="10dp" android:text=" 사용자 등록" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> @@ -151,12 +157,12 @@ android:id="@+id/button_Close" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_logout" android:background="@android:color/transparent" android:padding="30dp" android:text=" 나가기" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a2ab01b..12f0325 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,6 +11,14 @@ #82CAFF #A5A5A5 #408DCF + #f3f3f3 + #f3f3f3 + #c5c5c5 + #959494 + #707070 + #0f8fc4 + #b4b4b4 + #408dcf #EAEAEA #F3F3F3 #D6D6D6 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 145846b..c9b7e02 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,5 +3,6 @@ \ No newline at end of file