diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..90a65c8
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="172.30.1.32:5555" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-10-03T07:15:24.796067800Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bf8a0e5..4b7687f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -90,12 +90,14 @@
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_capture.xml" value="0.3848958333333333" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_fill.xml" value="0.34427083333333336" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_info.xml" value="0.40625" />
+        <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_insert.xml" value="0.34427083333333336" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_list.xml" value="0.3848958333333333" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_photograph.xml" value="0.40625" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_rfid.xml" value="0.40625" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/fragment_weight2.xml" value="0.34427083333333336" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_capture_test.xml" value="0.34322916666666664" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_dialog.xml" value="0.34322916666666664" />
+        <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_dialog2.xml" value="0.34322916666666664" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_seekbar_thumb.xml" value="0.38385416666666666" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_side_menu.xml" value="0.31197916666666664" />
         <entry key="..\:/QTagger/a/QTagger_Android10/app/src/main/res/layout/layout_table_test.xml" value="0.34322916666666664" />
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json
index dee0ffa..d63f535 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/build_model.json
@@ -25,7 +25,10 @@
     "variantName": "debug",
     "isDebuggableEnabled": true,
     "validAbiList": [
-      "ARM64_V8A"
+      "ARMEABI_V7A",
+      "ARM64_V8A",
+      "X86",
+      "X86_64"
     ],
     "buildTargetSet": [
       "opencv_jni_shared"
@@ -125,7 +128,6 @@
         "rootBuildGradleFolder": "D:\\QTagger\\a\\QTagger_Android10",
         "sdkFolder": "C:\\Users\\lee\\AppData\\Local\\Android\\Sdk",
         "isBuildOnlyTargetAbiEnabled": true,
-        "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi",
         "isCmakeBuildCohabitationEnabled": false,
         "isPrefabEnabled": false
       },
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10006_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_10012_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10012_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10012_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_10306_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10306_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10306_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_10370_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10370_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10370_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_10431_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10431_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10431_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_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10705_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10705_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_10895_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10895_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10895_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_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11080_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11080_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_11175_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11175_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11175_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_11359_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11359_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11359_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_11733_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11733_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11733_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_12059_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12059_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12059_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_1213_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1213_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1213_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_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12409_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12409_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_1242_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1242_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1242_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_1244_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1244_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1244_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_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1248_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1248_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_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12746_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12746_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_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13042_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13042_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_1330_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1330_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1330_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_13331_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13331_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13331_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_13713_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13713_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13713_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_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14000_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14000_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_1502_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1502_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1502_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_1556_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1556_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1556_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_1564_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1564_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1564_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_1604_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1604_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1604_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_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1632_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1632_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_1828_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1828_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1828_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_1903_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_timing.txt
index 9708df4..ad5cad1 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1903_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_1945_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1945_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1945_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_2019_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2019_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2019_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_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_208_timing.txt
new file mode 100644
index 0000000..ad5cad1
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_208_timing.txt
@@ -0,0 +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_2133_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2133_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2133_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_214_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_214_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_214_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_215_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_timing.txt
index 9708df4..ad5cad1 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_215_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_2239_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2239_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2239_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_226_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt
index 9708df4..1ae655d 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_226_timing.txt
@@ -1,2 +1,6 @@
 # C/C++ build system timings
 
+# 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_2363_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2363_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2363_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_2450_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2450_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2450_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_2577_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2577_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2577_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_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2637_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2637_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_2812_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2812_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2812_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_2862_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2862_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2862_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_3003_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3003_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3003_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_3035_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3035_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3035_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_3235_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3235_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3235_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_3419_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3419_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3419_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_3485_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3485_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3485_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_3583_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3583_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3583_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_3698_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3698_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3698_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_3834_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3834_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3834_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_3876_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3876_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3876_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_3967_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3967_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3967_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_4177_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4177_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4177_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_4220_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4220_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4220_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_4258_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_timing.txt
index 9708df4..ad5cad1 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_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_425_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_425_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_425_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_4461_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4461_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4461_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_4562_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4562_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4562_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_4579_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4579_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4579_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_4845_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4845_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4845_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_4918_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4918_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4918_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_497_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_497_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_497_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_5137_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5137_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5137_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_5229_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5229_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5229_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_5428_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5428_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5428_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_549_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_549_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_549_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_5593_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5593_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5593_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_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_570_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_570_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_5785_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5785_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5785_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_5858_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5858_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5858_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_586_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt
index ad5cad1..1ae655d 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_586_timing.txt
@@ -2,3 +2,5 @@
 
 # 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_592_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_592_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_592_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_5955_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5955_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5955_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_604_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_604_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_604_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_6219_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6219_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6219_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_627_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_627_timing.txt
new file mode 100644
index 0000000..3bd9be9
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_627_timing.txt
@@ -0,0 +1,3 @@
+# C/C++ build system timings
+generate_cxx_metadata 10ms
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6445_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_6563_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6563_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6563_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_6725_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6725_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6725_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_6852_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6852_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6852_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_7033_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7033_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7033_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_7123_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7123_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7123_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_7306_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7306_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7306_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_7461_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7461_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7461_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_7667_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7667_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7667_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_7798_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7798_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7798_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_7949_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7949_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7949_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_8091_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8091_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8091_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_8242_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8242_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8242_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_8385_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8385_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8385_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_849_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_849_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_849_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_8524_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8524_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8524_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_8673_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8673_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8673_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_8819_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8819_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8819_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_887_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_887_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_887_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_8997_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8997_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8997_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_899_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_899_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_899_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_9133_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9133_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9133_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_9342_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9342_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9342_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_9417_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9417_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9417_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_953_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_953_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_953_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_9679_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9679_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9679_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_9705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9705_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9705_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_998_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_998_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_998_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 dc58ea3..1b4103c 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": -2043322810
+    "memoizedHashCode": -1849808738
   },
   {
     "level_": 0,
@@ -25,7 +25,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -1679833128
+    "memoizedHashCode": -1486319056
   },
   {
     "level_": 0,
@@ -39,6 +39,6 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -940616731
+    "memoizedHashCode": -747102659
   }
 ]
\ No newline at end of file
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_10705_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_11080_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12409_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1248_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_12746_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_13042_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_14000_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_1632_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_208_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_2637_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/generate_cxx_metadata_570_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json
index ae23adc..839e073 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/armeabi-v7a/metadata_generation_record.json
@@ -11,7 +11,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -1277826182
+    "memoizedHashCode": -130090758
   },
   {
     "level_": 0,
@@ -25,7 +25,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -333854324
+    "memoizedHashCode": 813881100
   },
   {
     "level_": 0,
@@ -39,6 +39,6 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -782218149
+    "memoizedHashCode": 365517275
   }
 ]
\ No newline at end of file
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_10705_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_11080_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12409_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1248_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_12746_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_13042_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_14000_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_1632_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_208_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_2637_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt
index c7df4c6..f5e4ed1 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_30_timing.txt
@@ -8,3 +8,5 @@ generate_cxx_metadata completed in 929ms
 
 # C/C++ build system timings
 
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_570_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json
index e899ea8..5aa63c8 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/metadata_generation_record.json
@@ -11,7 +11,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": 75119626
+    "memoizedHashCode": 268633698
   },
   {
     "level_": 0,
@@ -25,7 +25,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -264009444
+    "memoizedHashCode": -70495372
   },
   {
     "level_": 0,
@@ -39,6 +39,6 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -132991209
+    "memoizedHashCode": 60522863
   }
 ]
\ No newline at end of file
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_10705_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_11080_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12409_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1248_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_12746_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_13042_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_14000_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_1632_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_208_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_2637_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_timing.txt
new file mode 100644
index 0000000..9708df4
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/generate_cxx_metadata_570_timing.txt
@@ -0,0 +1,2 @@
+# C/C++ build system timings
+
diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json
index ac585e7..f3d85cc 100644
--- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json
+++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86_64/metadata_generation_record.json
@@ -11,7 +11,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -364054270
+    "memoizedHashCode": 783681154
   },
   {
     "level_": 0,
@@ -25,7 +25,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -777478940
+    "memoizedHashCode": 370256484
   },
   {
     "level_": 0,
@@ -39,6 +39,6 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": 61162622
+    "memoizedHashCode": 1208898046
   }
 ]
\ 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 1b4a093..1353e4d 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": 1031842563
+    "memoizedHashCode": 1225356635
   }
 ]
\ No newline at end of file
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt
new file mode 100644
index 0000000..96156c7
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10211_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 18ms
+create_cxx_tasks completed in 19ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_timing.txt
new file mode 100644
index 0000000..dafe0c3
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10431_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_10548_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10548_timing.txt
new file mode 100644
index 0000000..1eabc2b
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10548_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 13ms
+create_cxx_tasks completed in 14ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_timing.txt
new file mode 100644
index 0000000..5215f74
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10729_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_1079_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1079_timing.txt
new file mode 100644
index 0000000..4458b14
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1079_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 20ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_timing.txt
new file mode 100644
index 0000000..c6c4836
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10924_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_1094_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1094_timing.txt
new file mode 100644
index 0000000..98b3bbc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1094_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 21ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_timing.txt
new file mode 100644
index 0000000..c6c4836
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11022_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_11213_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11213_timing.txt
new file mode 100644
index 0000000..5cac512
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11213_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_11577_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11577_timing.txt
new file mode 100644
index 0000000..5215f74
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11577_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_1180_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1180_timing.txt
new file mode 100644
index 0000000..82270ad
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1180_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 31ms
+create_cxx_tasks completed in 32ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_timing.txt
new file mode 100644
index 0000000..c6c4836
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11910_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_12246_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12246_timing.txt
new file mode 100644
index 0000000..dafe0c3
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12246_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_12590_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12590_timing.txt
new file mode 100644
index 0000000..5996777
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12590_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-ndk-meta-abi-list 13ms
+    create-module-model completed in 16ms
+    [gap of 14ms]
+  create-initial-cxx-model completed in 30ms
+create_cxx_tasks completed in 31ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_timing.txt
new file mode 100644
index 0000000..dafe0c3
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12879_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_13172_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13172_timing.txt
new file mode 100644
index 0000000..2cbb3c3
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13172_timing.txt
@@ -0,0 +1,15 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 15ms
+create_cxx_tasks completed in 15ms
+
+# 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 15ms
+create_cxx_tasks completed in 15ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt
new file mode 100644
index 0000000..d3502d5
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1336_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 21ms
+create_cxx_tasks completed in 21ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt
new file mode 100644
index 0000000..6c2dc5f
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1387_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 23ms
+create_cxx_tasks completed in 23ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1418_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_1438_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1438_timing.txt
new file mode 100644
index 0000000..954d10e
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1438_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 25ms
+
+# 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_1472_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1472_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1472_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_1675_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1675_timing.txt
new file mode 100644
index 0000000..c7f6fcd
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1675_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_1754_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1754_timing.txt
new file mode 100644
index 0000000..952fea8
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1754_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 22ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt
new file mode 100644
index 0000000..6e7e995
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1863_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 25ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 22ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_timing.txt
new file mode 100644
index 0000000..c7f6fcd
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1969_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_2086_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2086_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2086_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_2302_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2302_timing.txt
new file mode 100644
index 0000000..9691afc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2302_timing.txt
@@ -0,0 +1,5 @@
+# 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_2422_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2422_timing.txt
new file mode 100644
index 0000000..c37f43a
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2422_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_2479_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2479_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2479_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_2645_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2645_timing.txt
new file mode 100644
index 0000000..efd7135
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2645_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 24ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_timing.txt
new file mode 100644
index 0000000..e340677
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2714_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_2872_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt
new file mode 100644
index 0000000..61c8ba2
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2872_timing.txt
@@ -0,0 +1,15 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 20ms
+create_cxx_tasks completed in 20ms
+
+# 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 19ms
+create_cxx_tasks completed in 20ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3003_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_3068_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3068_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3068_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_30_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt
index 5552de8..93abac3 100644
--- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt
@@ -232,3 +232,68 @@ create_cxx_tasks
   create-initial-cxx-model 35ms
 create_cxx_tasks completed in 36ms
 
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 34ms
+create_cxx_tasks completed in 36ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    [gap of 15ms]
+    create-X86_64-model 24ms
+    [gap of 18ms]
+  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
+      create-cmake-model 22ms
+    create-module-model completed in 24ms
+    [gap of 15ms]
+  create-initial-cxx-model completed in 58ms
+create_cxx_tasks completed in 59ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    create-module-model
+      create-cmake-model 20ms
+    create-module-model completed in 23ms
+    [gap of 15ms]
+  create-initial-cxx-model completed in 55ms
+create_cxx_tasks completed in 56ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    [gap of 22ms]
+    create-ARMEABI_V7A-model 21ms
+    [gap of 11ms]
+  create-initial-cxx-model completed in 54ms
+create_cxx_tasks completed in 55ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 36ms
+create_cxx_tasks completed in 37ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    [gap of 27ms]
+    create-ARM64_V8A-model 23ms
+  create-initial-cxx-model completed in 58ms
+create_cxx_tasks completed in 60ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model
+    [gap of 15ms]
+    create-X86_64-model 25ms
+    [gap of 18ms]
+  create-initial-cxx-model completed in 58ms
+create_cxx_tasks completed in 60ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3338_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_339_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt
index deca6ed..a8f1337 100644
--- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_339_timing.txt
@@ -18,3 +18,8 @@ create_cxx_tasks
   create-initial-cxx-model 30ms
 create_cxx_tasks completed in 30ms
 
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 34ms
+create_cxx_tasks completed in 36ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_timing.txt
new file mode 100644
index 0000000..c7f6fcd
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3426_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_3671_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3671_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3671_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_3720_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3720_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3720_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_3813_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3813_timing.txt
new file mode 100644
index 0000000..d3502d5
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3813_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 21ms
+create_cxx_tasks completed in 21ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4014_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_4058_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4058_timing.txt
new file mode 100644
index 0000000..a8bd042
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4058_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 28ms
+create_cxx_tasks completed in 29ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt
new file mode 100644
index 0000000..96156c7
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4107_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 18ms
+create_cxx_tasks completed in 19ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt
index 842a4b6..9ae2896 100644
--- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_418_timing.txt
@@ -41,3 +41,8 @@ create_cxx_tasks
   create-initial-cxx-model 32ms
 create_cxx_tasks completed in 33ms
 
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 26ms
+create_cxx_tasks completed in 27ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt
index 81efe7d..3a03462 100644
--- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_422_timing.txt
@@ -23,3 +23,8 @@ create_cxx_tasks
   create-initial-cxx-model 40ms
 create_cxx_tasks completed in 42ms
 
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 28ms
+create_cxx_tasks completed in 30ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt
new file mode 100644
index 0000000..78697cc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_425_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 33ms
+create_cxx_tasks completed in 34ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 25ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4297_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_4404_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4404_timing.txt
new file mode 100644
index 0000000..9691afc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4404_timing.txt
@@ -0,0 +1,5 @@
+# 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_4417_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4417_timing.txt
new file mode 100644
index 0000000..c37f43a
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4417_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_453_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_453_timing.txt
new file mode 100644
index 0000000..a0af67c
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_453_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 28ms
+create_cxx_tasks completed in 29ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 23ms
+create_cxx_tasks completed in 24ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt
new file mode 100644
index 0000000..f4bbc7a
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_459_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 30ms
+create_cxx_tasks completed in 31ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt
new file mode 100644
index 0000000..a73219e
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4695_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 26ms
+create_cxx_tasks completed in 27ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt
new file mode 100644
index 0000000..ffc6c5a
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4749_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 22ms
+create_cxx_tasks completed in 23ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt
new file mode 100644
index 0000000..efd7135
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4987_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 24ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt
new file mode 100644
index 0000000..fdd8bff
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5083_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 31ms
+create_cxx_tasks completed in 32ms
+
+# 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_5280_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5280_timing.txt
new file mode 100644
index 0000000..e340677
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5280_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_5618_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_timing.txt
new file mode 100644
index 0000000..952fea8
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5618_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 22ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5712_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_5955_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5955_timing.txt
new file mode 100644
index 0000000..a723377
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5955_timing.txt
@@ -0,0 +1,10 @@
+# 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 16ms
+create_cxx_tasks completed in 17ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt
new file mode 100644
index 0000000..a894adf
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6066_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 22ms
+create_cxx_tasks completed in 23ms
+
+# 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_6578_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt
new file mode 100644
index 0000000..ba450f6
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6578_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 25ms
+create_cxx_tasks completed in 25ms
+
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 21ms
+create_cxx_tasks completed in 22ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_timing.txt
new file mode 100644
index 0000000..5cac512
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6684_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_6976_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6976_timing.txt
new file mode 100644
index 0000000..e340677
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6976_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_700_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt
index f4bbc7a..bfa88a8 100644
--- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_700_timing.txt
@@ -3,3 +3,13 @@ create_cxx_tasks
   create-initial-cxx-model 30ms
 create_cxx_tasks completed in 31ms
 
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 28ms
+create_cxx_tasks completed in 29ms
+
+# 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_7160_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7160_timing.txt
new file mode 100644
index 0000000..a3122bf
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7160_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_7310_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7310_timing.txt
new file mode 100644
index 0000000..a3122bf
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7310_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_739_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_739_timing.txt
new file mode 100644
index 0000000..a73219e
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_739_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 26ms
+create_cxx_tasks completed in 27ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_timing.txt
new file mode 100644
index 0000000..c37f43a
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7499_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_752_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_752_timing.txt
new file mode 100644
index 0000000..dbde357
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_752_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+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 23ms
+create_cxx_tasks completed in 25ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt
new file mode 100644
index 0000000..9691afc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7646_timing.txt
@@ -0,0 +1,5 @@
+# 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_7793_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7793_timing.txt
new file mode 100644
index 0000000..c6c4836
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7793_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_7939_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7939_timing.txt
new file mode 100644
index 0000000..635b424
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7939_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_8089_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8089_timing.txt
new file mode 100644
index 0000000..9766745
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8089_timing.txt
@@ -0,0 +1,10 @@
+# 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 17ms
+create_cxx_tasks completed in 18ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt
new file mode 100644
index 0000000..957f2ba
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_842_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 25ms
+
diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt
new file mode 100644
index 0000000..bf3535c
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8511_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 18ms
+create_cxx_tasks completed in 18ms
+
+# 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_8670_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8670_timing.txt
new file mode 100644
index 0000000..5cac512
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8670_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_8965_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8965_timing.txt
new file mode 100644
index 0000000..dafe0c3
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8965_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_9173_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9173_timing.txt
new file mode 100644
index 0000000..5cac512
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9173_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_9260_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9260_timing.txt
new file mode 100644
index 0000000..c6c4836
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9260_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_9522_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9522_timing.txt
new file mode 100644
index 0000000..e10017d
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9522_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_9557_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9557_timing.txt
new file mode 100644
index 0000000..3eb6969
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9557_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_9858_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9858_timing.txt
new file mode 100644
index 0000000..329bab9
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9858_timing.txt
@@ -0,0 +1,10 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 20ms
+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_9863_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_timing.txt
new file mode 100644
index 0000000..9691afc
--- /dev/null
+++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9863_timing.txt
@@ -0,0 +1,5 @@
+# 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/ndk_locator_record_g55441w3.log b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log
index ea3a936..a2ffc99 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": 1873877181
+    "memoizedHashCode": 2067391253
   },
   {
     "level_": 0,
@@ -25,7 +25,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -1628902012
+    "memoizedHashCode": -1435387940
   },
   {
     "level_": 0,
@@ -39,7 +39,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": -924440819
+    "memoizedHashCode": -730926747
   },
   {
     "level_": 0,
@@ -53,7 +53,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": 938373251
+    "memoizedHashCode": 1131887323
   },
   {
     "level_": 0,
@@ -67,7 +67,7 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": 1215401099
+    "memoizedHashCode": 1408915171
   },
   {
     "level_": 0,
@@ -81,6 +81,6 @@
       "fieldsDescending": {}
     },
     "memoizedSize": -1,
-    "memoizedHashCode": 381663888
+    "memoizedHashCode": 575177960
   }
 ]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b886f14..36f3872 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,12 +25,12 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/logo"
+        android:icon="@drawable/img_setup"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@drawable/logo"
+        android:roundIcon="@drawable/img_setup"
         android:supportsRtl="true"
         android:theme="@style/Theme.QTagger"
         android:usesCleartextTraffic="true"
diff --git a/app/src/main/java/com/qtagger/Activity/CameraActivity.java b/app/src/main/java/com/qtagger/Activity/CameraActivity.java
index a8da3ba..f7fadd5 100644
--- a/app/src/main/java/com/qtagger/Activity/CameraActivity.java
+++ b/app/src/main/java/com/qtagger/Activity/CameraActivity.java
@@ -3,6 +3,7 @@ package com.qtagger.Activity;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.utils.widget.ImageFilterButton;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import android.app.PendingIntent;
@@ -42,6 +43,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.googlecode.tesseract.android.ResultIterator;
@@ -51,6 +53,7 @@ import com.hoho.android.usbserial.driver.UsbSerialPort;
 import com.hoho.android.usbserial.driver.UsbSerialProber;
 import com.qtagger.CustomPalette.CameraSurfaceView;
 import com.qtagger.CustomPalette.RectangleWeightCapture;
+import com.qtagger.Data.CameraInfoSet;
 import com.qtagger.Data.CustomProber;
 import com.qtagger.Data.TestEnum;
 import com.qtagger.Database.ImageFile;
@@ -94,11 +97,13 @@ import java.util.stream.Collectors;
 public class CameraActivity extends AppCompatActivity {
     public Context mContext;
     ImageView imageView;
+    TextView textView_radValue;
     CameraSurfaceView surfaceView;
-    ConstraintLayout layout_top_menu;
+    ConstraintLayout layout_top_menu,constraintLayout_radValue;
     RelativeLayout pictureLayout;
     LinearLayout saveLayout;
     ProgressBar progressBar;
+    ImageFilterButton imageFilterButton_Back;
     String dbTestType;
     DataManager dataManager = DataManager.getInstance();
     Bitmap resultBitmap,mOrigin;
@@ -239,6 +244,7 @@ public class CameraActivity extends AppCompatActivity {
                     double df = f;
                     df = df / 10;
                     pkgData = String.format("%.5f", df);
+                    textView_radValue.setText(pkgData + " μSv/hr");
                     progressBar.setVisibility(View.INVISIBLE);
                     Log.i("jjhTest!!!!!" , String.format("%.5f", df)  + " μSv/hr");
                 }
@@ -461,9 +467,6 @@ public class CameraActivity extends AppCompatActivity {
         detectThread.start();
     }
 
-
-
-
     //무게 인식
     static {
         System.loadLibrary("native-lib");
@@ -494,6 +497,9 @@ public class CameraActivity extends AppCompatActivity {
         button_weightAlter = findViewById(R.id.button_weightAlter);
         progressBar = findViewById(R.id.capture_loading);
         layout_top_menu = findViewById(R.id.layout_top_menu);
+        textView_radValue = findViewById(R.id.textView_radValue);
+        constraintLayout_radValue = findViewById(R.id.constraintLayout_radValue);
+        imageFilterButton_Back = findViewById(R.id.imageFilterButton_Back);
 
 
         if(dbTestType == null)
@@ -505,7 +511,7 @@ public class CameraActivity extends AppCompatActivity {
         {
             usbService();
             progressBar.setVisibility(View.VISIBLE);
-
+            constraintLayout_radValue.setVisibility(View.VISIBLE);
         }
 
         octChecker = dbTestType.compareTo(TestType.Weight.name()) == 0;
@@ -517,6 +523,12 @@ public class CameraActivity extends AppCompatActivity {
             relativeLayout.addView(box, new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
         }
 
+        imageFilterButton_Back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                viewToggle();
+            }
+        });
 
         Button button = findViewById(R.id.button);
         button.setOnClickListener(new View.OnClickListener() {
@@ -533,6 +545,18 @@ public class CameraActivity extends AppCompatActivity {
                 viewToggle();
             }
         });
+        findViewById(R.id.button_retake).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                viewToggle();
+            }
+        });
+        findViewById(R.id.imageFilterButton_save).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveImageFile();
+            }
+        });
 
         findViewById(R.id.button_PictureSave).setOnClickListener(new View.OnClickListener() {
             @RequiresApi(api = Build.VERSION_CODES.N)
@@ -609,6 +633,8 @@ public class CameraActivity extends AppCompatActivity {
             saveLayout.setVisibility(View.VISIBLE);
             button_weightAlter.setVisibility(View.INVISIBLE);
             layout_top_menu.setVisibility(View.VISIBLE);
+            if(usbChecker)
+                constraintLayout_radValue.setVisibility(View.INVISIBLE);
             if(box != null)
             {
                 box.setVisibility(View.INVISIBLE);
@@ -621,6 +647,8 @@ public class CameraActivity extends AppCompatActivity {
             pictureLayout.setVisibility(View.VISIBLE);
             saveLayout.setVisibility(View.GONE);
             layout_top_menu.setVisibility(View.INVISIBLE);
+            if(usbChecker)
+                constraintLayout_radValue.setVisibility(View.VISIBLE);
             if(octChecker) {
                 button_weightAlter.setVisibility(View.VISIBLE);
             }
@@ -679,7 +707,6 @@ public class CameraActivity extends AppCompatActivity {
         if(octChecker){
             mOrigin = bitmap;
             mOrigin = getRecognitionDigit();
-
         }
 
         if(bitmap.getWidth() > 640)
@@ -687,20 +714,28 @@ public class CameraActivity extends AppCompatActivity {
             bitmap = resizeBitmap(bitmap,640);
         }
 
-        String imgTitle = "";
-        String dataTitle = "";
+        List<CameraInfoSet> infoSets = new ArrayList<>();
+        infoSets.add(new CameraInfoSet("포장물 ID",pkgNo));
+
         if(dbTestType.contains("Surface") || dbTestType.contains("M1")) {
-            dataTitle = "선량률";
-            imgTitle = pkgData + " μSv/hr";
+            String testType = dbTestType.replace("Surface_","").replace("M1_","").replace("_","-");
+            infoSets.add(new CameraInfoSet("위치",testType));
+            infoSets.add(new CameraInfoSet("날짜",time));
+            infoSets.add(new CameraInfoSet("선량률",pkgData + " μSv/hr"));
         }
         else if(dbTestType.compareTo(TestType.Weight.name()) == 0){
-            dataTitle = "무게";
-            imgTitle = pkgData+"kg" ;
+            infoSets.add(new CameraInfoSet("날짜",time));
+            infoSets.add(new CameraInfoSet("무게",pkgData + " kg"));
 
         }
         else if(dbTestType.compareTo(TestType.Filling.name()) == 0){
-            dataTitle = "채움률";
-            imgTitle = pkgData + "%";
+            infoSets.add(new CameraInfoSet("날짜",time));
+            infoSets.add(new CameraInfoSet("채움률",pkgData + " %"));
+        }
+        else if(dbTestType.compareTo(TestType.Nothing.name()) == 0)
+        {
+            infoSets.add(new CameraInfoSet("날짜",time));
+            infoSets.add(new CameraInfoSet("설명",pkgData));
         }
 
 
@@ -719,20 +754,17 @@ public class CameraActivity extends AppCompatActivity {
         tPaint.setColor(Color.WHITE);
         tPaint.setStyle(Paint.Style.FILL);
         tPaint.setTextAlign(Paint.Align.LEFT);
-        cs.drawText("포장물 ID",bmpx + 30f,bmpy + 40f,tPaint);
-        cs.drawText("위치",bmpx + 30f,bmpy + 80f,tPaint);
-        cs.drawText("날짜",bmpx + 30f,bmpy + 120f,tPaint);
-
-        cs.drawText(dataTitle,bmpx + 30f,bmpy + 160f,tPaint);
 
+        for (int i=0;i<infoSets.size();i++)
+        {
+            cs.drawText(infoSets.get(i).getTitle(),bmpx + 30f,bmpy + (i+1)*40f,tPaint);
+        }
         tPaint.setColor(Color.YELLOW);
         tPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
-        cs.drawText(pkgNo,bmpx+150f,bmpy + 40f,tPaint);
-        cs.drawText(dbTestType,bmpx+150f,bmpy + 80f,tPaint);
-        cs.drawText(time,bmpx+150f,bmpy + 120f,tPaint);
-        cs.drawText(imgTitle,bmpx+150f,bmpy + 160f,tPaint);
-
-
+        for (int i=0;i<infoSets.size();i++)
+        {
+            cs.drawText(infoSets.get(i).getData(),bmpx + 150f,bmpy + (i+1)*40f,tPaint);
+        }
 
         imageView.setImageDrawable(new BitmapDrawable(bitmap));//이미지뷰에 사진 보여주기
         resultBitmap = bitmap;
@@ -751,30 +783,6 @@ public class CameraActivity extends AppCompatActivity {
         return result;
     }
 
-
-    private class AsyncAnalysis extends AsyncTask<Bitmap, Integer, Bitmap> {
-        @Override
-        protected Bitmap doInBackground(Bitmap... bitmap) {
-
-            Bitmap result =  getRecognitionDigit();
-
-            return result;
-        }
-
-        protected void onPostExecute(Bitmap result) {
-            //bFlag = true;
-
-            if(result != null)
-            {
-
-            }
-            else
-            {
-//                Toast.makeText(mContext, "이미지 반환 오류.", Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
     public Bitmap getRecognitionDigit() {
         Bitmap bitmap = mOrigin;
         Bitmap result = null;
@@ -942,7 +950,6 @@ public class CameraActivity extends AppCompatActivity {
     }
 
     public MatOfPoint2f findBigEdge(Mat src)
-//    public Mat findBigEdge(Mat src)
     {
         Mat gray = new Mat();
         Mat binary = new Mat();
diff --git a/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java
index de183cf..9d46de5 100644
--- a/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java
+++ b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java
@@ -3,16 +3,25 @@ package com.qtagger.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.qtagger.CustomPalette.CustomNuclideListItemAdapter;
 import com.qtagger.Database.ImageFile;
+import com.qtagger.Database.TestType;
 import com.qtagger.R;
 import com.qtagger.util.DataManager;
 
@@ -26,11 +35,12 @@ public class PictureInfoActivity extends AppCompatActivity {
         context = this;
         Intent intent = getIntent();
         String dbTestType = intent.getStringExtra("TestType");
+        String PkgData = intent.getStringExtra("PkgData");
 
         if(dbTestType == null || dbTestType.isEmpty())
             finish();
 
-        ImageFile imageFile = dataManager.dbHelper.selectFile(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label(),dbTestType);
+        ImageFile imageFile = dataManager.dbHelper.selectFile(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label(),dbTestType,PkgData);
 
         if(imageFile == null)
             finish();
@@ -46,24 +56,58 @@ public class PictureInfoActivity extends AppCompatActivity {
                 finish();
             }
         });
-        
+
+        findViewById(R.id.button_retake).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent cameraIntent = new Intent(getApplicationContext(), CameraActivity.class);
+                cameraIntent.putExtra("TestType", dbTestType);
+                cameraIntent.putExtra("PkgData",PkgData);
+                startActivity(cameraIntent);
+
+                finish();
+            }
+        });
+
+        /*
         findViewById(R.id.imageFilterButton_delete).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //삭제 로직 추가
-                android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(context);
 
-                builder.setTitle("삭제 알림").setMessage("해당파일을 삭제하시겠습니까?");
-                builder.setPositiveButton("삭제", new DialogInterface.OnClickListener() {
+                AlertDialog.Builder builder = new AlertDialog.Builder(context
+                        , R.style.AlertDialogTheme);
+
+                View view = LayoutInflater.from(context).inflate(
+                        R.layout.layout_dialog2,
+                        (LinearLayout) ((Activity)context).findViewById(R.id.layoutDialog));
+
+                //다이얼로그 텍스트 설정
+                builder.setView(view);
+
+                AlertDialog alertDialog = builder.create();
+
+                view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
+                    public void onClick(View v) {
+                        alertDialog.dismiss();
+                    }
+                });
+
+                view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
                         dataManager.dbHelper.deleteFile(imageFile);
                         finish();
                     }
-                }).setNegativeButton("취소",null);
-                android.app.AlertDialog alertDialog = builder.create();
+                });
+
+
+                if (alertDialog.getWindow() != null) {
+                    alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+                }
+
                 alertDialog.show();
             }
-        });
+        });*/
     }
 }
\ No newline at end of file
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 2eb03a1..1ff2e33 100644
--- a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java
@@ -102,7 +102,18 @@ public class BarcodeFragment extends Fragment {
                         && !"NR".equals(barcode)
                 ) {
                     barcodeStr = barcode;
-                    showCustomDialog();
+                    PKG searchPkg = null;
+                    if (!barcodeStr.isEmpty()) {
+
+                        for (PKG pkg : dataManager.pkgList) {
+                            if (pkg.getPKG_NO().compareTo(barcodeStr) == 0) {
+                                searchPkg = pkg;
+                                break;
+                            }
+                        }
+                    }
+
+                    showCustomDialog(searchPkg == null);
                 }
             }
         });
@@ -126,7 +137,7 @@ public class BarcodeFragment extends Fragment {
             openDialogChecker = false;
     }
 
-    private void showCustomDialog() {
+    private void showCustomDialog(boolean insertChecker) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()
                 , R.style.AlertDialogTheme);
@@ -138,9 +149,12 @@ public class BarcodeFragment extends Fragment {
         builder.setOnKeyListener(new DialogInterface.OnKeyListener() {
             @Override
             public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-                openDialogChecker = true;
-                alertDialog.dismiss();
-                setPkg();
+
+                if(keyCode == 138) {
+                    openDialogChecker = true;
+                    alertDialog.dismiss();
+                    setPkg();
+                }
                 return false;
             }
         });
@@ -148,7 +162,7 @@ public class BarcodeFragment extends Fragment {
         builder.setView(view);
         ((TextView) view.findViewById(R.id.textTitle)).setText("Barcode");
         ((TextView) view.findViewById(R.id.textMessage)).setText(barcodeStr);
-        ((Button) view.findViewById(R.id.btnOk)).setText("확인");
+        ((Button) view.findViewById(R.id.btnOk)).setText(insertChecker?"추가":"확인");
         builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
@@ -210,7 +224,6 @@ public class BarcodeFragment extends Fragment {
         }
     }
 
-
     public void barcodeReadData() {
         if (barcodeScanner.isDecoding()) {
             barcodeScanner.stopDecode();
diff --git a/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java
index 428b604..b0a0e75 100644
--- a/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java
@@ -84,7 +84,6 @@ public class ListFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view =inflater.inflate(R.layout.fragment_list, container, false);
-        dataManager.pkgList = dataManager.dbHelper.getAllTest(dataManager.testEnum);
         listPkg = view.findViewById(R.id.list_pkg);
 
         /*
diff --git a/app/src/main/java/com/qtagger/Activity/SearchActivity.java b/app/src/main/java/com/qtagger/Activity/SearchActivity.java
index 5082455..56a1fbd 100644
--- a/app/src/main/java/com/qtagger/Activity/SearchActivity.java
+++ b/app/src/main/java/com/qtagger/Activity/SearchActivity.java
@@ -5,6 +5,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -40,8 +41,7 @@ public class SearchActivity extends AppCompatActivity {
         drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
         navigationView = (NavigationView) findViewById(R.id.navigationView);
 
-
-
+        dataManager.pkgList = dataManager.dbHelper.getAllTest(dataManager.testEnum);
 
         rfidFragment = new RfidFragment();
         barcodeFragment = new BarcodeFragment();
@@ -87,6 +87,7 @@ public class SearchActivity extends AppCompatActivity {
                     View tabViewChild = vgTab.getChildAt(i);
                     if (tabViewChild instanceof TextView) {
                         ((TextView) tabViewChild).setTextSize(16);
+                        ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf"));
                     }
                 }
 
@@ -118,6 +119,7 @@ public class SearchActivity extends AppCompatActivity {
                     View tabViewChild = vgTab.getChildAt(i);
                     if (tabViewChild instanceof TextView) {
                         ((TextView) tabViewChild).setTextSize(14);
+                        ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555"));
                     }
                 }
 
@@ -170,9 +172,11 @@ public class SearchActivity extends AppCompatActivity {
                         if(i==0)
                         {
                             ((TextView) tabViewChild).setTextSize(16);
+                            ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf"));
                         }
                         else{
                             ((TextView) tabViewChild).setTextSize(14);
+                            ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555"));
                         }
                     }
                 }
diff --git a/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java
index 7a29cdb..e838250 100644
--- a/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java
@@ -40,6 +40,7 @@ import android.widget.Toast;
 import com.qtagger.Activity.AccountList;
 import com.qtagger.Activity.CameraActivity;
 import com.qtagger.Activity.PictureInfoActivity;
+import com.qtagger.Activity.TestActivity;
 import com.qtagger.Data.CaptureFragmentEnum;
 import com.qtagger.Database.ImageFile;
 import com.qtagger.Database.TestType;
@@ -75,13 +76,6 @@ public class CaptureFragment extends Fragment {
         context = container.getContext();
         View view = inflater.inflate(R.layout.fragment_capture, container, false);
 
-        /*
-        View tobacco = view.findViewById(R.id.capture_topBack);
-        TextView textView = tobacco.findViewById(R.id.capture_title);
-        textView.setText("TOP-BACK");*/
-
-
-
         btnTopFront = view.findViewById(R.id.capture_topFront);
         btnTopBack = view.findViewById(R.id.capture_topBack);
         btnTopLeft = view.findViewById(R.id.capture_topLeft);
@@ -97,96 +91,7 @@ public class CaptureFragment extends Fragment {
         btnBottomLeft = view.findViewById(R.id.capture_bottomLeft);
         btnBottomRight = view.findViewById(R.id.capture_bottomRight);
 
-        /*
-        btnTopFront.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(Top_Front));
-            }
-        });
 
-        btnTopBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Top_Back));
-            }
-        });
-
-        btnTopLeft.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Top_Left));
-            }
-        });
-
-        btnTopRight.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Top_Right));
-            }
-        });
-
-
-
-
-        btnMiddleFront.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Middle_Front));
-            }
-        });
-
-        btnMiddleBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Middle_Back));
-            }
-        });
-
-        btnMiddleLeft.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Middle_Left));
-            }
-        });
-
-        btnMiddleRight.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Middle_Right));
-            }
-        });
-
-
-
-
-        btnBottomFront.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Bottom_Front));
-            }
-        });
-
-        btnBottomBack.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Bottom_Back));
-            }
-        });
-
-        btnBottomLeft.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Bottom_Left));
-            }
-        });
-
-        btnBottomRight.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraActivityOpen(Type.getTestType(TestType.Bottom_Right));
-            }
-        });*/
 
 
 
@@ -200,7 +105,7 @@ public class CaptureFragment extends Fragment {
             TextView textView = view.findViewById(R.id.capture_title);
             textView.setText(title);
         }
-        //item_title
+
         TextView textView = view.findViewById(R.id.item_title);
         textView.setText(type.label());
 
@@ -219,35 +124,26 @@ public class CaptureFragment extends Fragment {
         LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
         linearLayout.setVisibility(View.INVISIBLE);
 
-        linearLayout.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
 
-                //
-                pictureInfoActivityOpen(Type.getTestType(Top_Front));
-
-                //Toast.makeText(context, "테스트입니다.", Toast.LENGTH_SHORT).show();
-            }
-        });
 
     }
 
     private void allResetView()
     {
-        resetView(btnTopFront,"TOP-FRONT", Top_Front);
-        resetView(btnTopBack,"TOP-BACK" ,Top_Back);
-        resetView(btnTopLeft,"TOP-LEFT" ,Top_Left);
-        resetView(btnTopRight,"TOP-RIGHT",Top_Right);
+        resetView(btnTopFront,"Top-Front", Top_Front);
+        resetView(btnTopBack,"Top-Back" ,Top_Back);
+        resetView(btnTopLeft,"Top-Left" ,Top_Left);
+        resetView(btnTopRight,"Top-Right",Top_Right);
 
-        resetView(btnMiddleFront,"MIDDLE-FRONT" ,Middle_Front);
-        resetView(btnMiddleBack,"MIDDLE-BACK" ,Middle_Back);
-        resetView(btnMiddleLeft,"MIDDLE-LEFT" ,Middle_Left);
-        resetView(btnMiddleRight,"MIDDLE-RIGHT",Middle_Right );
+        resetView(btnMiddleFront,"Middle-Front" ,Middle_Front);
+        resetView(btnMiddleBack,"Middle-Back" ,Middle_Back);
+        resetView(btnMiddleLeft,"Middle-Left" ,Middle_Left);
+        resetView(btnMiddleRight,"Middle-Right",Middle_Right );
 
-        resetView(btnBottomFront,"BOTTOM-FRONT",Bottom_Front );
-        resetView(btnBottomBack,"BOTTOM-BACK" ,Bottom_Back);
-        resetView(btnBottomLeft,"BOTTOM-LEFT" ,Bottom_Left);
-        resetView(btnBottomRight,"BOTTOM-RIGHT" ,Bottom_Right);
+        resetView(btnBottomFront,"Bottom-Front",Bottom_Front );
+        resetView(btnBottomBack,"Bottom-Back" ,Bottom_Back);
+        resetView(btnBottomLeft,"Bottom-Left" ,Bottom_Left);
+        resetView(btnBottomRight,"Bottom-Right" ,Bottom_Right);
     }
 
 
@@ -257,9 +153,26 @@ public class CaptureFragment extends Fragment {
         ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add);
         constraintLayout.setVisibility(View.INVISIBLE);
 
+
         LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
         linearLayout.setVisibility(View.VISIBLE);
 
+        linearLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                pictureInfoActivityOpen(file.getType());
+            }
+        });
+
+        ImageView deleteView = view.findViewById(R.id.imageView_deleteButton);
+        deleteView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((TestActivity)getActivity()).deleteAlert(file, constraintLayout, linearLayout);
+            }
+        });
+
+
         ImageView imageView = view.findViewById(R.id.nuclide_picture);
         imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath())));
 
@@ -269,9 +182,6 @@ public class CaptureFragment extends Fragment {
 
         TextView textViewData = view.findViewById(R.id.nuclide_data);
         textViewData.setText(file.getPkgData()+" μ㏜/hr");
-
-
-
     }
 
 
@@ -287,7 +197,6 @@ public class CaptureFragment extends Fragment {
 
 
         List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
-
         for(ImageFile file : files)
         {
             if(file.getType().contains(Type.name()))
@@ -295,14 +204,6 @@ public class CaptureFragment extends Fragment {
                 TestType dbType =TestType.getByName(file.getType().replace(Type.name(),""));
                 View selView = getTestTypeView(dbType);
                 setInfoView(selView,file);
-
-                /*
-                if(selButton != null)
-                {
-                    selButton.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath())));
-                    selButton.setForeground(null);
-                }*/
-
             }
         }
     }
diff --git a/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java
index 9595919..345105f 100644
--- a/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java
@@ -1,5 +1,7 @@
 package com.qtagger.Activity.Test;
 
+import static com.qtagger.Database.TestType.Top_Front;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -12,6 +14,7 @@ import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
@@ -23,10 +26,15 @@ import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import com.qtagger.Activity.CameraActivity;
+import com.qtagger.Activity.PictureInfoActivity;
+import com.qtagger.Activity.TestActivity;
 import com.qtagger.Data.CaptureFragmentEnum;
 import com.qtagger.Database.ImageFile;
 import com.qtagger.Database.TestType;
@@ -47,14 +55,10 @@ public class FillFragment extends Fragment {
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     private static final String ARG_PARAM1 = "param1";
     private static final String ARG_PARAM2 = "param2";
-    private int FillValue = -1;
-    Button foldingButton, btnFilling;
-    RadioGroup radioGroup;
-    EditText editText;
-    RadioButton radioInput;
-    ImageFile fillingFile = null;
     DataManager dataManager = DataManager.getInstance();
     private Context context;
+    String otherValue;
+    View filling_100,filling_75,filling_50,filling_25,filling;
 
 
     // TODO: Rename and change types of parameters
@@ -98,221 +102,173 @@ public class FillFragment extends Fragment {
         View view = inflater.inflate(R.layout.fragment_fill, container, false);
         context = container.getContext();
 
-        editText = view.findViewById(R.id.editInput);
-        foldingButton = view.findViewById(R.id.folding_button);
-        radioGroup = view.findViewById(R.id.radio_fill_value);
-        radioInput = view.findViewById(R.id.fillInput);
-        btnFilling = view.findViewById(R.id.fill_Picture);
-
-        btnFilling.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(FillValue == -1)
-                {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-                    builder.setTitle("채움률").setMessage("채움률을 선택해주세요.");
-                    builder.setPositiveButton("확인", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-
-                        }
-                    });
-                    AlertDialog alertDialog = builder.create();
-                    alertDialog.show();
-                }
-                else
-                {
-                    Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
-                    cameraIntent.putExtra("TestType",TestType.Filling.name());
-                    cameraIntent.putExtra("PkgData",Integer.toString(FillValue));
-                    startActivity(cameraIntent);
-                }
-            }
-        });
-        view.findViewById(R.id.fill_OK).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(FillValue == -1)
-                {
-                    foldingButton.setText("채움률 입력해주세요");
-                }
-                else {
-                    foldingButton.setText("채움률 : " + String.valueOf(FillValue) + "%");
-                    toggleLayout();
-                }
-            }
-        });
-
-        if(FillValue == -1)
-            toggleLayout();
-
-        view.findViewById(R.id.folding_button).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toggleLayout();
-            }
-        });
-
-        RadioGroup radioGroup = view.findViewById(R.id.radio_fill_value);
-        radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                switch (checkedId){
-                    case R.id.fill100:
-                        editText.setVisibility(View.GONE);
-                        FillValue = 100;
-                        break;
-                    case R.id.fill75:
-                        editText.setVisibility(View.GONE);
-                        FillValue = 75;
-                        break;
-                    case R.id.fill50:
-                        editText.setVisibility(View.GONE);
-                        FillValue = 50;
-                        break;
-                    case R.id.fill25:
-                        editText.setVisibility(View.GONE);
-                        FillValue = 25;
-                        break;
-                    case R.id.fill0:
-                        editText.setVisibility(View.GONE);
-                        FillValue = 0;
-                        break;
-                    case R.id.fillInput:
-                        editText.setVisibility(View.VISIBLE);
-                        break;
-
-                }
-            }
-        });
-
-        editText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                if(editText.getText().toString().isEmpty())
-                {
-                    FillValue = -1;
-                    radioInput.setText("직접입력");
-                }
-                else
-                {
-                     radioInput.setText("직접입력 ("+editText.getText().toString() +"%)" );
-                    FillValue = Integer.parseInt(editText.getText().toString());
-                }
-
-                if(FillValue >100)
-                {
-                    FillValue = 100;
-                    editText.setText(String.valueOf(FillValue));
-                    editText.setSelection(3);
-                }
-            }
-        });
-
+        filling_100 = view.findViewById(R.id.filling_100);
+        filling_75 = view.findViewById(R.id.filling_75);
+        filling_50 = view.findViewById(R.id.filling_50);
+        filling_25 = view.findViewById(R.id.filling_25);
+        filling = view.findViewById(R.id.filling);
 
 
         return view;
     }
 
-    private void toggleLayout(){
-        changeLayout(radioGroup.getVisibility() == View.GONE);
-    }
+    private void resetView(View view, String title, int fillValue)
+    {
+        if(title != null && !title.isEmpty()) {
+            TextView textView = view.findViewById(R.id.capture_title);
+            textView.setText(title);
+        }
+
+        TextView textView = view.findViewById(R.id.item_title);
+        textView.setText("");
+        //textView_location
+        TextView textView_location = view.findViewById(R.id.textView_location);
+        textView_location.setText("");
+        
+        //textView_valueTitle
+        TextView textView_valueTitle = view.findViewById(R.id.textView_valueTitle);
+        textView_valueTitle.setText("채움률");
+
+
+        ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add);
+        constraintLayout.setVisibility(View.VISIBLE);
+        constraintLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cameraActivityOpen(fillValue);
 
-    private void changeLayout(boolean change){
-        if(change) {
-            foldingButton.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(getActivity(), R.drawable.arrows_left_48), null);
-            radioGroup.setVisibility(View.VISIBLE);
-            if(radioGroup.getCheckedRadioButtonId() == R.id.fillInput)
-            {
-                editText.setVisibility(View.VISIBLE);
             }
-        }
-        else  {
-            foldingButton.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(getActivity(), R.drawable.arrows_down_48), null);
-            radioGroup.setVisibility(View.GONE);
-            editText.setVisibility(View.GONE);
-        }
+        });
+
+        //ImageView imageView = view.findViewById(R.id.imageView_deleteButton);
+        //imageView.setVisibility(View.INVISIBLE);
+
+        LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
+        linearLayout.setVisibility(View.INVISIBLE);
+
+        linearLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                pictureInfoActivityOpen(fillValue);
+            }
+        });
 
     }
 
+
+
     @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
     public void onStart() {
         super.onStart();
+        otherValue = null;
 
         if(dataManager.selPkg == null)
             return;
 
-        int defaultColor = Color.parseColor("#C8C8C8");
-        Drawable defaultDrawable =  ContextCompat.getDrawable(context,R.drawable.add_picture_32);
-        btnFilling.setBackgroundColor(defaultColor);
-        btnFilling.setForeground(defaultDrawable);
+        resetView(filling_100,"100%",100);
+        resetView(filling_75,"75%",75);
+        resetView(filling_50,"50%",50);
+        resetView(filling_25,"25%",25);
+        resetView(filling,"직접입력",-1);
+
 
         List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
-        ImageFile fillFile = null;
-        changeLayout(true);
+
         for(ImageFile file : files)
         {
-            if(file.getType().contains(TestType.Filling.name()))
+            if(file.getType().compareTo(TestType.Filling.name()) == 0)
             {
-                fillFile = file;
+                //TestType dbType =TestType.getByName(file.getType().replace(Type.name(),""));
+                View selView = getTestTypeView(file.getPkgData());
+                setInfoView(selView,file);
             }
         }
 
-        if(fillFile != null)
+    }
+
+    public void setInfoView(View view, ImageFile file)
+    {
+        ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add);
+        constraintLayout.setVisibility(View.INVISIBLE);
+
+        LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
+        linearLayout.setVisibility(View.VISIBLE);
+
+        ImageView deleteView = view.findViewById(R.id.imageView_deleteButton);
+        deleteView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((TestActivity)getActivity()).deleteAlert(file, constraintLayout, linearLayout);
+            }
+        });
+
+        ImageView imageView = view.findViewById(R.id.nuclide_picture);
+        imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath())));
+
+
+        TextView textViewDate = view.findViewById(R.id.nuclide_date);
+        textViewDate.setText(file.getCreateDate());
+
+        TextView textViewData = view.findViewById(R.id.nuclide_data);
+        textViewData.setText(file.getPkgData()+"%");
+    }
+
+    public View getTestTypeView(String fillStr)
+    {
+        if(fillStr == null || fillStr.isEmpty())
+            return  null;
+
+        if(fillStr.compareTo("100") == 0)
         {
-            btnFilling.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(fillFile.getFilePath())));
-            btnFilling.setForeground(null);
-            FillValue = Integer.parseInt(fillFile.getPkgData());
-            foldingButton.setText("채움률 : " + String.valueOf(FillValue) + "%");
-            radioGroup.clearCheck();
-            setFillingRate();
-            changeLayout(false);
-            fillingFile = fillFile;
+            return filling_100;
+        }
+        else if(fillStr.compareTo("75") == 0)
+        {
+            return filling_75;
+        }
+        else if(fillStr.compareTo("50") == 0)
+        {
+            return filling_50;
+        }
+        else if(fillStr.compareTo("25") == 0)
+        {
+            return filling_25;
+        }
+        else
+        {
+            otherValue = fillStr;
+            return filling;
         }
     }
 
-    public void setFillingRate(){
-
-        if(!(FillValue<0 || FillValue>100))
+    public void cameraActivityOpen(int fillValue)
+    {
+        if(fillValue == -1)
         {
-            if(FillValue == 100)
-            {
-                radioGroup.check(radioGroup.getChildAt(0).getId());
-            }
-            else if(FillValue == 75)
-            {
-                radioGroup.check(radioGroup.getChildAt(1).getId());
-            }
-            else if(FillValue == 50)
-            {
-                radioGroup.check(radioGroup.getChildAt(2).getId());
-            }
-            else if(FillValue == 25)
-            {
-                radioGroup.check(radioGroup.getChildAt(3).getId());
-            }
-            else if(FillValue == 0)
-            {
-                radioGroup.check(radioGroup.getChildAt(4).getId());
-            }
-            else
-            {
-                editText.setText(String.valueOf(FillValue));
-                radioGroup.check(radioGroup.getChildAt(5).getId());
-            }
+            //InsertFragment 호출
+            ((TestActivity)getActivity()).callInsertFragment(TestType.Filling);
+        }
+        else
+        {
+            Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
+            cameraIntent.putExtra("TestType",TestType.Filling.name());
+            cameraIntent.putExtra("PkgData",Integer.toString(fillValue));
+            startActivity(cameraIntent);
+        }
+    }
 
+    private void pictureInfoActivityOpen(int fillValue)
+    {
+        String pkgData = fillValue + "";
+        if(fillValue == -1 && otherValue != null)
+        {
+            pkgData = otherValue;
         }
 
+        Intent intent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class);
+        intent.putExtra("TestType",TestType.Filling.name());
+        intent.putExtra("PkgData",pkgData);
+        startActivity(intent);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java b/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java
index 30845ff..2a54227 100644
--- a/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java
@@ -62,8 +62,10 @@ public class InfoFragment extends Fragment {
     private ViewPager2 sliderViewPager;
     private int viewpagerWidth, viewpagerheight;
     private ImageSliderAdapter imageSliderAdapter;
-    private LinearLayout layoutIndicator,addInfo,nuclideInfo,layout_nuclide,layout_defaultInfo1,layout_defaultInfo2,layout_defaultInfo3;
+    private LinearLayout layoutIndicator,addInfo,nuclideInfo,layout_nuclide,layout_defaultInfo1,layout_defaultInfo2,layout_defaultInfo3,layout_defaultInfo4;
+    private TextView TextView_defaultInfo1,TextView_defaultInfo2,TextView_defaultInfo3,TextView_defaultInfo4;
 
+    private boolean lastLine = false;
 
     private TextView textPictureInfo;
     Button button_folding_nuclide;
@@ -129,6 +131,11 @@ public class InfoFragment extends Fragment {
         layout_defaultInfo1 = view.findViewById(R.id.layout_defaultInfo1);
         layout_defaultInfo2 = view.findViewById(R.id.layout_defaultInfo2);
         layout_defaultInfo3 = view.findViewById(R.id.layout_defaultInfo3);
+        layout_defaultInfo4 = view.findViewById(R.id.layout_defaultInfo4);
+        TextView_defaultInfo1 = view.findViewById(R.id.TextView_defaultInfo1);
+        TextView_defaultInfo2 = view.findViewById(R.id.TextView_defaultInfo2);
+        TextView_defaultInfo3 = view.findViewById(R.id.TextView_defaultInfo3);
+        TextView_defaultInfo4 = view.findViewById(R.id.TextView_defaultInfo4);
         nuclideInfo = view.findViewById(R.id.layout_nuclideInfo);
         layout_nuclide = view.findViewById(R.id.layout_nuclide);
         addInfo = view.findViewById(R.id.layout_addInfo);
@@ -156,7 +163,8 @@ public class InfoFragment extends Fragment {
     }
     private void createInfoView(){
         if(dataManager.testEnum == TestEnum.발생지특성규명){
-            createInfoTitle(layout_defaultInfo1,"일반 정보");
+            //createInfoTitle(layout_defaultInfo1,"일반 정보");
+            TextView_defaultInfo1.setText("일반 정보");
             connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호"));
             connectViewMap.put("포장일자",createInfoTextView(layout_defaultInfo1,"포장일자"));
             connectViewMap.put("발생기관",createInfoTextView(layout_defaultInfo1,"발생기관"));
@@ -168,19 +176,21 @@ public class InfoFragment extends Fragment {
             connectViewMap.put("폐기물종류",createInfoTextView(layout_defaultInfo1,"폐기물종류"));
             connectViewMap.put("처리 방법",createInfoTextView(layout_defaultInfo1,"처리 방법"));
             connectViewMap.put("총 중량(kg)",createInfoTextView(layout_defaultInfo1,"총 중량(kg)"));
+            lastLine = true;
             connectViewMap.put("내용물 중량(kg)",createInfoTextView(layout_defaultInfo1,"내용물 중량(kg)"));
 
-            createInfoTitle(layout_defaultInfo2,"포장물 검사 확인");
+            //createInfoTitle(layout_defaultInfo2,"포장물 검사 확인");
+            TextView_defaultInfo2.setText("포장물 검사 확인");
             connectViewMap.put("판정",createInfoTextView(layout_defaultInfo2,"판정"));
             connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo2,"특기사항"));
             connectViewMap.put("자체검사일자",createInfoTextView(layout_defaultInfo2,"자체검사일자"));
             connectViewMap.put("검사자",createInfoTextView(layout_defaultInfo2,"검사자"));
             connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo2,"확인자"));
             connectViewMap.put("취금",createInfoTextView(layout_defaultInfo2,"유의사항"));
+            lastLine = true;
             connectViewMap.put("인도희망일자",createInfoTextView(layout_defaultInfo2,"인도희망일자"));
-            layout_defaultInfo3.setVisibility(View.GONE);
 
-            //createInfoTitle(defaultInfo,"핵종 정보");
+
 
             //addInfo
             connectViewMap.put("임계안전",createInfoTextView(addInfo,"임계안전"));
@@ -194,44 +204,45 @@ public class InfoFragment extends Fragment {
             connectViewMap.put("핵종측정일",createInfoTextView(addInfo,"핵종측정일"));
             connectViewMap.put("핵종측정자",createInfoTextView(addInfo,"핵종측정자"));
             connectViewMap.put("핵종평가일",createInfoTextView(addInfo,"핵종평가일"));
+            lastLine = true;
             connectViewMap.put("핵종평가자",createInfoTextView(addInfo,"핵종평가자"));
 
-
-            connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m"));
-            connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14"));
-            connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144"));
-            connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57"));
-            connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58"));
-            connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60"));
-            connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51"));
-            connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134"));
-            connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137"));
-            connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55"));
-            connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59"));
-            connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha"));
-            connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3"));
-            connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129"));
-            connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54"));
-            connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94"));
-            connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95"));
-            connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59"));
-            connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63"));
-            connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125"));
-            connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90"));
-            connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99"));
-            connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65"));
-            connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95"));
-
-
-
+            //layout_defaultInfo3.setVisibility(View.GONE);
+            TextView_defaultInfo3.setText("핵종 정보(Bq/g)");
+            connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo3,"Ag-110m"));
+            connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo3,"C-14"));
+            connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo3,"Ce-144"));
+            connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo3,"Co-57"));
+            connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo3,"Co-58"));
+            connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo3,"Co-60"));
+            connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo3,"Cr-51"));
+            connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo3,"Cs-134"));
+            connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo3,"Cs-137"));
+            connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo3,"Fe-55"));
+            connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo3,"Fe-59"));
+            connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo3,"G-Alpha"));
+            connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo3,"H-3"));
+            connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo3,"I-129"));
+            connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo3,"Mn-54"));
+            connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo3,"Nb-94"));
+            connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo3,"Nb-95"));
+            connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo3,"Ni-59"));
+            connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo3,"Ni-63"));
+            connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo3,"Sb-125"));
+            connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo3,"Sr-90"));
+            connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo3,"Tc-99"));
+            connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo3,"Zn-65"));
+            lastLine = true;
+            connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo3,"Zr-95"));
         }
         else if(dataManager.testEnum == TestEnum.인수검사){
-            createInfoTitle(layout_defaultInfo1,"일반 정보");
+            TextView_defaultInfo1.setText("일반 정보");
             connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호"));
             connectViewMap.put("인수검사 로트번호",createInfoTextView(layout_defaultInfo1,"인수검사 로트번호"));
+            lastLine = true;
             connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류"));
 
-            createInfoTitle(layout_defaultInfo2,"전수 검사");
+            TextView_defaultInfo2.setText("전수 검사");
             connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo2,"서류검사"));
             connectViewMap.put("서류검사 특이사항",createInfoTextView(layout_defaultInfo2,"서류검사 특이사항"));
             connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo2,"육안검사"));
@@ -241,42 +252,17 @@ public class InfoFragment extends Fragment {
             connectViewMap.put("총중량(kg)",createInfoTextView(layout_defaultInfo2,"총중량(kg)"));
             connectViewMap.put("내용물중량(kg)",createInfoTextView(layout_defaultInfo2,"내용물중량(kg)"));
             connectViewMap.put("검사방법",createInfoTextView(layout_defaultInfo2,"검사방법"));
+            lastLine = true;
             connectViewMap.put("파괴/비파괴 내용",createInfoTextView(layout_defaultInfo2,"파괴/비파괴 내용"));
 
-            createInfoTitle(layout_defaultInfo3,"인수검사 판정내역");
+            TextView_defaultInfo3.setText("인수검사 판정내역");
             connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정"));
             connectViewMap.put("인수검사일자",createInfoTextView(layout_defaultInfo3,"인수검사일자"));
             connectViewMap.put("검사자",createInfoTextView(layout_defaultInfo3,"검사자"));
             connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자"));
+            lastLine = true;
             connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo3,"특기사항"));
 
-            connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m"));
-            connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14"));
-            connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144"));
-            connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57"));
-            connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58"));
-            connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60"));
-            connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51"));
-            connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134"));
-            connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137"));
-            connectNuclideItemMap.put("Eu-152",createNuclideItem(nuclideInfo,"Cs-137"));
-            connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55"));
-            connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59"));
-            connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha"));
-            connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3"));
-            connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129"));
-            connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54"));
-            connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94"));
-            connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95"));
-            connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59"));
-            connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63"));
-            connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125"));
-            connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90"));
-            connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99"));
-            connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65"));
-            connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95"));
-
-
             TextView_addInfo.setText("표본 검사");
             connectViewMap.put("폐기물 내용물",createInfoTextView(addInfo,"폐기물 내용물"));
             connectViewMap.put("유리수",createInfoTextView(addInfo,"유리수"));
@@ -289,59 +275,101 @@ public class InfoFragment extends Fragment {
             connectViewMap.put("표면오염도(Bq/cm²)",createInfoTextView(addInfo,"표면오염도(Bq/cm²)"));
             connectViewMap.put("표면오염도 측정일자",createInfoTextView(addInfo,"표면오염도 측정일자"));
             connectViewMap.put("총방사능량(MBq)",createInfoTextView(addInfo,"총방사능량(MBq)"));
+            lastLine = true;
             connectViewMap.put("핵종분석일",createInfoTextView(addInfo,"핵종분석일"));
 
+            TextView_defaultInfo4.setVisibility(View.VISIBLE);
+            layout_defaultInfo4.setVisibility(View.VISIBLE);
+
+            TextView_defaultInfo4.setText("핵종정보(Bq/g)");
+            connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo4,"Ag-110m"));
+            connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo4,"C-14"));
+            connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo4,"Ce-144"));
+            connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo4,"Co-57"));
+            connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo4,"Co-58"));
+            connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo4,"Co-60"));
+            connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo4,"Cr-51"));
+            connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo4,"Cs-134"));
+            connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo4,"Cs-137"));
+            connectViewMap.put("Eu-152",createInfoTextView(layout_defaultInfo4,"Cs-137"));
+            connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo4,"Fe-55"));
+            connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo4,"Fe-59"));
+            connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo4,"G-Alpha"));
+            connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo4,"H-3"));
+            connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo4,"I-129"));
+            connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo4,"Mn-54"));
+            connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo4,"Nb-94"));
+            connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo4,"Nb-95"));
+            connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo4,"Ni-59"));
+            connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo4,"Ni-63"));
+            connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo4,"Sb-125"));
+            connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo4,"Sr-90"));
+            connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo4,"Tc-99"));
+            connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo4,"Zn-65"));
+            lastLine = true;
+            connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo4,"Zr-95"));
+
+
+
+
 
         }
         else if(dataManager.testEnum == TestEnum.처분검사){
-            //처분검사는 핵종정보, 추가정보가 없음
-            layout_nuclide.setVisibility(View.GONE);
+            TextView_addInfo.setVisibility(View.GONE);
             addInfo.setVisibility(View.GONE);
 
-            createInfoTitle(layout_defaultInfo1,"일반 정보");
+            TextView_defaultInfo1.setText("일반 정보");
             connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호"));
             connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류"));
             connectViewMap.put("처분검사관리번호",createInfoTextView(layout_defaultInfo1,"처분검사관리번호"));
             connectViewMap.put("파괴/비파괴",createInfoTextView(layout_defaultInfo1,"파괴/비파괴"));
             connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo1,"서류검사"));
+            lastLine = true;
             connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo1,"육안검사"));
 
 
-            createInfoTitle(layout_defaultInfo2,"핵종분석");
+            TextView_defaultInfo2.setText("핵종분석");
             connectViewMap.put("핵종분석",createInfoTextView(layout_defaultInfo2,"핵종분석"));
             connectViewMap.put("핵종분석일자",createInfoTextView(layout_defaultInfo2,"핵종분석일자"));
+            lastLine = true;
             connectViewMap.put("X-Ray 검사",createInfoTextView(layout_defaultInfo2,"X-Ray 검사"));
 
-            createInfoTitle(layout_defaultInfo3,"처분검사 판정내역");
+            TextView_defaultInfo3.setText("처분검사 판정내역");
             connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정"));
             connectViewMap.put("특기사항",createInfoTextView(layout_defaultInfo3,"특기사항"));
             connectViewMap.put("처분검사일자",createInfoTextView(layout_defaultInfo3,"처분검사일자"));
             connectViewMap.put("폐기물 규제 PM",createInfoTextView(layout_defaultInfo3,"폐기물 규제 PM"));
+            lastLine = true;
             connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자"));
 
+
         }
         else if(dataManager.testEnum == TestEnum.예비검사){
-            createInfoTitle(layout_defaultInfo1,"일반 정보");
+            TextView_defaultInfo1.setText("일반 정보");
             connectViewMap.put("포장물번호",createInfoTextView(layout_defaultInfo1,"포장물번호"));
             connectViewMap.put("예비검사 로트번호",createInfoTextView(layout_defaultInfo1,"예비검사 로트번호"));
             connectViewMap.put("검사종류",createInfoTextView(layout_defaultInfo1,"검사종류"));
             connectViewMap.put("테스트1",createInfoTextView(layout_defaultInfo1,"테스트1"));
+            lastLine = true;
             connectViewMap.put("테스트2",createInfoTextView(layout_defaultInfo1,"테스트2"));
 
 
-            createInfoTitle(layout_defaultInfo2,"전수 검사");
+            TextView_defaultInfo2.setText("전수 검사");
             connectViewMap.put("서류검사",createInfoTextView(layout_defaultInfo2,"서류검사"));
             connectViewMap.put("서류검사 특이사항",createInfoTextView(layout_defaultInfo2,"서류검사 특이사항"));
             connectViewMap.put("육안검사",createInfoTextView(layout_defaultInfo2,"육안검사"));
             connectViewMap.put("육안검사특이사항",createInfoTextView(layout_defaultInfo2,"육안검사특이사항"));
             connectViewMap.put("검사방법",createInfoTextView(layout_defaultInfo2,"검사방법"));
+            lastLine = true;
             connectViewMap.put("파괴/비파괴 내용",createInfoTextView(layout_defaultInfo2,"파괴/비파괴 내용"));
 
-            createInfoTitle(layout_defaultInfo3,"예비검사 판정내역");
+
+            TextView_defaultInfo3.setText("예비검사 판정내역");
             connectViewMap.put("판정",createInfoTextView(layout_defaultInfo3,"판정"));
             connectViewMap.put("예비검사일자",createInfoTextView(layout_defaultInfo3,"예비검사일자"));
             connectViewMap.put("검사자1",createInfoTextView(layout_defaultInfo3,"검사자1"));
             connectViewMap.put("검사자2",createInfoTextView(layout_defaultInfo3,"검사자2"));
+            lastLine = true;
             connectViewMap.put("확인자",createInfoTextView(layout_defaultInfo3,"확인자"));
 
 
@@ -361,35 +389,42 @@ public class InfoFragment extends Fragment {
             connectViewMap.put("표면방사선량률",createInfoTextView(addInfo,"표면방사선량률"));
             connectViewMap.put("표면선량률 측정일자",createInfoTextView(addInfo,"표면선량률 측정일자"));
             connectViewMap.put("총방사능량",createInfoTextView(addInfo,"총방사능량"));
+            lastLine = true;
             connectViewMap.put("핵종분석일",createInfoTextView(addInfo,"핵종분석일"));
 
+
             //핵종 정보
-            connectNuclideItemMap.put("Ag-110m",createNuclideItem(nuclideInfo,"Ag-110m"));
-            connectNuclideItemMap.put("C-14",createNuclideItem(nuclideInfo,"C-14"));
-            connectNuclideItemMap.put("Ce-144",createNuclideItem(nuclideInfo,"Ce-144"));
-            connectNuclideItemMap.put("Co-57",createNuclideItem(nuclideInfo,"Co-57"));
-            connectNuclideItemMap.put("Co-58",createNuclideItem(nuclideInfo,"Co-58"));
-            connectNuclideItemMap.put("Co-60",createNuclideItem(nuclideInfo,"Co-60"));
-            connectNuclideItemMap.put("Cr-51",createNuclideItem(nuclideInfo,"Cr-51"));
-            connectNuclideItemMap.put("Cs-134",createNuclideItem(nuclideInfo,"Cs-134"));
-            connectNuclideItemMap.put("Cs-137",createNuclideItem(nuclideInfo,"Cs-137"));
-            connectNuclideItemMap.put("Eu-152",createNuclideItem(nuclideInfo,"Eu-152"));
-            connectNuclideItemMap.put("Eu-154",createNuclideItem(nuclideInfo,"Eu-154"));
-            connectNuclideItemMap.put("Fe-55",createNuclideItem(nuclideInfo,"Fe-55"));
-            connectNuclideItemMap.put("Fe-59",createNuclideItem(nuclideInfo,"Fe-59"));
-            connectNuclideItemMap.put("G-Alpha",createNuclideItem(nuclideInfo,"G-Alpha"));
-            connectNuclideItemMap.put("H-3",createNuclideItem(nuclideInfo,"H-3"));
-            connectNuclideItemMap.put("I-129",createNuclideItem(nuclideInfo,"I-129"));
-            connectNuclideItemMap.put("Mn-54",createNuclideItem(nuclideInfo,"Mn-54"));
-            connectNuclideItemMap.put("Nb-94",createNuclideItem(nuclideInfo,"Nb-94"));
-            connectNuclideItemMap.put("Nb-95",createNuclideItem(nuclideInfo,"Nb-95"));
-            connectNuclideItemMap.put("Ni-59",createNuclideItem(nuclideInfo,"Ni-59"));
-            connectNuclideItemMap.put("Ni-63",createNuclideItem(nuclideInfo,"Ni-63"));
-            connectNuclideItemMap.put("Sb-125",createNuclideItem(nuclideInfo,"Sb-125"));
-            connectNuclideItemMap.put("Sr-90",createNuclideItem(nuclideInfo,"Sr-90"));
-            connectNuclideItemMap.put("Tc-99",createNuclideItem(nuclideInfo,"Tc-99"));
-            connectNuclideItemMap.put("Zn-65",createNuclideItem(nuclideInfo,"Zn-65"));
-            connectNuclideItemMap.put("Zr-95",createNuclideItem(nuclideInfo,"Zr-95"));
+            TextView_defaultInfo4.setVisibility(View.VISIBLE);
+            layout_defaultInfo4.setVisibility(View.VISIBLE);
+            TextView_defaultInfo4.setText("핵종정보(Bq/g)");
+
+            connectViewMap.put("Ag-110m",createInfoTextView(layout_defaultInfo4,"Ag-110m"));
+            connectViewMap.put("C-14",createInfoTextView(layout_defaultInfo4,"C-14"));
+            connectViewMap.put("Ce-144",createInfoTextView(layout_defaultInfo4,"Ce-144"));
+            connectViewMap.put("Co-57",createInfoTextView(layout_defaultInfo4,"Co-57"));
+            connectViewMap.put("Co-58",createInfoTextView(layout_defaultInfo4,"Co-58"));
+            connectViewMap.put("Co-60",createInfoTextView(layout_defaultInfo4,"Co-60"));
+            connectViewMap.put("Cr-51",createInfoTextView(layout_defaultInfo4,"Cr-51"));
+            connectViewMap.put("Cs-134",createInfoTextView(layout_defaultInfo4,"Cs-134"));
+            connectViewMap.put("Cs-137",createInfoTextView(layout_defaultInfo4,"Cs-137"));
+            connectViewMap.put("Eu-152",createInfoTextView(layout_defaultInfo4,"Eu-152"));
+            connectViewMap.put("Eu-154",createInfoTextView(layout_defaultInfo4,"Eu-154"));
+            connectViewMap.put("Fe-55",createInfoTextView(layout_defaultInfo4,"Fe-55"));
+            connectViewMap.put("Fe-59",createInfoTextView(layout_defaultInfo4,"Fe-59"));
+            connectViewMap.put("G-Alpha",createInfoTextView(layout_defaultInfo4,"G-Alpha"));
+            connectViewMap.put("H-3",createInfoTextView(layout_defaultInfo4,"H-3"));
+            connectViewMap.put("I-129",createInfoTextView(layout_defaultInfo4,"I-129"));
+            connectViewMap.put("Mn-54",createInfoTextView(layout_defaultInfo4,"Mn-54"));
+            connectViewMap.put("Nb-94",createInfoTextView(layout_defaultInfo4,"Nb-94"));
+            connectViewMap.put("Nb-95",createInfoTextView(layout_defaultInfo4,"Nb-95"));
+            connectViewMap.put("Ni-59",createInfoTextView(layout_defaultInfo4,"Ni-59"));
+            connectViewMap.put("Ni-63",createInfoTextView(layout_defaultInfo4,"Ni-63"));
+            connectViewMap.put("Sb-125",createInfoTextView(layout_defaultInfo4,"Sb-125"));
+            connectViewMap.put("Sr-90",createInfoTextView(layout_defaultInfo4,"Sr-90"));
+            connectViewMap.put("Tc-99",createInfoTextView(layout_defaultInfo4,"Tc-99"));
+            connectViewMap.put("Zn-65",createInfoTextView(layout_defaultInfo4,"Zn-65"));
+            lastLine = true;
+            connectViewMap.put("Zr-95",createInfoTextView(layout_defaultInfo4,"Zr-95"));
 
 
 
@@ -402,6 +437,9 @@ public class InfoFragment extends Fragment {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void updateView(){
+
+        List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
+
         if(dataManager.testEnum == TestEnum.발생지특성규명) {
             ORIGIN_CHRCT selPkg = (ORIGIN_CHRCT) dataManager.selPkg;
 
@@ -442,39 +480,75 @@ public class InfoFragment extends Fragment {
             connectViewMap.get("핵종평가일").setText(selPkg.getORIGIN_PKG_NCLD_EVLTN_DATE());
             connectViewMap.get("핵종평가자").setText(selPkg.getORIGIN_PKG_NCLD_EVLTR());
 
-            String inWT = selPkg.getORIGIN_PKG_IN_WT();
-            if(inWT != null && !inWT.isEmpty())
-            {
-                inWTMbq = Double.parseDouble(selPkg.getORIGIN_PKG_IN_WT());
+            connectViewMap.get("Ag-110m").setText(selPkg.getORIGIN_CHRCT_Ag_110m());
+            connectViewMap.get("C-14").setText(selPkg.getORIGIN_CHRCT_C_14());
+            connectViewMap.get("Ce-144").setText(selPkg.getORIGIN_CHRCT_Ce_144());
+            connectViewMap.get("Co-57").setText(selPkg.getORIGIN_CHRCT_Co_57());
+            connectViewMap.get("Co-58").setText(selPkg.getORIGIN_CHRCT_Co_58());
+            connectViewMap.get("Co-60").setText(selPkg.getORIGIN_CHRCT_Co_60());
+            connectViewMap.get("Cr-51").setText(selPkg.getORIGIN_CHRCT_Cr_51());
+            connectViewMap.get("Cs-134").setText(selPkg.getORIGIN_CHRCT_Cs_134());
+            connectViewMap.get("Cs-137").setText(selPkg.getORIGIN_CHRCT_Cs_137());
+            connectViewMap.get("Fe-55").setText(selPkg.getORIGIN_CHRCT_Fe_55());
+            connectViewMap.get("Fe-59").setText(selPkg.getORIGIN_CHRCT_Fe_59());
+            connectViewMap.get("G-Alpha").setText(selPkg.getORIGIN_CHRCT_G_Alpha());
+            connectViewMap.get("H-3").setText(selPkg.getORIGIN_CHRCT_H_3());
+            connectViewMap.get("I-129").setText(selPkg.getORIGIN_CHRCT_I_129());
+            connectViewMap.get("Mn-54").setText(selPkg.getORIGIN_CHRCT_Mn_54());
+            connectViewMap.get("Nb-94").setText(selPkg.getORIGIN_CHRCT_Nb_94());
+            connectViewMap.get("Nb-95").setText(selPkg.getORIGIN_CHRCT_Nb_95());
+            connectViewMap.get("Ni-59").setText(selPkg.getORIGIN_CHRCT_Ni_59());
+            connectViewMap.get("Ni-63").setText(selPkg.getORIGIN_CHRCT_Ni_63());
+            connectViewMap.get("Sb-125").setText(selPkg.getORIGIN_CHRCT_Sb_125());
+            connectViewMap.get("Sr-90").setText(selPkg.getORIGIN_CHRCT_Sr_90());
+            connectViewMap.get("Tc-99").setText(selPkg.getORIGIN_CHRCT_Tc_99());
+            connectViewMap.get("Zn-65").setText(selPkg.getORIGIN_CHRCT_Zn_65());
+            connectViewMap.get("Zr-95").setText(selPkg.getORIGIN_CHRCT_Zr_95());
+
+            double maxValue = -1;
+            ImageFile surfaceFile = null;
+            ImageFile weightFile = null;
+            for (ImageFile imagefile : files) {
+                if(imagefile.getType().contains("Surface"))
+                {
+                    double temp = Double.parseDouble(imagefile.getPkgData());
+                    if(maxValue < temp)
+                    {
+                        maxValue = temp;
+                        surfaceFile = imagefile;
+                    }
+                }
+                if(imagefile.getType().compareTo("Weight") == 0)
+                {
+                    weightFile = imagefile;
+                }
             }
 
+            if(surfaceFile != null)
+            {
+                connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData());
+                connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF"));
+                connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
+                connectViewMap.get("표면선량률 측정자").setText(surfaceFile.getUserId());
+                connectViewMap.get("표면선량률 측정자").setTextColor(Color.parseColor("#408DCF"));
+            }
+            else
+            {
+                connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK);
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
+                connectViewMap.get("표면선량률 측정자").setTextColor(Color.BLACK);
+            }
 
-
-            setNuclideData("Ag-110m",selPkg.getORIGIN_CHRCT_Ag_110m());
-            setNuclideData("C-14",selPkg.getORIGIN_CHRCT_C_14());
-            setNuclideData("Ce-144",selPkg.getORIGIN_CHRCT_Ce_144());
-            setNuclideData("Co-57",selPkg.getORIGIN_CHRCT_Co_57());
-            setNuclideData("Co-58",selPkg.getORIGIN_CHRCT_Co_58());
-            setNuclideData("Co-60",selPkg.getORIGIN_CHRCT_Co_60());
-            setNuclideData("Cr-51",selPkg.getORIGIN_CHRCT_Cr_51());
-            setNuclideData("Cs-134",selPkg.getORIGIN_CHRCT_Cs_134());
-            setNuclideData("Cs-137",selPkg.getORIGIN_CHRCT_Cs_137());
-            setNuclideData("Fe-55",selPkg.getORIGIN_CHRCT_Fe_55());
-            setNuclideData("Fe-59",selPkg.getORIGIN_CHRCT_Fe_59());
-            setNuclideData("G-Alpha",selPkg.getORIGIN_CHRCT_G_Alpha());
-            setNuclideData("H-3",selPkg.getORIGIN_CHRCT_H_3());
-            setNuclideData("I-129",selPkg.getORIGIN_CHRCT_I_129());
-            setNuclideData("Mn-54",selPkg.getORIGIN_CHRCT_Mn_54());
-            setNuclideData("Nb-94",selPkg.getORIGIN_CHRCT_Nb_94());
-            setNuclideData("Nb-95",selPkg.getORIGIN_CHRCT_Nb_95());
-            setNuclideData("Ni-59",selPkg.getORIGIN_CHRCT_Ni_59());
-            setNuclideData("Ni-63",selPkg.getORIGIN_CHRCT_Ni_63());
-            setNuclideData("Sb-125",selPkg.getORIGIN_CHRCT_Sb_125());
-            setNuclideData("Sr-90",selPkg.getORIGIN_CHRCT_Sr_90());
-            setNuclideData("Tc-99",selPkg.getORIGIN_CHRCT_Tc_99());
-            setNuclideData("Zn-65",selPkg.getORIGIN_CHRCT_Zn_65());
-            setNuclideData("Zr-95",selPkg.getORIGIN_CHRCT_Zr_95());
-
+            if(weightFile == null)
+            {
+                connectViewMap.get("총 중량(kg)").setTextColor(Color.BLACK);
+            }
+            else
+            {
+                connectViewMap.get("총 중량(kg)").setText(weightFile.getPkgData());
+                connectViewMap.get("총 중량(kg)").setTextColor(Color.parseColor("#408DCF"));
+            }
         }
         else if(dataManager.testEnum == TestEnum.인수검사){
             ACCEPT_TEST selPkg = (ACCEPT_TEST) dataManager.selPkg;
@@ -515,39 +589,75 @@ public class InfoFragment extends Fragment {
             connectViewMap.get("총방사능량(MBq)").setText(selPkg.getACCEPT_TOT_RD_QTY());
             connectViewMap.get("핵종분석일").setText(selPkg.getACCEPT_NUCLIDE_ANALS_DATE());
 
-            String inWT = selPkg.getACCEPT_IN_WT();
-            if(inWT != null && !inWT.isEmpty())
-            {
-                inWTMbq = Double.parseDouble(selPkg.getACCEPT_IN_WT());
+
+            connectViewMap.get("Ag-110m").setText(selPkg.getACCEPT_TEST_Ag_110m());
+            connectViewMap.get("C-14").setText(selPkg.getACCEPT_TEST_C_14());
+            connectViewMap.get("Ce-144").setText(selPkg.getACCEPT_TEST_Ce_144());
+            connectViewMap.get("Co-57").setText(selPkg.getACCEPT_TEST_Co_57());
+            connectViewMap.get("Co-58").setText(selPkg.getACCEPT_TEST_Co_58());
+            connectViewMap.get("Co-60").setText(selPkg.getACCEPT_TEST_Co_60());
+            connectViewMap.get("Cr-51").setText(selPkg.getACCEPT_TEST_Cr_51());
+            connectViewMap.get("Cs-134").setText(selPkg.getACCEPT_TEST_Cs_134());
+            connectViewMap.get("Cs-137").setText(selPkg.getACCEPT_TEST_Cs_137());
+            connectViewMap.get("Eu-152").setText(selPkg.getACCEPT_TEST_Eu_152());
+            connectViewMap.get("Fe-55").setText(selPkg.getACCEPT_TEST_Fe_55());
+            connectViewMap.get("Fe-59").setText(selPkg.getACCEPT_TEST_Fe_59());
+            connectViewMap.get("G-Alpha").setText(selPkg.getACCEPT_TEST_G_Alpha());
+            connectViewMap.get("H-3").setText(selPkg.getACCEPT_TEST_H_3());
+            connectViewMap.get("I-129").setText(selPkg.getACCEPT_TEST_I_129());
+            connectViewMap.get("Mn-54").setText(selPkg.getACCEPT_TEST_Mn_54());
+            connectViewMap.get("Nb-94").setText(selPkg.getACCEPT_TEST_Nb_94());
+            connectViewMap.get("Nb-95").setText(selPkg.getACCEPT_TEST_Nb_95());
+            connectViewMap.get("Ni-59").setText(selPkg.getACCEPT_TEST_Ni_59());
+            connectViewMap.get("Ni-63").setText(selPkg.getACCEPT_TEST_Ni_63());
+            connectViewMap.get("Sb-125").setText(selPkg.getACCEPT_TEST_Sb_125());
+            connectViewMap.get("Sr-90").setText(selPkg.getACCEPT_TEST_Sr_90());
+            connectViewMap.get("Tc-99").setText(selPkg.getACCEPT_TEST_Tc_99());
+            connectViewMap.get("Zn-65").setText(selPkg.getACCEPT_TEST_Zn_65());
+            connectViewMap.get("Zr-95").setText(selPkg.getACCEPT_TEST_Zr_95());
+
+
+            double maxValue = -1;
+            ImageFile surfaceFile = null;
+            ImageFile weightFile = null;
+            for (ImageFile imagefile : files) {
+                if(imagefile.getType().contains("Surface"))
+                {
+                    double temp = Double.parseDouble(imagefile.getPkgData());
+                    if(maxValue < temp)
+                    {
+                        maxValue = temp;
+                        surfaceFile = imagefile;
+                    }
+                }
+                if(imagefile.getType().compareTo("Weight") == 0)
+                {
+                    weightFile = imagefile;
+                }
             }
 
+            if(surfaceFile != null)
+            {
+                connectViewMap.get("표면방사선량률(mSv/hr)").setText(surfaceFile.getPkgData());
+                connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.parseColor("#408DCF"));
+                connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
+            }
+            else
+            {
+                connectViewMap.get("표면방사선량률(mSv/hr)").setTextColor(Color.BLACK);
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
+            }
 
-            setNuclideData("Ag-110m",selPkg.getACCEPT_TEST_Ag_110m());
-            setNuclideData("C-14",selPkg.getACCEPT_TEST_C_14());
-            setNuclideData("Ce-144",selPkg.getACCEPT_TEST_Ce_144());
-            setNuclideData("Co-57",selPkg.getACCEPT_TEST_Co_57());
-            setNuclideData("Co-58",selPkg.getACCEPT_TEST_Co_58());
-            setNuclideData("Co-60",selPkg.getACCEPT_TEST_Co_60());
-            setNuclideData("Cr-51",selPkg.getACCEPT_TEST_Cr_51());
-            setNuclideData("Cs-134",selPkg.getACCEPT_TEST_Cs_134());
-            setNuclideData("Cs-137",selPkg.getACCEPT_TEST_Cs_137());
-            setNuclideData("Eu-152",selPkg.getACCEPT_TEST_Eu_152());
-            setNuclideData("Fe-55",selPkg.getACCEPT_TEST_Fe_55());
-            setNuclideData("Fe-59",selPkg.getACCEPT_TEST_Fe_59());
-            setNuclideData("G-Alpha",selPkg.getACCEPT_TEST_G_Alpha());
-            setNuclideData("H-3",selPkg.getACCEPT_TEST_H_3());
-            setNuclideData("I-129",selPkg.getACCEPT_TEST_I_129());
-            setNuclideData("Mn-54",selPkg.getACCEPT_TEST_Mn_54());
-            setNuclideData("Nb-94",selPkg.getACCEPT_TEST_Nb_94());
-            setNuclideData("Nb-95",selPkg.getACCEPT_TEST_Nb_95());
-            setNuclideData("Ni-59",selPkg.getACCEPT_TEST_Ni_59());
-            setNuclideData("Ni-63",selPkg.getACCEPT_TEST_Ni_63());
-            setNuclideData("Sb-125",selPkg.getACCEPT_TEST_Sb_125());
-            setNuclideData("Sr-90",selPkg.getACCEPT_TEST_Sr_90());
-            setNuclideData("Tc-99",selPkg.getACCEPT_TEST_Tc_99());
-            setNuclideData("Zn-65",selPkg.getACCEPT_TEST_Zn_65());
-            setNuclideData("Zr-95",selPkg.getACCEPT_TEST_Zr_95());
-
+            if(weightFile == null)
+            {
+                connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK);
+            }
+            else
+            {
+                connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData());
+                connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF"));
+            }
 
         }
         else if(dataManager.testEnum == TestEnum.처분검사){
@@ -615,40 +725,91 @@ public class InfoFragment extends Fragment {
             connectViewMap.get("핵종분석일").setText(selPkg.getPREPAR_NUCLIDE_ANALS_DATE());
 
 
-            String inWT = selPkg.getPREPAR_IN_WT();
-            if(inWT != null && !inWT.isEmpty())
-            {
-                inWTMbq = Double.parseDouble(selPkg.getPREPAR_IN_WT());
+            connectViewMap.get("Ag-110m").setText(selPkg.getPREPAR_TEST_Ag_110m());
+            connectViewMap.get("C-14").setText(selPkg.getPREPAR_TEST_C_14());
+            connectViewMap.get("Ce-144").setText(selPkg.getPREPAR_TEST_Ce_144());
+            connectViewMap.get("Co-57").setText(selPkg.getPREPAR_TEST_Co_57());
+            connectViewMap.get("Co-58").setText(selPkg.getPREPAR_TEST_Co_58());
+            connectViewMap.get("Co-60").setText(selPkg.getPREPAR_TEST_Co_60());
+            connectViewMap.get("Cr-51").setText(selPkg.getPREPAR_TEST_Cr_51());
+            connectViewMap.get("Cs-134").setText(selPkg.getPREPAR_TEST_Cs_134());
+            connectViewMap.get("Cs-137").setText(selPkg.getPREPAR_TEST_Cs_137());
+            connectViewMap.get("Eu-152").setText(selPkg.getPREPAR_TEST_Eu_152());
+            connectViewMap.get("Eu-154").setText(selPkg.getPREPAR_TEST_Eu_154());
+            connectViewMap.get("Fe-55").setText(selPkg.getPREPAR_TEST_Fe_55());
+            connectViewMap.get("Fe-59").setText(selPkg.getPREPAR_TEST_Fe_59());
+            connectViewMap.get("G-Alpha").setText(selPkg.getPREPAR_TEST_G_Alpha());
+            connectViewMap.get("H-3").setText(selPkg.getPREPAR_TEST_H_3());
+            connectViewMap.get("I-129").setText(selPkg.getPREPAR_TEST_I_129());
+            connectViewMap.get("Mn-54").setText(selPkg.getPREPAR_TEST_Mn_54());
+            connectViewMap.get("Nb-94").setText(selPkg.getPREPAR_TEST_Nb_94());
+            connectViewMap.get("Nb-95").setText(selPkg.getPREPAR_TEST_Nb_95());
+            connectViewMap.get("Ni-59").setText(selPkg.getPREPAR_TEST_Ni_59());
+            connectViewMap.get("Ni-63").setText(selPkg.getPREPAR_TEST_Ni_63());
+            connectViewMap.get("Sb-125").setText(selPkg.getPREPAR_TEST_Sb_125());
+            connectViewMap.get("Sr-90").setText(selPkg.getPREPAR_TEST_Sr_90());
+            connectViewMap.get("Tc-99").setText(selPkg.getPREPAR_TEST_Tc_99());
+            connectViewMap.get("Zn-65").setText(selPkg.getPREPAR_TEST_Zn_65());
+            connectViewMap.get("Zr-95").setText(selPkg.getPREPAR_TEST_Zr_95());
+
+
+            double maxValue = -1;
+            ImageFile surfaceFile = null;
+            ImageFile weightFile = null;
+            ImageFile fillFile = null;
+            for (ImageFile imagefile : files) {
+                if(imagefile.getType().contains("Surface"))
+                {
+                    double temp = Double.parseDouble(imagefile.getPkgData());
+                    if(maxValue < temp)
+                    {
+                        maxValue = temp;
+                        surfaceFile = imagefile;
+                    }
+                }
+                if(imagefile.getType().compareTo("Weight") == 0)
+                {
+                    weightFile = imagefile;
+                }
+                if(fillFile.getType().compareTo("Filling") == 0)
+                {
+                    fillFile = imagefile;
+                }
             }
 
-            setNuclideData("Ag-110m",selPkg.getPREPAR_TEST_Ag_110m());
-            setNuclideData("C-14",selPkg.getPREPAR_TEST_C_14());
-            setNuclideData("Ce-144",selPkg.getPREPAR_TEST_Ce_144());
-            setNuclideData("Co-57",selPkg.getPREPAR_TEST_Co_57());
-            setNuclideData("Co-58",selPkg.getPREPAR_TEST_Co_58());
-            setNuclideData("Co-60",selPkg.getPREPAR_TEST_Co_60());
-            setNuclideData("Cr-51",selPkg.getPREPAR_TEST_Cr_51());
-            setNuclideData("Cs-134",selPkg.getPREPAR_TEST_Cs_134());
-            setNuclideData("Cs-137",selPkg.getPREPAR_TEST_Cs_137());
-            setNuclideData("Eu-152",selPkg.getPREPAR_TEST_Eu_152());
-            setNuclideData("Eu-154",selPkg.getPREPAR_TEST_Eu_154());
-            setNuclideData("Fe-55",selPkg.getPREPAR_TEST_Fe_55());
-            setNuclideData("Fe-59",selPkg.getPREPAR_TEST_Fe_59());
-            setNuclideData("G-Alpha",selPkg.getPREPAR_TEST_G_Alpha());
-            setNuclideData("H-3",selPkg.getPREPAR_TEST_H_3());
-            setNuclideData("I-129",selPkg.getPREPAR_TEST_I_129());
-            setNuclideData("Mn-54",selPkg.getPREPAR_TEST_Mn_54());
-            setNuclideData("Nb-94",selPkg.getPREPAR_TEST_Nb_94());
-            setNuclideData("Nb-95",selPkg.getPREPAR_TEST_Nb_95());
-            setNuclideData("Ni-59",selPkg.getPREPAR_TEST_Ni_59());
-            setNuclideData("Ni-63",selPkg.getPREPAR_TEST_Ni_63());
-            setNuclideData("Sb-125",selPkg.getPREPAR_TEST_Sb_125());
-            setNuclideData("Sr-90",selPkg.getPREPAR_TEST_Sr_90());
-            setNuclideData("Tc-99",selPkg.getPREPAR_TEST_Tc_99());
-            setNuclideData("Zn-65",selPkg.getPREPAR_TEST_Zn_65());
-            setNuclideData("Zr-95",selPkg.getPREPAR_TEST_Zr_95());
+            if(surfaceFile != null)
+            {
+                connectViewMap.get("표면방사선량률").setText(surfaceFile.getPkgData());
+                connectViewMap.get("표면방사선량률").setTextColor(Color.parseColor("#408DCF"));
+                connectViewMap.get("표면선량률 측정일자").setText(surfaceFile.getCreateDate());
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.parseColor("#408DCF"));
+            }
+            else
+            {
+                connectViewMap.get("표면방사선량률").setTextColor(Color.BLACK);
+                connectViewMap.get("표면선량률 측정일자").setTextColor(Color.BLACK);
+            }
 
+            if(weightFile == null)
+            {
+                connectViewMap.get("총중량(kg)").setTextColor(Color.BLACK);
+            }
+            else
+            {
+                connectViewMap.get("총중량(kg)").setText(weightFile.getPkgData());
+                connectViewMap.get("총중량(kg)").setTextColor(Color.parseColor("#408DCF"));
+            }
 
+            /*
+            if(fillFile == null)
+            {
+                connectViewMap.get("채움률(%)").setTextColor(Color.BLACK);
+            }
+            else
+            {
+                connectViewMap.get("채움률(%)").setText(weightFile.getPkgData());
+                connectViewMap.get("채움률(%)").setTextColor(Color.parseColor("#408DCF"));
+            }*/
         }
     }
 
@@ -672,13 +833,25 @@ public class InfoFragment extends Fragment {
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 inttodp(1));
         View view = new View(context);
-        view.setBackgroundColor(Color.BLACK);
+        view.setBackgroundColor(Color.parseColor("#f3f3f3"));
         view.setLayoutParams(viewLayout);
 
         linearLayout.addView(editText);
         linearLayout.addView(view);
     }
 
+    public View createLine(){
+
+        LinearLayout.LayoutParams viewLayout = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                inttodp(1));
+        View view = new View(context);
+        view.setBackgroundColor(Color.parseColor("#f3f3f3"));
+        view.setLayoutParams(viewLayout);
+        return view;
+
+    }
+
     public TextView createInfoTextView(LinearLayout linearLayout, String title){
 
         LinearLayout t1 = new LinearLayout(context);
@@ -696,11 +869,11 @@ public class InfoFragment extends Fragment {
         TextView editText = new TextView(context);
         editText.setText(title);
         editText.setGravity(Gravity.LEFT);
-        editText.setTextColor(Color.BLACK);
-        editText.setPadding(inttodp(10),0,0,0);
-        editText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
+        //editText.setTextColor(Color.BLACK);
+        editText.setPadding(inttodp(20),inttodp(5),0,inttodp(5));
+        //editText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
         editText.setLayoutParams(titleParam);
-        editText.setBackgroundResource(R.drawable.table_item_background);
+        //editText.setBackgroundResource(R.drawable.table_item_background);
 
         LinearLayout.LayoutParams infoTextParam = new LinearLayout.LayoutParams(
                 0,
@@ -708,20 +881,26 @@ public class InfoFragment extends Fragment {
         infoTextParam.weight = 1;
 
         TextView infoText = new TextView(context);
-        infoText.setText(dataManager.selPkg.getPKG_NO());
+        //infoText.setText(dataManager.selPkg.getPKG_NO());
         infoText.setGravity(Gravity.LEFT);
         infoText.setTextColor(Color.BLACK);
-        infoText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
-        editText.setPadding(inttodp(10),0,inttodp(10),0);
+        //infoText.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
+        infoText.setPadding(inttodp(10),inttodp(5),inttodp(10),inttodp(5));
         infoText.setLayoutParams(infoTextParam);
         infoText.setText("");
-        infoText.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
-        infoText.setBackgroundResource(R.drawable.table_item_background);
+        //infoText.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_END);
+        infoText.setTypeface(null,Typeface.BOLD);
+        //infoText.setBackgroundResource(R.drawable.table_item_background);
 
         t1.addView(editText);
         t1.addView(infoText);
         linearLayout.addView(t1);
 
+        if(!lastLine) {
+            linearLayout.addView(createLine());
+        }
+        else
+            lastLine = false;
         return infoText;
    }
 
@@ -810,11 +989,13 @@ public class InfoFragment extends Fragment {
         if(dataManager.selPkg == null)
             return;
 
-        viewpagerWidth = sliderViewPager.getWidth();
-        viewpagerheight = sliderViewPager.getHeight();
         updateView();
 
 
+        /*
+        viewpagerWidth = sliderViewPager.getWidth();
+        viewpagerheight = sliderViewPager.getHeight();
+
         imageSliderAdapter = new ImageSliderAdapter(context, null);
 
         sliderViewPager.setOffscreenPageLimit(1);
@@ -847,7 +1028,7 @@ public class InfoFragment extends Fragment {
                 }
             }
         }
-        setupIndicators(imageSliderAdapter.getItemCount());
+        setupIndicators(imageSliderAdapter.getItemCount());*/
     }
 
     private void setupIndicators(int count) {
diff --git a/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java b/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java
new file mode 100644
index 0000000..b6f85ae
--- /dev/null
+++ b/app/src/main/java/com/qtagger/Activity/Test/InsertFragment.java
@@ -0,0 +1,185 @@
+package com.qtagger.Activity.Test;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.qtagger.Activity.CameraActivity;
+import com.qtagger.Activity.TestActivity;
+import com.qtagger.Database.TestType;
+import com.qtagger.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link InsertFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class InsertFragment extends Fragment {
+
+    //채움률, 사진촬영만 씀
+    public TestType type;
+
+    EditText editText_value;
+    Button button_Picture;
+    TextView textView_title;
+    ImageView itemButton;
+
+
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+
+    public InsertFragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment InsertFragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static InsertFragment newInstance(String param1, String param2) {
+        InsertFragment fragment = new InsertFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_insert, container, false);
+
+        editText_value = view.findViewById(R.id.editText_value);
+        button_Picture = view.findViewById(R.id.button_Picture);
+        textView_title = view.findViewById(R.id.textView_title);
+        itemButton = view.findViewById(R.id.itemButton);
+
+
+        button_Picture.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                String pkgData = editText_value.getText().toString();
+
+                //카메라 오픈
+                if(type == TestType.Filling)
+                {
+                    if(pkgData.isEmpty())
+                        return;
+                }
+
+                Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
+                cameraIntent.putExtra("TestType",type.name());
+                cameraIntent.putExtra("PkgData",pkgData);
+                startActivity(cameraIntent);
+
+                ((TestActivity)getActivity()).resetFragment();
+
+            }
+        });
+
+        itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((TestActivity)getActivity()).resetFragment();
+            }
+        });
+
+        editText_value.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if(type == TestType.Nothing)
+                    return;
+
+                String str = editText_value.getText().toString();
+                if(str == null || str.isEmpty())
+                    return;
+
+
+                double FillValue = Double.parseDouble(editText_value.getText().toString());
+                if(FillValue >100)
+                {
+                    FillValue = 100;
+                    editText_value.setText(String.valueOf(FillValue));
+                    editText_value.setSelection(3);
+                }
+            }
+        });
+
+
+        return view;
+    }
+
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if(type == null)
+        {
+            return;
+        }
+        editText_value.setText("");
+
+        if(type == TestType.Filling)//숫자만 입력
+        {
+            editText_value.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
+            textView_title.setText("직접 입력");
+            editText_value.setHint("채움률을 입력해주세요.");
+
+        }
+        else if(type == TestType.Nothing)
+        {
+            editText_value.setInputType(InputType.TYPE_CLASS_TEXT);
+            textView_title.setText("사진 설명 입력");
+            editText_value.setHint("설명을 입력해주세요.");
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        type = null;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java
index 8e7f5c5..cf63071 100644
--- a/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java
@@ -3,9 +3,13 @@ package com.qtagger.Activity.Test;
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
+import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +19,7 @@ import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 
 import android.provider.MediaStore;
@@ -23,22 +28,32 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.qtagger.Activity.CameraActivity;
+import com.qtagger.Activity.PictureInfoActivity;
+import com.qtagger.Activity.TestActivity;
+import com.qtagger.Database.ImageFile;
 import com.qtagger.Database.TestType;
 import com.qtagger.R;
 import com.qtagger.util.CommonHelper;
 import com.qtagger.util.DataManager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link PhotographFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
 public class PhotographFragment extends Fragment {
-    View view;
-    Button pictureAdd;
+    LinearLayout linearLayout_pictureList;
+    Context context;
     private DataManager dataManager = DataManager.getInstance();
     private static final int Image_Capture_Code = 1;
     // TODO: Rename parameter arguments, choose names that match
@@ -84,21 +99,18 @@ public class PhotographFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_photograph, container, false);
+        View view = inflater.inflate(R.layout.fragment_photograph, container, false);
+        context = container.getContext();
 
-        //button_img_add
-        pictureAdd = view.findViewById(R.id.button_img_add);
+        linearLayout_pictureList = view.findViewById(R.id.linearLayout_pictureList);
 
-        pictureAdd.setOnClickListener(new View.OnClickListener() {
+        view.findViewById(R.id.capture_add).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
-                startActivity(cameraIntent);
-
+                ((TestActivity)getActivity()).callInsertFragment(TestType.Nothing);
             }
         });
-
-        // Inflate the layout for this fragment
+        
         return view;
     }
 
@@ -107,5 +119,110 @@ public class PhotographFragment extends Fragment {
         super.onStart();
         if(dataManager.selPkg == null)
             return;
+
+        resetView();
+    }
+
+    public void resetView()
+    {
+        linearLayout_pictureList.removeAllViews();
+
+        List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
+        for(ImageFile file : files)
+        {
+            if(file.getType().compareTo(TestType.Nothing.name()) == 0)
+            {
+                LinearLayout linearLayout = new LinearLayout(context);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT);
+                linearLayout.setLayoutParams(params);
+
+                linearLayout_pictureList.addView(linearLayout);
+
+                LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                View imageView = inflater.inflate(R.layout.layout_capture_test, linearLayout, true);
+                setInfoView(imageView,file);
+            }
+        }
+    }
+
+
+    public void setInfoView(View view, ImageFile file)
+    {
+        TextView textView = view.findViewById(R.id.item_title);
+        textView.setText("");
+        //textView_location
+        TextView textView_location = view.findViewById(R.id.textView_location);
+        textView_location.setText("");
+
+        //textView_valueTitle
+        TextView textView_valueTitle = view.findViewById(R.id.textView_valueTitle);
+        textView_valueTitle.setText("설명");
+        
+        
+        ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add);
+        constraintLayout.setVisibility(View.INVISIBLE);
+
+        LinearLayout linearLayout = view.findViewById(R.id.linearlayout_Info);
+        linearLayout.setVisibility(View.VISIBLE);
+
+        linearLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class);
+                intent.putExtra("TestType",file.getType());
+                intent.putExtra("PkgData",file.getPkgData());
+                startActivity(intent);
+            }
+        });
+
+        ImageView deleteView = view.findViewById(R.id.imageView_deleteButton);
+        deleteView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(context
+                        , R.style.AlertDialogTheme);
+
+                View view = LayoutInflater.from(context).inflate(
+                        R.layout.layout_dialog2,
+                        (LinearLayout) getActivity().findViewById(R.id.layoutDialog));
+
+                //다이얼로그 텍스트 설정
+                builder.setView(view);
+
+                AlertDialog alertDialog = builder.create();
+
+                view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        alertDialog.dismiss();
+                    }
+                });
+
+                view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        dataManager.dbHelper.deleteFile(file);
+                        resetView();
+                        alertDialog.dismiss();
+                    }
+                });
+
+                if (alertDialog.getWindow() != null) {
+                    alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+                }
+
+                alertDialog.show();
+            }
+        });
+
+        ImageView imageView = view.findViewById(R.id.nuclide_picture);
+        imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath())));
+
+
+        TextView textViewDate = view.findViewById(R.id.nuclide_date);
+        textViewDate.setText(file.getCreateDate());
+
+        TextView textViewData = view.findViewById(R.id.nuclide_data);
+        textViewData.setText(file.getPkgData()+"");
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java b/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java
index 26549c6..a7b3ab8 100644
--- a/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java
+++ b/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java
@@ -1,10 +1,12 @@
 package com.qtagger.Activity.Test;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -17,8 +19,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+import android.widget.TextView;
 
 import com.qtagger.Activity.CameraActivity;
+import com.qtagger.Activity.PictureInfoActivity;
 import com.qtagger.Database.ImageFile;
 import com.qtagger.Database.TestType;
 import com.qtagger.R;
@@ -35,7 +42,12 @@ public class WeightFragment extends Fragment {
 
     DataManager dataManager = DataManager.getInstance();
     Button weightButton;
+    TableLayout tableLayout_data;
+    TextView textView_weightValue,textView_weightDate;
+    ImageView imageView_deleteButton;
     private Context context;
+
+    ImageFile fillFile;
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     private static final String ARG_PARAM1 = "param1";
@@ -82,12 +94,26 @@ public class WeightFragment extends Fragment {
         View view = inflater.inflate(R.layout.fragment_weight2, container, false);
         context = container.getContext();
         weightButton =view.findViewById(R.id.weight_Picture);
+        tableLayout_data = view.findViewById(R.id.tableLayout_data);
+        textView_weightValue = view.findViewById(R.id.textView_weightValue);
+        textView_weightDate = view.findViewById(R.id.textView_weightDate);
+        imageView_deleteButton = view.findViewById(R.id.imageView_deleteButton);
+
         weightButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
-                cameraIntent.putExtra("TestType",TestType.Weight.name());
-                startActivity(cameraIntent);
+                if(fillFile == null) {
+
+                    Intent cameraIntent = new Intent(getActivity().getApplicationContext(), CameraActivity.class);
+                    cameraIntent.putExtra("TestType", TestType.Weight.name());
+                    startActivity(cameraIntent);
+                }
+                else
+                {
+                    Intent cameraIntent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class);
+                    cameraIntent.putExtra("TestType",fillFile.getType());
+                    startActivity(cameraIntent);
+                }
             }
         });
         //weight_Picture
@@ -95,20 +121,28 @@ public class WeightFragment extends Fragment {
         return view;
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private void viewDefaultSetting()
+    {
+        imageView_deleteButton.setVisibility(View.GONE);
+        tableLayout_data.setVisibility(View.GONE);
+        Drawable buttonBackground = ContextCompat.getDrawable(context,R.drawable.listview_background);
+        Drawable defaultDrawable =  ContextCompat.getDrawable(context,R.drawable.img_cam02);
+        weightButton.setBackground(buttonBackground);
+        weightButton.setForeground(defaultDrawable);
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
     public void onStart() {
         super.onStart();
         if(dataManager.selPkg == null)
             return;
+        fillFile = null;
 
-        int defaultColor = Color.parseColor("#C8C8C8");
-        Drawable defaultDrawable =  ContextCompat.getDrawable(context,R.drawable.add_picture_32);
-        weightButton.setBackgroundColor(defaultColor);
-        weightButton.setForeground(defaultDrawable);
+        viewDefaultSetting();
 
         List<ImageFile> files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label());
-        ImageFile fillFile = null;
         for(ImageFile file : files)
         {
             if(file.getType().contains(TestType.Weight.name()))
@@ -121,6 +155,52 @@ public class WeightFragment extends Fragment {
         {
             weightButton.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(fillFile.getFilePath())));
             weightButton.setForeground(null);
+
+            tableLayout_data.setVisibility(View.VISIBLE);
+            imageView_deleteButton.setVisibility(View.VISIBLE);
+
+            textView_weightValue.setText(fillFile.getPkgData() + " kg");
+            textView_weightDate.setText(fillFile.getCreateDate());
+
+            imageView_deleteButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(context
+                            , R.style.AlertDialogTheme);
+
+                    View view = LayoutInflater.from(context).inflate(
+                            R.layout.layout_dialog2,
+                            (LinearLayout) getActivity().findViewById(R.id.layoutDialog));
+
+                    //다이얼로그 텍스트 설정
+                    builder.setView(view);
+
+                    AlertDialog alertDialog = builder.create();
+
+                    view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            alertDialog.dismiss();
+                        }
+                    });
+
+                    view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            dataManager.dbHelper.deleteFile(fillFile);
+                            viewDefaultSetting();
+                            alertDialog.dismiss();
+                        }
+                    });
+
+                    if (alertDialog.getWindow() != null) {
+                        alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+                    }
+
+                    alertDialog.show();
+                }
+            });
+
         }
 
 
diff --git a/app/src/main/java/com/qtagger/Activity/TestActivity.java b/app/src/main/java/com/qtagger/Activity/TestActivity.java
index 64f4217..5fe7a41 100644
--- a/app/src/main/java/com/qtagger/Activity/TestActivity.java
+++ b/app/src/main/java/com/qtagger/Activity/TestActivity.java
@@ -1,13 +1,18 @@
 package com.qtagger.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbManager;
@@ -17,8 +22,10 @@ import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.google.android.material.tabs.TabLayout;
 import com.hoho.android.usbserial.driver.UsbSerialDriver;
@@ -27,11 +34,14 @@ import com.hoho.android.usbserial.driver.UsbSerialProber;
 import com.qtagger.Activity.Test.CaptureFragment;
 import com.qtagger.Activity.Test.FillFragment;
 import com.qtagger.Activity.Test.InfoFragment;
+import com.qtagger.Activity.Test.InsertFragment;
 import com.qtagger.Activity.Test.PhotographFragment;
 import com.qtagger.Activity.Test.WeightFragment;
 import com.qtagger.Data.CaptureFragmentEnum;
 import com.qtagger.Data.CustomProber;
 import com.qtagger.Data.TestEnum;
+import com.qtagger.Database.ImageFile;
+import com.qtagger.Database.TestType;
 import com.qtagger.R;
 import com.qtagger.util.CommonHelper;
 import com.qtagger.util.Constants;
@@ -43,10 +53,11 @@ import com.qtagger.util.TextUtil;
 
 public class TestActivity extends AppCompatActivity {
 
-    Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment;
+    Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment, insertFragment;
     TextView textViewRadiation;
     TabLayout tabs;
     DataManager dataManager = DataManager.getInstance();
+    LinearLayout Linearlayout_origin,Linearlayout_prepar,Linearlayout_accept,Linearlayout_disposal;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,8 +70,40 @@ public class TestActivity extends AppCompatActivity {
         fillFragment = new FillFragment();
         pictureFragment = new PhotographFragment();
         infoFragment = new InfoFragment();
+        insertFragment = new InsertFragment();
         textViewRadiation = findViewById(R.id.textViewRadiation);
 
+        Linearlayout_origin = findViewById(R.id.Linearlayout_origin);
+        Linearlayout_prepar = findViewById(R.id.Linearlayout_prepar);
+        Linearlayout_accept = findViewById(R.id.Linearlayout_accept);
+        Linearlayout_disposal = findViewById(R.id.Linearlayout_disposal);
+
+        Linearlayout_origin.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                changeTestEnum(TestEnum.발생지특성규명);
+            }
+        });
+        Linearlayout_prepar.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                changeTestEnum(TestEnum.예비검사);
+            }
+        });
+        Linearlayout_accept.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                changeTestEnum(TestEnum.인수검사);
+            }
+        });
+        Linearlayout_disposal.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                changeTestEnum(TestEnum.처분검사);
+            }
+        });
+
+
         findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -85,7 +128,6 @@ public class TestActivity extends AppCompatActivity {
             }
         });
 
-
         //기본 탭 세팅
         getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit();
 
@@ -115,33 +157,11 @@ public class TestActivity extends AppCompatActivity {
                     View tabViewChild = vgTab.getChildAt(i);
                     if (tabViewChild instanceof TextView) {
                         ((TextView) tabViewChild).setTextSize(16);
+                        ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf"));
                     }
                 }
 
-                Fragment selected = null;
-                dataManager.testTabPosition = position;
-                if(position == 0){
-                    selected = surfaceFragment;
-                }else if (position == 1){
-                    selected = m1Fragment;
-                }
-                else if (position == 2){
-                    selected = weightFragment;
-                }
-                else if (position == 3){
-                    selected = fillFragment;
-                }
-                else if (position == 4){
-                    selected = pictureFragment;
-                }
-                else if (position == 5){
-                    selected = infoFragment;
-                }
-
-
-                if(selected != null) {
-                    getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit();
-                }
+                setFragment(position);
             }
 
             @Override
@@ -153,6 +173,7 @@ public class TestActivity extends AppCompatActivity {
                     View tabViewChild = vgTab.getChildAt(i);
                     if (tabViewChild instanceof TextView) {
                         ((TextView) tabViewChild).setTextSize(14);
+                        ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555"));
                     }
                 }
             }
@@ -162,11 +183,36 @@ public class TestActivity extends AppCompatActivity {
 
             }
         });
-
-
-
     }
 
+    private void setFragment(int position){
+        Fragment selected = null;
+        dataManager.testTabPosition = position;
+        if(position == 0){
+            selected = surfaceFragment;
+        }else if (position == 1){
+            selected = m1Fragment;
+        }
+        else if (position == 2){
+            selected = weightFragment;
+        }
+        else if (position == 3){
+            selected = fillFragment;
+        }
+        else if (position == 4){
+            selected = pictureFragment;
+        }
+        else if (position == 5){
+            selected = infoFragment;
+        }
+
+
+        if(selected != null) {
+            getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit();
+        }
+    }
+
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -176,6 +222,8 @@ public class TestActivity extends AppCompatActivity {
             return;
         }
 
+        testEnumButtonBackgroundChange();
+
         ViewGroup vg = (ViewGroup) tabs.getChildAt(0);
         for (int i = 0; i < tabs.getTabCount(); i++) {
             TabLayout.Tab tab = tabs.getTabAt(i);
@@ -188,9 +236,11 @@ public class TestActivity extends AppCompatActivity {
                         if(i==0)
                         {
                             ((TextView) tabViewChild).setTextSize(16);
+                            ((TextView) tabViewChild).setTextColor(Color.parseColor("#408dcf"));
                         }
                         else{
                             ((TextView) tabViewChild).setTextSize(14);
+                            ((TextView) tabViewChild).setTextColor(Color.parseColor("#555555"));
                         }
                     }
                 }
@@ -212,10 +262,101 @@ public class TestActivity extends AppCompatActivity {
         }
     }
 
+    public void testEnumButtonBackgroundChange()
+    {
+        Linearlayout_origin.setBackgroundColor(Color.TRANSPARENT);
+        Linearlayout_prepar.setBackgroundColor(Color.TRANSPARENT);
+        Linearlayout_accept.setBackgroundColor(Color.TRANSPARENT);
+        Linearlayout_disposal.setBackgroundColor(Color.TRANSPARENT);
+
+
+        if(dataManager.testEnum == TestEnum.발생지특성규명)
+        {
+            Linearlayout_origin.setBackgroundColor(Color.parseColor("#3dbcc8"));
+        }
+        else if(dataManager.testEnum == TestEnum.예비검사)
+        {
+            Linearlayout_prepar.setBackgroundColor(Color.parseColor("#8ac460"));
+        }
+        else if(dataManager.testEnum == TestEnum.인수검사)
+        {
+            Linearlayout_accept.setBackgroundColor(Color.parseColor("#7c92c8"));
+        }
+        else if(dataManager.testEnum == TestEnum.처분검사)
+        {
+            Linearlayout_disposal.setBackgroundColor(Color.parseColor("#b99838"));
+        }
+
+
+    }
+
+    public void changeTestEnum(TestEnum testenum)
+    {
+        if(dataManager.testEnum == testenum)
+            return;
+
+        dataManager.testEnum = testenum;
+        Intent intent = new Intent(getApplicationContext(), SearchActivity.class);
+        startActivity(intent);
+        finish();
+
+    }
+
+    public void resetFragment(){
+        if(dataManager.testTabPosition != -1)
+        {
+            setFragment(dataManager.testTabPosition);
+        }
+    }
+
+    public void callInsertFragment(TestType type)
+    {
+        ((InsertFragment)insertFragment).type = type;
+        getSupportFragmentManager().beginTransaction().replace(R.id.frame, insertFragment).commit();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
     }
 
 
+    public void deleteAlert(ImageFile imageFile, ConstraintLayout constraintLayout,LinearLayout linearLayout)
+    {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this
+                , R.style.AlertDialogTheme);
+
+        View view = LayoutInflater.from(this).inflate(
+                R.layout.layout_dialog2,
+                (LinearLayout) findViewById(R.id.layoutDialog));
+
+        //다이얼로그 텍스트 설정
+        builder.setView(view);
+
+        AlertDialog alertDialog = builder.create();
+
+        view.findViewById(R.id.button_dialog_close).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                alertDialog.dismiss();
+            }
+        });
+
+        view.findViewById(R.id.btnOk).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dataManager.dbHelper.deleteFile(imageFile);
+                constraintLayout.setVisibility(View.VISIBLE);
+                linearLayout.setVisibility(View.INVISIBLE);
+                alertDialog.dismiss();
+            }
+        });
+
+        if (alertDialog.getWindow() != null) {
+            alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
+        }
+
+        alertDialog.show();
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java
index a49187f..1efcb63 100644
--- a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java
+++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java
@@ -73,8 +73,6 @@ public class TestSelectActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 dataManager.testEnum = TestEnum.발생지특성규명;
-                //데이터 세팅
-                dataManager.pkgList = dataManager.dbHelper.getAllORIGIN_CHRCT();
                 StartSearchActivity();
             }
         });
@@ -83,7 +81,6 @@ public class TestSelectActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 dataManager.testEnum = TestEnum.예비검사;
-                dataManager.pkgList = dataManager.dbHelper.getAllPREPAR_TEST();
                 StartSearchActivity();
             }
         });
@@ -94,7 +91,6 @@ public class TestSelectActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 dataManager.testEnum = TestEnum.인수검사;
-                dataManager.pkgList = dataManager.dbHelper.getAllACCEPT_TEST();
                 StartSearchActivity();
             }
         });
@@ -103,7 +99,6 @@ public class TestSelectActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 dataManager.testEnum = TestEnum.처분검사;
-                dataManager.pkgList = dataManager.dbHelper.getAllDISPOSAL_TEST();
                 StartSearchActivity();
             }
         });
diff --git a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java
index d5b3ab0..b78e7d2 100644
--- a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java
+++ b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java
@@ -21,6 +21,7 @@ import com.qtagger.Activity.MoreActivity;
 import com.qtagger.Activity.SyncActivity;
 import com.qtagger.Data.TestEnum;
 import com.qtagger.Database.AccountData;
+import com.qtagger.MainActivity;
 import com.qtagger.R;
 import com.qtagger.util.DataManager;
 
@@ -139,10 +140,15 @@ public class CommonNavigationView {
                 drawerLayout.closeDrawer(navigationView,true);
             }
         });
+
         activity.findViewById(R.id.button_Close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                drawerLayout.closeDrawer(navigationView,true);
+
+                Intent intent = new Intent(activity.getApplicationContext(), MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |  Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                activity.startActivity(intent);
+                //drawerLayout.closeDrawer(navigationView,true);
 
             }
         });
diff --git a/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java
index 335cb58..0f6091d 100644
--- a/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java
+++ b/app/src/main/java/com/qtagger/CustomPalette/RectangleWeightCapture.java
@@ -3,6 +3,7 @@ package com.qtagger.CustomPalette;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Point;
@@ -32,6 +33,7 @@ public class RectangleWeightCapture extends View {
         paint.setStyle(Paint.Style.STROKE);
         paint.setColor(Color.RED);
         paint.setStrokeWidth(3);
+        paint.setPathEffect(new DashPathEffect(new float[]{5,5},1));
 
         //center
         int x0 = (int) (canvas.getWidth() / 2);
diff --git a/app/src/main/java/com/qtagger/Data/CameraInfoSet.java b/app/src/main/java/com/qtagger/Data/CameraInfoSet.java
new file mode 100644
index 0000000..59cc672
--- /dev/null
+++ b/app/src/main/java/com/qtagger/Data/CameraInfoSet.java
@@ -0,0 +1,27 @@
+package com.qtagger.Data;
+
+public class CameraInfoSet {
+    String title;
+    String data;
+
+    public CameraInfoSet(String title, String data) {
+        this.title = title;
+        this.data = data;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}
diff --git a/app/src/main/java/com/qtagger/Database/DBHelper.java b/app/src/main/java/com/qtagger/Database/DBHelper.java
index b4d60a7..cd0f30b 100644
--- a/app/src/main/java/com/qtagger/Database/DBHelper.java
+++ b/app/src/main/java/com/qtagger/Database/DBHelper.java
@@ -339,40 +339,58 @@ public class DBHelper extends SQLiteOpenHelper {
 
 
         db = getWritableDatabase();
+        boolean pkgDataChecker = false;
+
+        if (f.getType().compareTo(TestType.Nothing.name()) == 0 || f.getType().compareTo(TestType.Filling.name()) == 0) {
+            pkgDataChecker = true;
+        }
 
         List<ImageFile> selectData = new ArrayList<>();
-        String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'";
+        String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo() + "' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType() + "'";
+        if (pkgDataChecker) {
+            selQuery += " AND PkgData = '" + f.getPkgData() + "'";
+        }
         //기존에 데이터가 있는지 확인
-        Cursor cs = db.rawQuery(selQuery,null);
-        while (cs.moveToNext()){
-            selectData.add(new ImageFile(cs.getString(0),cs.getString(1),cs.getString(2),cs.getString(3),cs.getString(4)
-                    ,cs.getString(5),cs.getString(6),cs.getString(7)));
+        Cursor cs = db.rawQuery(selQuery, null);
+        while (cs.moveToNext()) {
+            selectData.add(new ImageFile(cs.getString(0), cs.getString(1), cs.getString(2), cs.getString(3), cs.getString(4)
+                    , cs.getString(5), cs.getString(6), cs.getString(7)));
         }
         //있으면 이미지 삭제
-        if(selectData.size() != 0)
-        {
-            for (ImageFile imagefile:
+        if (selectData.size() != 0) {
+            for (ImageFile imagefile :
                     selectData) {
                 File file = new File(imagefile.getFilePath());
-                if(file.exists())
+                if (file.exists())
                     file.delete();
             }
         }
         //db데이터 삭제
-        db.execSQL("DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'");
 
+        String deleteQuery = "DELETE from File where PKGNo ='" + f.getPkgNo() + "' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType() + "'";
+        if (pkgDataChecker) {
+            deleteQuery += " AND PkgData = '" + f.getPkgData() + "'";
+        }
+
+        db.execSQL(deleteQuery);
         //새로운 데이터 추가
-        db.execSQL("Insert or replace into File (PkgNo , TestEnum ,Type ,CreateDate ,PkgData,UserId ,FilePath ,FileName) VALUES('"+f.getPkgNo()+"','"+f.getTestEnum()+"','"+f.getType()+"','"+f.getCreateDate()+"','"+f.getPkgData()+"','"+f.getUserId()+"','"+f.getFilePath()+"','"+f.getFileName()+"')");
+        db.execSQL("Insert or replace into File (PkgNo , TestEnum ,Type ,CreateDate ,PkgData,UserId ,FilePath ,FileName) VALUES('" + f.getPkgNo() + "','" + f.getTestEnum() + "','" + f.getType() + "','" + f.getCreateDate() + "','" + f.getPkgData() + "','" + f.getUserId() + "','" + f.getFilePath() + "','" + f.getFileName() + "')");
         db.close();
     }
 
     public void deleteFile(ImageFile f)
     {
         db = getWritableDatabase();
+        boolean pictureChecker = (f.getType().compareTo(TestType.Nothing.name()) == 0) || (f.getType().compareTo(TestType.Filling.name()) == 0);
 
         List<ImageFile> selectData = new ArrayList<>();
         String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'";
-        //기존에 데이터가 있는지 확인
+        if(pictureChecker)
+        {
+            selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum()+ "' AND PkgData = '" + f.getPkgData() + "' AND Type = '" + f.getType()+"'";
+        }
+
+            //기존에 데이터가 있는지 확인
         Cursor cs = db.rawQuery(selQuery,null);
         while (cs.moveToNext()){
             selectData.add(new ImageFile(cs.getString(0),cs.getString(1),cs.getString(2),cs.getString(3),cs.getString(4)
@@ -388,8 +406,15 @@ public class DBHelper extends SQLiteOpenHelper {
                     file.delete();
             }
         }
+
+        String deleteQuery ="DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'";
+        if(pictureChecker)
+        {
+            deleteQuery = "DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum()+ "' AND PkgData = '" + f.getPkgData() + "' AND Type = '" + f.getType()+"'";
+        }
+
         //db데이터 삭제
-        db.execSQL("DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'");
+        db.execSQL(deleteQuery);
         db.close();
     }
 
@@ -406,10 +431,17 @@ public class DBHelper extends SQLiteOpenHelper {
 
     }
 
-    public ImageFile selectFile(String PkgNo, String TestEnum,String type )
+    public ImageFile selectFile(String PkgNo, String TestEnum,String type,String PkgData )
     {
         ImageFile imageFile = null;
-        String selQuery = "Select * From File Where PkgNo ='" + PkgNo+"' AND TestEnum = '" + TestEnum + "' AND Type = '" + type+"'";
+        String selQuery = "";
+        if(PkgData == null) {
+            selQuery = "Select * From File Where PkgNo ='" + PkgNo + "' AND TestEnum = '" + TestEnum + "' AND Type = '" + type + "'";
+        }
+        else
+        {
+            selQuery = "Select * From File Where PkgNo ='" + PkgNo + "' AND TestEnum = '" + TestEnum+ "' AND PkgData = '" + PkgData + "' AND Type = '" + type + "'";
+        }
         db = getWritableDatabase();
         Cursor cs = db.rawQuery(selQuery,null);
         while (cs.moveToNext()){
diff --git a/app/src/main/java/com/qtagger/Database/TestType.java b/app/src/main/java/com/qtagger/Database/TestType.java
index 8624888..cdd0933 100644
--- a/app/src/main/java/com/qtagger/Database/TestType.java
+++ b/app/src/main/java/com/qtagger/Database/TestType.java
@@ -1,20 +1,20 @@
 package com.qtagger.Database;
 
 public enum TestType {
-    Top_Front("TOP - FRONT"),
-    Top_Back("TOP - BACK"),
-    Top_Left("TOP - LEFT"),
-    Top_Right("TOP - RIGHT"),
+    Top_Front("Top-Front"),
+    Top_Back("Top-Back"),
+    Top_Left("Top-Left"),
+    Top_Right("Top-Right"),
 
-    Middle_Front("MIDDLE - FRONT"),
-    Middle_Back("MIDDLE - BACK"),
-    Middle_Left("MIDDLE - LEFT"),
-    Middle_Right("MIDDLE - RIGHT"),
+    Middle_Front("Middle-Front"),
+    Middle_Back("Middle-Back"),
+    Middle_Left("Middle-Left"),
+    Middle_Right("Middle-Right"),
 
-    Bottom_Front("BOTTOM - FRONT"),
-    Bottom_Back("BOTTOM - BACK"),
-    Bottom_Left("BOTTOM - LEFT"),
-    Bottom_Right("BOTTOM - RIGHT"),
+    Bottom_Front("Bottom-Front"),
+    Bottom_Back("Bottom-Back"),
+    Bottom_Left("Bottom-Left"),
+    Bottom_Right("Bottom-Right"),
 
     Filling("Filling"),
     Weight("Weight"),
@@ -29,6 +29,7 @@ public enum TestType {
         this.label = label;
     }
 
+
     public static TestType getByName(String Name){
 
         if(Name.compareTo(Top_Front.name()) == 0)
diff --git a/app/src/main/res/drawable-v24/btn_retake.png b/app/src/main/res/drawable-v24/btn_retake.png
index 51fdb59..cd04ebd 100644
Binary files a/app/src/main/res/drawable-v24/btn_retake.png 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
index 60f3388..6626eac 100644
Binary files a/app/src/main/res/drawable-v24/btn_save.png and b/app/src/main/res/drawable-v24/btn_save.png differ
diff --git a/app/src/main/res/drawable-v24/img_setup.png b/app/src/main/res/drawable-v24/img_setup.png
new file mode 100644
index 0000000..c2f2705
Binary files /dev/null and b/app/src/main/res/drawable-v24/img_setup.png differ
diff --git a/app/src/main/res/drawable-v24/img_setup_test.png b/app/src/main/res/drawable-v24/img_setup_test.png
new file mode 100644
index 0000000..5e1577f
Binary files /dev/null and b/app/src/main/res/drawable-v24/img_setup_test.png differ
diff --git a/app/src/main/res/drawable-v24/sub_menu01.png b/app/src/main/res/drawable-v24/sub_menu01.png
index 9143df2..f257f39 100644
Binary files a/app/src/main/res/drawable-v24/sub_menu01.png 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
index 85844db..b64a2ea 100644
Binary files a/app/src/main/res/drawable-v24/sub_menu02.png 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
index 02758c2..a79ac75 100644
Binary files a/app/src/main/res/drawable-v24/sub_menu03.png 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
index 05a61d0..f95b3a2 100644
Binary files a/app/src/main/res/drawable-v24/sub_menu04.png and b/app/src/main/res/drawable-v24/sub_menu04.png differ
diff --git a/app/src/main/res/drawable/default_fragment_background.xml b/app/src/main/res/drawable/default_fragment_background.xml
index 167812f..049706f 100644
--- a/app/src/main/res/drawable/default_fragment_background.xml
+++ b/app/src/main/res/drawable/default_fragment_background.xml
@@ -10,7 +10,5 @@
         android:bottomRightRadius="12dp"
         android:topLeftRadius="12dp"
         android:topRightRadius="12dp" />
-    <padding
-        android:bottom="5dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index 216d5de..4f86c64 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -43,13 +43,48 @@
             android:visibility="invisible"
             tools:ignore="RtlCompat" />
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout_radValue"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="0dp"
+            android:visibility="invisible"
+            android:background="#66000000">
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="측정 중 입니다."
+                android:textColor="@color/white"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/textView_radValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="0.0000 μSv/hr"
+                android:textColor="#FFFF00"
+                android:textSize="30sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView4" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layout_top_menu"
             android:layout_width="match_parent"
             android:layout_height="65dp"
             android:background="#66000000"
-            android:visibility="invisible"
-            android:orientation="horizontal">
+            android:visibility="invisible">
 
             <androidx.constraintlayout.utils.widget.ImageFilterButton
                 android:id="@+id/imageFilterButton_Back"
@@ -69,28 +104,48 @@
                 android:id="@+id/button_retake"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
                 android:background="@android:color/transparent"
                 android:minWidth="32dp"
                 android:minHeight="32dp"
                 android:src="@drawable/btn_retake"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/imageFilterButton_save"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="18dp"
+                android:text="retake"
+                android:textColor="@color/white"
+                app:layout_constraintEnd_toStartOf="@+id/textView6"
+                app:layout_constraintTop_toBottomOf="@+id/button_retake" />
+
             <androidx.constraintlayout.utils.widget.ImageFilterButton
                 android:id="@+id/imageFilterButton_save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
                 android:background="@android:color/transparent"
                 android:minWidth="32dp"
                 android:minHeight="32dp"
                 android:src="@drawable/btn_save"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/textView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="18dp"
+                android:text="save"
+                android:textColor="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageFilterButton_save" />
+
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/app/src/main/res/layout/activity_picture_info.xml b/app/src/main/res/layout/activity_picture_info.xml
index 0d9eb3a..4e9c64f 100644
--- a/app/src/main/res/layout/activity_picture_info.xml
+++ b/app/src/main/res/layout/activity_picture_info.xml
@@ -36,20 +36,29 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <androidx.constraintlayout.utils.widget.ImageFilterButton
-            android:id="@+id/imageFilterButton_delete"
+            android:id="@+id/button_retake"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:background="@android:color/transparent"
             android:minWidth="32dp"
             android:minHeight="32dp"
-            android:src="@drawable/btn_save"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:src="@drawable/btn_retake"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="14dp"
+            android:text="retake"
+            android:textColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button_retake" />
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 54269b9..877a234 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -61,6 +61,7 @@
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
+            android:elevation="1dp"
             android:layout_height="48dp">
 
             <com.google.android.material.tabs.TabItem
@@ -77,7 +78,7 @@
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="포장물 List" />
+                android:text="포장물 선택" />
         </com.google.android.material.tabs.TabLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/layout/activity_sync.xml b/app/src/main/res/layout/activity_sync.xml
index f0f04df..1746d0a 100644
--- a/app/src/main/res/layout/activity_sync.xml
+++ b/app/src/main/res/layout/activity_sync.xml
@@ -5,72 +5,75 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/defaultBackgroundColor"
     tools:context=".Activity.SyncActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="65dp"
+        android:background="@color/defaultColor">
+
         <androidx.constraintlayout.utils.widget.ImageFilterButton
             android:id="@+id/imageFilterButton_Back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#FFFFFF"
+            android:layout_marginStart="16dp"
+            android:background="@android:color/transparent"
             android:minWidth="48dp"
             android:minHeight="48dp"
-            android:src="@drawable/back_arrow_5821"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
+            android:src="@drawable/btn_back_white"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/textViewTestType"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:text="검사단계"
             android:textAlignment="center"
             android:textSize="24sp"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"  />
-
-        <View
-            android:id="@+id/view2"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="60dp"
-            android:background="#000000"
             app:layout_constraintTop_toTopOf="parent" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="10dp"
         android:orientation="horizontal">
-    <SearchView
-        android:id="@+id/searchViewPkg"
-        android:layout_width="match_parent"
-        android:layout_height="37dp"
-        android:layout_margin="10dp"
 
-        android:background="@drawable/searchview_background"
-        android:iconifiedByDefault="true"
-        android:paddingLeft="0dp"
-        android:queryHint="방폐물 검색"
-        app:defaultQueryHint="방폐물 검색"
-        app:iconifiedByDefault="false"
-        android:layout_weight="12"/>
+        <SearchView
+            android:id="@+id/searchViewPkg"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginEnd="20dp"
+            android:layout_gravity="center"
+            android:layout_weight="12"
+            android:background="@drawable/searchview_background"
+            android:iconifiedByDefault="true"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="2dp"
+            android:queryHint="방폐물 검색"
+            app:defaultQueryHint="방폐물 검색"
+            android:layoutDirection="rtl"
+            app:iconifiedByDefault="false" />
+
         <ImageButton
             android:id="@+id/button_Download"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="10dp"
-            android:src="@drawable/download_32"
+            android:layout_margin="10dp"
+            android:layout_gravity="center"
             android:background="@android:color/transparent"
-            />
+            android:src="@drawable/download_32" />
     </LinearLayout>
     <ListView
         android:id="@+id/list_pkg"
@@ -78,6 +81,13 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:choiceMode="multipleChoice"
+
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/listview_background"
+        android:scrollbars="none"
         />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml
index cd9d338..039b124 100644
--- a/app/src/main/res/layout/activity_test2.xml
+++ b/app/src/main/res/layout/activity_test2.xml
@@ -63,6 +63,7 @@
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="48dp"
+            android:elevation="1dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:tabMode="scrollable">
@@ -103,7 +104,99 @@
             android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:background="#F5F5F5" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="62dp"
+            android:background="#797979"
+            android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/Linearlayout_origin"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="5dp"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/sub_menu01"
+                    android:layout_gravity="center"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/white"
+                    android:text="발생지특성"/>
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/Linearlayout_prepar"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="5dp"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/sub_menu02"
+                    android:layout_gravity="center"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/white"
+                    android:text="예비 검사"/>
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/Linearlayout_accept"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="5dp"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/sub_menu03"
+                    android:layout_gravity="center"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/white"
+                    android:text="인수 검사"/>
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/Linearlayout_disposal"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="5dp"
+                android:layout_weight="1">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/sub_menu04"
+                    android:layout_gravity="center"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/white"
+                    android:text="처분 검사"/>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml
index b42523d..3c46968 100644
--- a/app/src/main/res/layout/activity_test_select.xml
+++ b/app/src/main/res/layout/activity_test_select.xml
@@ -62,7 +62,7 @@
                 android:id="@+id/linearlayout1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
+                android:layout_marginTop="100dp"
                 app:layout_constraintTop_toBottomOf="@+id/view2">
 
                 <com.qtagger.CustomPalette.SquareButton
diff --git a/app/src/main/res/layout/fragment_barcode.xml b/app/src/main/res/layout/fragment_barcode.xml
index 21d6eca..0455674 100644
--- a/app/src/main/res/layout/fragment_barcode.xml
+++ b/app/src/main/res/layout/fragment_barcode.xml
@@ -29,7 +29,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="Barcode 인식"
-            android:textStyle="bold"
+            android:textSize="15sp"
+            android:textColor="#333333"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageView2" />
diff --git a/app/src/main/res/layout/fragment_capture.xml b/app/src/main/res/layout/fragment_capture.xml
index 7bdd09a..108fb16 100644
--- a/app/src/main/res/layout/fragment_capture.xml
+++ b/app/src/main/res/layout/fragment_capture.xml
@@ -23,7 +23,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="TOP"
+                android:text="Top"
                 android:textSize="18sp"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="20dp"
@@ -46,7 +46,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="MIDDLE"
+                android:text="Middle"
                 android:textSize="18sp"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="20dp"
@@ -68,7 +68,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="BOTTOM"
+                android:text="Bottom"
                 android:textSize="18sp"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_fill.xml b/app/src/main/res/layout/fragment_fill.xml
index fe3c0b7..b22228c 100644
--- a/app/src/main/res/layout/fragment_fill.xml
+++ b/app/src/main/res/layout/fragment_fill.xml
@@ -1,121 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_margin="10dp"
+    android:background="@color/defaultBackgroundColor"
     tools:context=".Activity.Test.FillFragment">
 
+
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="none"
-        >
+        android:layout_height="match_parent">
+
         <LinearLayout
-            android:id="@+id/linearList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="10dp">
 
-            <LinearLayout
-                android:id="@+id/cell_content_view"
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/default_fragment_background"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
-                android:orientation="vertical"
-                android:visibility="visible">
-                <android.widget.Button
-                    android:id="@+id/folding_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:background="@android:color/transparent"
-                    android:drawableRight="@drawable/arrows_down_48"
-                    android:paddingLeft="10dp"
-                    android:text="채움률 선택해주세요"
-                    android:textSize="20sp"
-                    android:textAlignment="textStart"
-                    />
-                <RadioGroup
-                    android:id="@+id/radio_fill_value"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone">
-                    <RadioButton
-                        android:id="@+id/fill100"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="FINAL(UNDER 100%)"/>
-                    <RadioButton
-                        android:id="@+id/fill75"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="75%"/>
-                    <RadioButton
-                        android:id="@+id/fill50"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="50%"/>
-                    <RadioButton
-                        android:id="@+id/fill25"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="25%"/>
-                    <RadioButton
-                        android:id="@+id/fill0"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="0%"/>
-                    <RadioButton
-                        android:id="@+id/fillInput"
-                        android:layout_width="match_parent"
-                        android:layout_height="35dp"
-                        android:text="직접입력">
-
-                    </RadioButton>
-                    <EditText
-                        android:id="@+id/editInput"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="numberDecimal"
-
-                        android:visibility="gone"
-                        android:hint="채움률 입력해주세요"/>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        >
-                        <android.widget.Button
-                            android:id="@+id/fill_OK"
-                            android:layout_width="match_parent"
-                            android:layout_height="56dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/button_normal_background"
-                            android:text="확인"
-                            >
-                        </android.widget.Button>
-                    </LinearLayout>
-
-                </RadioGroup>
-
-                <com.qtagger.CustomPalette.SquareButton
-                    android:id="@+id/fill_Picture"
-                    android:layout_width="match_parent"
-                    android:layout_height="500dp"
-                    android:layout_margin="20dp"
-                    android:foreground="@drawable/add_picture_32"
-                    android:foregroundGravity="center_vertical|center_horizontal"
-                    />
-
-            </LinearLayout>
+                android:layout_gravity="center"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="5dp"
+                android:text="채움률을 선택해 주세요." />
 
+            <include
+                android:id="@+id/filling_25"
+                layout="@layout/layout_capture_test" />
 
+            <include
+                android:id="@+id/filling_50"
+                layout="@layout/layout_capture_test" />
 
+            <include
+                android:id="@+id/filling_75"
+                layout="@layout/layout_capture_test" />
 
+            <include
+                android:id="@+id/filling_100"
+                layout="@layout/layout_capture_test" />
 
+            <include
+                android:id="@+id/filling"
+                layout="@layout/layout_capture_test" />
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index 87f5238..9d45c3f 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -10,6 +10,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/defaultBackgroundColor"
         android:scrollbars="none">
 
 
@@ -19,70 +20,116 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
+            <TextView
+                android:id="@+id/TextView_defaultInfo1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="아이템1"
+                android:textColor="@color/defaultTitleColor"
+                android:textSize="18sp"/>
+
             <LinearLayout
                 android:id="@+id/layout_defaultInfo1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:paddingTop="10dp"
-                android:paddingBottom="20dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:background="@drawable/default_fragment_background"
                 android:orientation="vertical">
-
             </LinearLayout>
+
+            <TextView
+                android:id="@+id/TextView_defaultInfo2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="아이템2"
+                android:textColor="@color/defaultTitleColor"
+                android:textSize="18sp"/>
             <LinearLayout
                 android:id="@+id/layout_defaultInfo2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:paddingTop="10dp"
-                android:paddingBottom="20dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:background="@drawable/default_fragment_background"
                 android:orientation="vertical">
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/layout_defaultInfo3"
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/TextView_addInfo"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
-                android:paddingTop="10dp"
-                android:paddingBottom="20dp"
-                android:background="@drawable/default_fragment_background"
-                android:orientation="vertical">
-
-            </LinearLayout>
-
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="방사선적 특성"
+                android:textColor="@color/defaultTitleColor"
+                android:textSize="18sp"/>
             <LinearLayout
                 android:id="@+id/layout_addInfo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="10dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/default_fragment_background"
+                android:orientation="vertical">
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/TextView_defaultInfo3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="아이템3"
+                android:textColor="@color/defaultTitleColor"
+                android:textSize="18sp"/>
+            <LinearLayout
+                android:id="@+id/layout_defaultInfo3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:background="@drawable/default_fragment_background"
                 android:orientation="vertical">
 
-
-                    <TextView
-                        android:id="@+id/TextView_addInfo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="10dp"
-                        android:text="방사선적 특성"
-                        android:textColor="@color/black"
-                        android:textSize="24sp">
-
-                    </TextView>
-
+            </LinearLayout>
 
 
 
+            <TextView
+                android:id="@+id/TextView_defaultInfo4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:layout_marginTop="10dp"
+                android:text="핵종정보"
+                android:visibility="gone"
+                android:textColor="@color/defaultTitleColor"
+                android:textSize="18sp"/>
+            <LinearLayout
+                android:id="@+id/layout_defaultInfo4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:background="@drawable/default_fragment_background"
+                android:orientation="vertical">
             </LinearLayout>
 
             <LinearLayout
@@ -90,6 +137,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
+
+                android:visibility="gone"
                 android:background="@drawable/default_fragment_background"
                 android:orientation="vertical">
                 <android.widget.Button
@@ -118,6 +167,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:visibility="gone"
                 android:layout_margin="10dp"
                 android:background="@drawable/default_fragment_background"
                 android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_insert.xml b/app/src/main/res/layout/fragment_insert.xml
new file mode 100644
index 0000000..07f8bd9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_insert.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/defaultBackgroundColor"
+    tools:context=".Activity.Test.InsertFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="20dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textView_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="직접 입력"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/itemButton"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:src="@drawable/btn_back_white"/>
+
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/editText_value"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_margin="20dp"
+            android:background="@drawable/searchview_background"
+            android:hint="채움률을 입력해주세요."
+            android:paddingLeft="20dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#EEEEEE" />
+
+
+        <com.qtagger.CustomPalette.SquareButton
+            android:id="@+id/button_Picture"
+            android:layout_width="match_parent"
+            android:layout_height="500dp"
+            android:layout_margin="20dp"
+            android:background="@drawable/listview_background"
+            android:foreground="@drawable/img_cam02"
+            android:foregroundGravity="center"
+            android:stateListAnimator="@null" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index 0a827fe..3610890 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -18,18 +18,16 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="15dp"
             android:layout_marginEnd="20dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:paddingBottom="2dp"
-            android:background="@drawable/searchview_background"
-            android:iconifiedByDefault="true"
-            android:queryHint="포장물 번호 검색"
             android:layoutDirection="rtl"
+            android:background="@drawable/searchview_background"
+            android:queryHint="포장물 번호 검색"
             app:defaultQueryHint="포장물 번호 검색"
-
-            app:iconifiedByDefault="false"
+            app:iconifiedByDefault="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -37,14 +35,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="15dp"
             android:background="#EEEEEE"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:text="포장물 List"
+            android:text="포장물 목록"
             android:textSize="18sp"
             android:textColor="#333333"
             android:layout_marginLeft="30dp"
@@ -61,6 +59,8 @@
             android:background="@drawable/listview_background"
             android:textFilterEnabled="true"
             android:scrollbars="none"
+            android:divider="#f3f3f3"
+            android:dividerHeight="1dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_photograph.xml b/app/src/main/res/layout/fragment_photograph.xml
index 039b074..210f05b 100644
--- a/app/src/main/res/layout/fragment_photograph.xml
+++ b/app/src/main/res/layout/fragment_photograph.xml
@@ -10,38 +10,73 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/defaultBackgroundColor"
+        >
         <LinearLayout
             android:id="@+id/linearList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/default_fragment_background"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingBottom="10dp"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="10dp"
-                android:text="기타 사진 촬영"
-                android:textSize="20sp"
-                android:textColor="@color/black"/>
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="5dp"
+                android:text="추가 버튼을 눌러 주세요."
+                android:gravity="center"/>
 
-
-            <com.qtagger.CustomPalette.SquareButton
-                android:id="@+id/button_img_add"
+            <LinearLayout
+                android:id="@+id/linearLayout_pictureList"
                 android:layout_width="match_parent"
-                android:layout_height="500dp"
-                android:layout_margin="20dp"
-                android:foreground="@drawable/add_picture_32"
-                android:foregroundGravity="center_vertical|center_horizontal"
-                />
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
+            </LinearLayout>
+
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/listview_background">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/capture_add"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@android:color/transparent">
+
+                    <ImageView
+                        android:id="@+id/imageView3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginBottom="4dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@drawable/img_cam01" />
+
+                    <TextView
+                        android:id="@+id/capture_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="추가"
+                        android:textColor="@color/defaultDisableTextColor"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/imageView3" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </RelativeLayout>
 
         </LinearLayout>
     </ScrollView>
-
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_rfid.xml b/app/src/main/res/layout/fragment_rfid.xml
index 056c1db..489933c 100644
--- a/app/src/main/res/layout/fragment_rfid.xml
+++ b/app/src/main/res/layout/fragment_rfid.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/default_fragment_background"
+    android:paddingBottom="5dp"
     tools:context=".Activity.Search.RfidFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_weight2.xml b/app/src/main/res/layout/fragment_weight2.xml
index 61d85f5..fdbcf21 100644
--- a/app/src/main/res/layout/fragment_weight2.xml
+++ b/app/src/main/res/layout/fragment_weight2.xml
@@ -9,36 +9,99 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <LinearLayout
             android:id="@+id/linearList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@android:color/transparent"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
             android:orientation="vertical">
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="10dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="15dp"
                 android:gravity="center"
-                android:text="전자저울 인디케이터를 촬영해주세요"
-                android:textSize="20sp"
-                android:textColor="@color/black"/>
+                android:paddingLeft="10dp"
+                android:text="전자저울 인디케이터를 촬영해주세요" />
 
 
-            <com.qtagger.CustomPalette.SquareButton
-                android:id="@+id/weight_Picture"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="500dp"
-                android:layout_margin="20dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
                 android:background="@drawable/listview_background"
-                android:stateListAnimator="@null"
-                android:foreground="@drawable/img_cam02"
-                android:foregroundGravity="center"
-                />
+                android:orientation="horizontal">
+
+                <com.qtagger.CustomPalette.SquareButton
+                    android:id="@+id/weight_Picture"
+                    android:layout_width="match_parent"
+                    android:layout_height="500dp"
+                    android:layout_weight="1"
+                    android:layout_margin="10dp"
+                    android:background="@android:color/transparent"
+                    android:foreground="@drawable/img_cam02"
+                    android:foregroundGravity="center"
+                    android:stateListAnimator="@null" />
+
+                <ImageView
+                    android:id="@+id/imageView_deleteButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="5dp"
+                    android:padding="5dp"
+                    android:visibility="gone"
+                    android:src="@drawable/btn_close" />
+            </LinearLayout>
+            <TableLayout
+                android:id="@+id/tableLayout_data"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginBottom="20dp"
+                android:background="@drawable/listview_background"
+                android:padding="20dp">
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.3"
+                        android:text="무게 측정값(kg)" />
+
+                    <TextView
+                        android:id="@+id/textView_weightValue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="타이틀"
+                        android:textStyle="bold" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.3"
+                        android:text="촬영 일자" />
+
+                    <TextView
+                        android:id="@+id/textView_weightDate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="타이틀"
+                        android:textStyle="bold" />
+                </TableRow>
+
+            </TableLayout>
 
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/layout_capture_test.xml b/app/src/main/res/layout/layout_capture_test.xml
index d3f58ab..3e6cca1 100644
--- a/app/src/main/res/layout/layout_capture_test.xml
+++ b/app/src/main/res/layout/layout_capture_test.xml
@@ -4,7 +4,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="100dp"
+    android:layout_height="110dp"
     android:layout_marginLeft="20dp"
     android:layout_marginRight="20dp"
     android:layout_marginTop="10dp"
@@ -14,7 +14,8 @@
         android:id="@+id/capture_add"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/transparent">
+        android:background="@android:color/transparent"
+        android:visibility="visible">
 
         <ImageView
             android:id="@+id/imageView3"
@@ -40,16 +41,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <ImageView
-        android:id="@+id/imageView_deleteButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="10dp"
-        android:src="@drawable/btn_close"
-        android:visibility="invisible" />
-
     <LinearLayout
         android:id="@+id/linearlayout_Info"
         android:layout_width="match_parent"
@@ -64,6 +55,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.7"
+            android:scaleType="fitXY"
             android:src="@color/black" />
 
         <LinearLayout
@@ -75,20 +67,29 @@
 
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="30dp" />
+
             <TextView
+                android:id="@+id/textView_location"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:textColor="#666666"
                 android:text="위치" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:textColor="#666666"
                 android:text="날짜" />
 
             <TextView
+                android:id="@+id/textView_valueTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:textColor="#666666"
                 android:text="선량률" />
 
 
@@ -99,33 +100,49 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:orientation="vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/imageView_deleteButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:src="@drawable/btn_close" />
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/item_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="TOP - FRONT"
-                android:textStyle="bold" />
+                android:text="Title"
+                android:textSize="13sp"
+                android:textColor="#333333" />
 
             <TextView
                 android:id="@+id/nuclide_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="2022-09-28 15:23:26"
-                android:textStyle="bold" />
+                android:text="Date"
+                android:textSize="13sp"
+                android:textColor="#333333" />
 
             <TextView
                 android:id="@+id/nuclide_data"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="0.04112 μSv/hr"
-                android:textStyle="bold" />
-
-
+                android:text="Data"
+                android:textSize="13sp"
+                android:textColor="#333333" />
         </LinearLayout>
 
-
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_dialog2.xml b/app/src/main/res/layout/layout_dialog2.xml
new file mode 100644
index 0000000..a8f31ff
--- /dev/null
+++ b/app/src/main/res/layout/layout_dialog2.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/layoutDialog"
+    android:layout_width="300dp"
+    android:layout_height="300dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/dialog_background"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/button_dialog_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
+            android:src="@drawable/btn_close"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="50dp"
+            android:layout_marginBottom="20dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/textTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.2"
+                android:gravity="center"
+                android:text="해당 데이터를 삭제하시겠습니까?"
+                android:textColor="@color/dialogTitleColor"
+                android:textSize="13sp" />
+
+
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="50dp"
+            android:background="@color/black"/>
+
+
+
+        <android.widget.Button
+            android:id="@+id/btnOk"
+            android:layout_margin="40dp"
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:textColor="@color/white"
+            android:background="@drawable/button_new_default_background"
+            android:text="삭제" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file