diff --git a/.idea/misc.xml b/.idea/misc.xml index 556c1ae..bf8a0e5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -80,6 +80,7 @@ + @@ -87,10 +88,12 @@ + + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2564_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2564_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2564_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_2924_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2924_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2924_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_3271_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3271_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3271_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_3630_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3630_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3630_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_3969_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3969_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3969_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3969_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_4258_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4258_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_4868_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4868_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4868_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_5238_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5238_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5238_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_5496_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5496_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5496_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_5840_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5840_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5840_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_6120_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6120_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6120_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_6447_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6447_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6447_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_4435_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_4435_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/x86/generate_cxx_metadata_4435_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 5c22a56..e899ea8 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": 1337815546 + "memoizedHashCode": 75119626 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 998686476 + "memoizedHashCode": -264009444 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1129704711 + "memoizedHashCode": -132991209 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2407_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2407_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2407_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_2765_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2765_timing.txt new file mode 100644 index 0000000..957f2ba --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2765_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_3124_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3124_timing.txt new file mode 100644 index 0000000..96156c7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3124_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_3482_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3482_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3482_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_3810_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3810_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3810_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_4103_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4103_timing.txt index c7f6fcd..2627201 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4103_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4103_timing.txt @@ -3,3 +3,8 @@ create_cxx_tasks create-initial-cxx-model 20ms create_cxx_tasks completed in 21ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4435_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4435_timing.txt new file mode 100644 index 0000000..a73219e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4435_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_4712_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4712_timing.txt new file mode 100644 index 0000000..acf6d11 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4712_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 24ms +create_cxx_tasks completed in 25ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5349_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5349_timing.txt new file mode 100644 index 0000000..a181b0b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5349_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 22ms +create_cxx_tasks completed in 22ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5961_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5961_timing.txt new file mode 100644 index 0000000..ec626ca --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5961_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1f32998..b886f14 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,9 @@ android:theme="@style/Theme.QTagger" android:usesCleartextTraffic="true" tools:targetApi="31"> + @@ -76,8 +79,7 @@ android:exported="false" /> - + android:exported="false"> diff --git a/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java new file mode 100644 index 0000000..de183cf --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/PictureInfoActivity.java @@ -0,0 +1,69 @@ + +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.graphics.BitmapFactory; +import android.graphics.drawable.BitmapDrawable; +import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; + +import com.qtagger.Database.ImageFile; +import com.qtagger.R; +import com.qtagger.util.DataManager; + +public class PictureInfoActivity extends AppCompatActivity { + DataManager dataManager = DataManager.getInstance(); + Context context; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_picture_info); + context = this; + Intent intent = getIntent(); + String dbTestType = intent.getStringExtra("TestType"); + + if(dbTestType == null || dbTestType.isEmpty()) + finish(); + + ImageFile imageFile = dataManager.dbHelper.selectFile(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label(),dbTestType); + + if(imageFile == null) + finish(); + + ImageView imageView = findViewById(R.id.imageView); + imageView.setImageDrawable(new BitmapDrawable(BitmapFactory.decodeFile(imageFile.getFilePath()))); + + + + findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + 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() { + @Override + public void onClick(DialogInterface dialog, int which) { + dataManager.dbHelper.deleteFile(imageFile); + finish(); + } + }).setNegativeButton("취소",null); + android.app.AlertDialog alertDialog = builder.create(); + alertDialog.show(); + } + }); + } +} \ No newline at end of file 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 532cf40..7a29cdb 100644 --- a/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java @@ -1,6 +1,17 @@ package com.qtagger.Activity.Test; +import static com.qtagger.Database.TestType.Bottom_Back; +import static com.qtagger.Database.TestType.Bottom_Front; +import static com.qtagger.Database.TestType.Bottom_Left; +import static com.qtagger.Database.TestType.Bottom_Right; +import static com.qtagger.Database.TestType.Middle_Back; +import static com.qtagger.Database.TestType.Middle_Front; +import static com.qtagger.Database.TestType.Middle_Left; +import static com.qtagger.Database.TestType.Middle_Right; +import static com.qtagger.Database.TestType.Top_Back; import static com.qtagger.Database.TestType.Top_Front; +import static com.qtagger.Database.TestType.Top_Left; +import static com.qtagger.Database.TestType.Top_Right; import android.content.Context; import android.content.Intent; @@ -13,6 +24,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; @@ -20,10 +32,14 @@ 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.TextView; import android.widget.Toast; import com.qtagger.Activity.AccountList; import com.qtagger.Activity.CameraActivity; +import com.qtagger.Activity.PictureInfoActivity; import com.qtagger.Data.CaptureFragmentEnum; import com.qtagger.Database.ImageFile; import com.qtagger.Database.TestType; @@ -39,9 +55,9 @@ public class CaptureFragment extends Fragment { DataManager dataManager = DataManager.getInstance(); private Context context; private CaptureFragmentEnum Type; - Button btnTopFront,btnTopBack,btnTopLeft,btnTopRight; - Button btnMiddleFront,btnMiddleBack,btnMiddleLeft,btnMiddleRight; - Button btnBottomFront,btnBottomBack,btnBottomLeft,btnBottomRight; + View btnTopFront,btnTopBack,btnTopLeft,btnTopRight; + View btnMiddleFront,btnMiddleBack,btnMiddleLeft,btnMiddleRight; + View btnBottomFront,btnBottomBack,btnBottomLeft,btnBottomRight; public CaptureFragment(CaptureFragmentEnum type) { // Required empty public constructor @@ -59,21 +75,29 @@ public class CaptureFragment extends Fragment { context = container.getContext(); View view = inflater.inflate(R.layout.fragment_capture, container, false); - btnTopFront = view.findViewById(R.id.button_top_front); - btnTopBack = view.findViewById(R.id.button_top_back); - btnTopLeft = view.findViewById(R.id.button_top_left); - btnTopRight = view.findViewById(R.id.button_top_right); + /* + View tobacco = view.findViewById(R.id.capture_topBack); + TextView textView = tobacco.findViewById(R.id.capture_title); + textView.setText("TOP-BACK");*/ - btnMiddleFront = view.findViewById(R.id.button_middle_front); - btnMiddleBack = view.findViewById(R.id.button_middle_back); - btnMiddleLeft = view.findViewById(R.id.button_middle_left); - btnMiddleRight = view.findViewById(R.id.button_middle_right); - btnBottomFront = view.findViewById(R.id.button_bottom_front); - btnBottomBack = view.findViewById(R.id.button_bottom_back); - btnBottomLeft = view.findViewById(R.id.button_bottom_left); - btnBottomRight = view.findViewById(R.id.button_bottom_right); + btnTopFront = view.findViewById(R.id.capture_topFront); + btnTopBack = view.findViewById(R.id.capture_topBack); + btnTopLeft = view.findViewById(R.id.capture_topLeft); + btnTopRight = view.findViewById(R.id.capture_topRight); + + btnMiddleFront = view.findViewById(R.id.capture_middleFront); + btnMiddleBack = view.findViewById(R.id.capture_middleBack); + btnMiddleLeft = view.findViewById(R.id.capture_middleLeft); + btnMiddleRight = view.findViewById(R.id.capture_middleRight); + + btnBottomFront = view.findViewById(R.id.capture_bottomFront); + btnBottomBack = view.findViewById(R.id.capture_bottomBack); + 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) { @@ -162,13 +186,95 @@ public class CaptureFragment extends Fragment { public void onClick(View v) { cameraActivityOpen(Type.getTestType(TestType.Bottom_Right)); } - }); + });*/ return view; } + + private void resetView(View view, String title, TestType type) + { + if(title != null && !title.isEmpty()) { + 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()); + + ConstraintLayout constraintLayout = view.findViewById(R.id.capture_add); + constraintLayout.setVisibility(View.VISIBLE); + constraintLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + cameraActivityOpen(Type.getTestType(type)); + } + }); + + //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(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(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); + } + + + //추가화면, 혹은 정보뷰 중에 하나 입력 + 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 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()+" μ㏜/hr"); + + + + } + + @RequiresApi(api = Build.VERSION_CODES.M) @Override public void onStart() { @@ -177,7 +283,9 @@ public class CaptureFragment extends Fragment { if(dataManager.selPkg == null) return; - resetButton(); + allResetView(); + + List files = dataManager.dbHelper.selectFiles(dataManager.selPkg.getPKG_NO(),dataManager.testEnum.label()); for(ImageFile file : files) @@ -185,51 +293,21 @@ public class CaptureFragment extends Fragment { if(file.getType().contains(Type.name())) { TestType dbType =TestType.getByName(file.getType().replace(Type.name(),"")); - Button selButton = getTestTypeButton(dbType); + View selView = getTestTypeView(dbType); + setInfoView(selView,file); + + /* if(selButton != null) { selButton.setBackground(new BitmapDrawable(BitmapFactory.decodeFile(file.getFilePath()))); selButton.setForeground(null); - } + }*/ } } } - @RequiresApi(api = Build.VERSION_CODES.M) - public void resetButton(){ - int defaultColor = Color.parseColor("#C8C8C8"); - Drawable defaultDrawable = ContextCompat.getDrawable(context,R.drawable.add_picture_32); - - btnTopFront.setBackgroundColor(defaultColor); - btnTopFront.setForeground(defaultDrawable); - btnTopBack.setBackgroundColor(defaultColor); - btnTopBack.setForeground(defaultDrawable); - btnTopLeft.setBackgroundColor(defaultColor); - btnTopLeft.setForeground(defaultDrawable); - btnTopRight.setBackgroundColor(defaultColor); - btnTopRight.setForeground(defaultDrawable); - - btnMiddleFront.setBackgroundColor(defaultColor); - btnMiddleFront.setForeground(defaultDrawable); - btnMiddleBack.setBackgroundColor(defaultColor); - btnMiddleBack.setForeground(defaultDrawable); - btnMiddleLeft.setBackgroundColor(defaultColor); - btnMiddleLeft.setForeground(defaultDrawable); - btnMiddleRight.setBackgroundColor(defaultColor); - btnMiddleRight.setForeground(defaultDrawable); - - btnBottomFront.setBackgroundColor(defaultColor); - btnBottomFront.setForeground(defaultDrawable); - btnBottomBack.setBackgroundColor(defaultColor); - btnBottomBack.setForeground(defaultDrawable); - btnBottomLeft.setBackgroundColor(defaultColor); - btnBottomLeft.setForeground(defaultDrawable); - btnBottomRight.setBackgroundColor(defaultColor); - btnBottomRight.setForeground(defaultDrawable); - } - - public Button getTestTypeButton(TestType type){ + public View getTestTypeView(TestType type){ switch (type) { case Top_Front: @@ -269,6 +347,13 @@ public class CaptureFragment extends Fragment { startActivity(cameraIntent); } + private void pictureInfoActivityOpen(String testType) + { + Intent intent = new Intent(getActivity().getApplicationContext(), PictureInfoActivity.class); + intent.putExtra("TestType",testType); + startActivity(intent); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Database/DBHelper.java b/app/src/main/java/com/qtagger/Database/DBHelper.java index a4b3d83..b4d60a7 100644 --- a/app/src/main/java/com/qtagger/Database/DBHelper.java +++ b/app/src/main/java/com/qtagger/Database/DBHelper.java @@ -366,6 +366,33 @@ public class DBHelper extends SQLiteOpenHelper { db.close(); } + public void deleteFile(ImageFile f) + { + db = getWritableDatabase(); + + List selectData = new ArrayList<>(); + String selQuery = "Select * From File Where PkgNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' 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) + ,cs.getString(5),cs.getString(6),cs.getString(7))); + } + //있으면 이미지 삭제 + if(selectData.size() != 0) + { + for (ImageFile imagefile: + selectData) { + File file = new File(imagefile.getFilePath()); + if(file.exists()) + file.delete(); + } + } + //db데이터 삭제 + db.execSQL("DELETE from File where PKGNo ='" + f.getPkgNo()+"' AND TestEnum = '" + f.getTestEnum() + "' AND Type = '" + f.getType()+"'"); + db.close(); + } + public List selectFiles(String PkgNo, String TestEnum){ List resultData = new ArrayList(); db = getWritableDatabase(); @@ -379,6 +406,21 @@ public class DBHelper extends SQLiteOpenHelper { } + public ImageFile selectFile(String PkgNo, String TestEnum,String type ) + { + ImageFile imageFile = null; + String selQuery = "Select * From File Where PkgNo ='" + PkgNo+"' AND TestEnum = '" + TestEnum + "' AND Type = '" + type+"'"; + db = getWritableDatabase(); + Cursor cs = db.rawQuery(selQuery,null); + while (cs.moveToNext()){ + imageFile = 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)); + } + db.close(); + + return imageFile; + } + diff --git a/app/src/main/java/com/qtagger/Database/TestType.java b/app/src/main/java/com/qtagger/Database/TestType.java index f030e26..8624888 100644 --- a/app/src/main/java/com/qtagger/Database/TestType.java +++ b/app/src/main/java/com/qtagger/Database/TestType.java @@ -1,27 +1,33 @@ package com.qtagger.Database; -import com.qtagger.Data.CaptureFragmentEnum; -import com.qtagger.Data.TestEnum; - public enum TestType { - Top_Front, - Top_Back, - Top_Left, - Top_Right, + Top_Front("TOP - FRONT"), + Top_Back("TOP - BACK"), + Top_Left("TOP - LEFT"), + Top_Right("TOP - RIGHT"), - Middle_Front, - Middle_Back, - Middle_Left, - Middle_Right, + Middle_Front("MIDDLE - FRONT"), + Middle_Back("MIDDLE - BACK"), + Middle_Left("MIDDLE - LEFT"), + Middle_Right("MIDDLE - RIGHT"), - Bottom_Front, - Bottom_Back, - Bottom_Left, - Bottom_Right, + Bottom_Front("BOTTOM - FRONT"), + Bottom_Back("BOTTOM - BACK"), + Bottom_Left("BOTTOM - LEFT"), + Bottom_Right("BOTTOM - RIGHT"), - Filling, - Weight, - Nothing; + Filling("Filling"), + Weight("Weight"), + Nothing("Nothing"); + + private final String label; + + public String label() { + return label; + } + TestType(String label) { + this.label = label; + } public static TestType getByName(String Name){ diff --git a/app/src/main/res/drawable/listview_background.xml b/app/src/main/res/drawable/listview_background.xml index a90d38d..fa81813 100644 --- a/app/src/main/res/drawable/listview_background.xml +++ b/app/src/main/res/drawable/listview_background.xml @@ -5,7 +5,7 @@ + android:radius="10dp" /> diff --git a/app/src/main/res/layout/activity_picture_info.xml b/app/src/main/res/layout/activity_picture_info.xml new file mode 100644 index 0000000..0d9eb3a --- /dev/null +++ b/app/src/main/res/layout/activity_picture_info.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_capture.xml b/app/src/main/res/layout/fragment_capture.xml index cec7658..7bdd09a 100644 --- a/app/src/main/res/layout/fragment_capture.xml +++ b/app/src/main/res/layout/fragment_capture.xml @@ -3,6 +3,7 @@ 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" tools:context=".Activity.Test.CaptureFragment"> - - - - - - - - - - - - - - - - - - - - - - - - + android:text="TOP" + android:textSize="18sp" + android:layout_marginLeft="25dp" + android:layout_marginTop="20dp" + android:textColor="@color/defaultTitleColor"/> - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="MIDDLE" + android:textSize="18sp" + android:layout_marginLeft="25dp" + android:layout_marginTop="20dp" + android:textColor="@color/defaultTitleColor"/> - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="BOTTOM" + android:textSize="18sp" + android:layout_marginLeft="25dp" + android:layout_marginTop="20dp" + android:textColor="@color/defaultTitleColor"/> - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_weight2.xml b/app/src/main/res/layout/fragment_weight2.xml index fdc59e8..61d85f5 100644 --- a/app/src/main/res/layout/fragment_weight2.xml +++ b/app/src/main/res/layout/fragment_weight2.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="10dp" - android:background="@drawable/default_fragment_background" + android:background="@color/defaultBackgroundColor" tools:context=".Activity.Test.WeightFragment"> @@ -24,7 +23,8 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:paddingLeft="10dp" - android:text="무게 측정" + android:gravity="center" + android:text="전자저울 인디케이터를 촬영해주세요" android:textSize="20sp" android:textColor="@color/black"/> @@ -34,8 +34,10 @@ 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:background="@drawable/listview_background" + android:stateListAnimator="@null" + android:foreground="@drawable/img_cam02" + android:foregroundGravity="center" /> diff --git a/app/src/main/res/layout/layout_capture_test.xml b/app/src/main/res/layout/layout_capture_test.xml index 2e4a4c1..d3f58ab 100644 --- a/app/src/main/res/layout/layout_capture_test.xml +++ b/app/src/main/res/layout/layout_capture_test.xml @@ -1,116 +1,131 @@ - - android:background="#000000" - android:orientation="vertical"> - - + android:layout_height="match_parent" + android:background="@android:color/transparent"> - + + + + + + + + + + + android:layout_weight="0.7" + android:src="@color/black" /> - + + + + android:text="위치" /> + android:text="날짜" /> - - - - - - - - - - - - - - - - - - - + - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 12f0325..d288dcc 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -19,6 +19,7 @@ #0f8fc4 #b4b4b4 #408dcf + #333333 #EAEAEA #F3F3F3 #D6D6D6