diff --git a/.idea/misc.xml b/.idea/misc.xml index d646f39..4352e68 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,6 +35,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 063292c..ad28360 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,6 @@ - @@ -21,6 +20,7 @@ + + + + + - + diff --git a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java new file mode 100644 index 0000000..8f3658e --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java @@ -0,0 +1,77 @@ +package com.qtagger.Activity.Search; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.Activity.NavigationActivity; +import com.qtagger.Activity.SearchActivity; +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link BarcodeFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class BarcodeFragment extends Fragment { + + // 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 BarcodeFragment() { + // 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 BarcodeFragment. + */ + // TODO: Rename and change types and number of parameters + public static BarcodeFragment newInstance(String param1, String param2) { + BarcodeFragment fragment = new BarcodeFragment(); + 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_barcode, container, false); + + view.findViewById(R.id.button_Ok).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((SearchActivity) getActivity()).callTestActivity(); + } + }); + + // Inflate the layout for this fragment + return view; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java new file mode 100644 index 0000000..aa7da11 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Search/ListFragment.java @@ -0,0 +1,66 @@ +package com.qtagger.Activity.Search; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link ListFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class ListFragment extends Fragment { + + // 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 ListFragment() { + // 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 ListFragment. + */ + // TODO: Rename and change types and number of parameters + public static ListFragment newInstance(String param1, String param2) { + ListFragment fragment = new ListFragment(); + 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) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_list, container, false); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java new file mode 100644 index 0000000..7a73685 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java @@ -0,0 +1,74 @@ +package com.qtagger.Activity.Search; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.Activity.SearchActivity; +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link RfidFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class RfidFragment extends Fragment { + + // 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 RfidFragment() { + // 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 RfidFragment. + */ + // TODO: Rename and change types and number of parameters + public static RfidFragment newInstance(String param1, String param2) { + RfidFragment fragment = new RfidFragment(); + 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_rfid, container, false); + view.findViewById(R.id.button_Ok).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ((SearchActivity) getActivity()).callTestActivity(); + } + }); + // Inflate the layout for this fragment + return view; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/SearchActivity.java b/app/src/main/java/com/qtagger/Activity/SearchActivity.java new file mode 100644 index 0000000..5f89144 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/SearchActivity.java @@ -0,0 +1,72 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + +import android.content.Intent; +import android.os.Bundle; + +import com.google.android.material.tabs.TabLayout; +import com.qtagger.Activity.Search.BarcodeFragment; +import com.qtagger.Activity.Search.ListFragment; +import com.qtagger.Activity.Search.RfidFragment; +import com.qtagger.R; + +public class SearchActivity extends AppCompatActivity { + Fragment rfidFragment, barcodeFragment, listFragment; + boolean skipCheck; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_search); + Intent intent = getIntent(); + skipCheck = intent.getBooleanExtra("boolean",true); + + + rfidFragment = new RfidFragment(); + barcodeFragment = new BarcodeFragment(); + listFragment = new ListFragment(); + + getSupportFragmentManager().beginTransaction().add(R.id.frame,rfidFragment).commit(); + TabLayout tabs = (TabLayout) findViewById(R.id.tabs); + + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + int position = tab.getPosition(); + + Fragment selected = null; + if(position == 0){ + selected = rfidFragment; + }else if (position == 1){ + selected = barcodeFragment; + }else if (position == 2){ + selected = listFragment; + } + if(selected != null) { + getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit(); + } + } + + @Override + public void onTabUnselected(TabLayout.Tab tab) { + + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + + } + }); + } + + public void callTestActivity(){ + + if(skipCheck) { + Intent intent = new Intent(getApplicationContext(), TestActivity.class); + startActivity(intent); + } + finish(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/SettingActivity.java b/app/src/main/java/com/qtagger/Activity/SettingActivity.java new file mode 100644 index 0000000..0c6a4b8 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/SettingActivity.java @@ -0,0 +1,16 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.qtagger.R; + +public class SettingActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_setting); + } +} \ 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 new file mode 100644 index 0000000..96f21e0 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/CaptureFragment.java @@ -0,0 +1,88 @@ +package com.qtagger.Activity.Test; + +import android.content.Context; +import android.os.Build; +import android.os.Bundle; + +import androidx.annotation.RequiresApi; +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.Toast; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link CaptureFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class CaptureFragment extends Fragment { + + private Context context; + // 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 CaptureFragment() { + // 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 CaptureFragment. + */ + // TODO: Rename and change types and number of parameters + public static CaptureFragment newInstance(String param1, String param2) { + CaptureFragment fragment = new CaptureFragment(); + 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) { + context = container.getContext(); + View view = inflater.inflate(R.layout.fragment_capture, container, false); + + Button topFront = view.findViewById(R.id.button_top_front); + topFront.setOnClickListener(new View.OnClickListener() { + @RequiresApi(api = Build.VERSION_CODES.M) + @Override + public void onClick(View v) { + topFront.setBackgroundResource(R.drawable.capture_test_image2); + topFront.setForeground(null); + + + Toast.makeText(context, "이미지 교체", Toast.LENGTH_SHORT).show(); + } + }); + //button_top_front + // Inflate the layout for this fragment + return view; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java new file mode 100644 index 0000000..a531f7b --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/FillFragment.java @@ -0,0 +1,66 @@ +package com.qtagger.Activity.Test; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link FillFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class FillFragment extends Fragment { + + // 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 FillFragment() { + // 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 FillFragment. + */ + // TODO: Rename and change types and number of parameters + public static FillFragment newInstance(String param1, String param2) { + FillFragment fragment = new FillFragment(); + 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) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_fill, container, false); + } +} \ 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 new file mode 100644 index 0000000..18bd173 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/InfoFragment.java @@ -0,0 +1,66 @@ +package com.qtagger.Activity.Test; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link InfoFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class InfoFragment extends Fragment { + + // 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 InfoFragment() { + // 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 InfoFragment. + */ + // TODO: Rename and change types and number of parameters + public static InfoFragment newInstance(String param1, String param2) { + InfoFragment fragment = new InfoFragment(); + 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) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_info, container, false); + } +} \ 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 new file mode 100644 index 0000000..c98f2de --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/PhotographFragment.java @@ -0,0 +1,66 @@ +package com.qtagger.Activity.Test; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link PhotographFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class PhotographFragment extends Fragment { + + // 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 PhotographFragment() { + // 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 PhotographFragment. + */ + // TODO: Rename and change types and number of parameters + public static PhotographFragment newInstance(String param1, String param2) { + PhotographFragment fragment = new PhotographFragment(); + 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) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_photograph, container, false); + } +} \ 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 new file mode 100644 index 0000000..a8f974a --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/Test/WeightFragment.java @@ -0,0 +1,66 @@ +package com.qtagger.Activity.Test; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.qtagger.R; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link WeightFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class WeightFragment extends Fragment { + + // 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 WeightFragment() { + // 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 WeightFragment. + */ + // TODO: Rename and change types and number of parameters + public static WeightFragment newInstance(String param1, String param2) { + WeightFragment fragment = new WeightFragment(); + 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) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_weight2, container, false); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/TestActivity.java b/app/src/main/java/com/qtagger/Activity/TestActivity.java new file mode 100644 index 0000000..aac7529 --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/TestActivity.java @@ -0,0 +1,88 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; + +import com.google.android.material.tabs.TabLayout; +import com.qtagger.Activity.Test.CaptureFragment; +import com.qtagger.Activity.Test.FillFragment; +import com.qtagger.Activity.Test.InfoFragment; +import com.qtagger.Activity.Test.PhotographFragment; +import com.qtagger.Activity.Test.WeightFragment; +import com.qtagger.R; + +public class TestActivity extends AppCompatActivity { + Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_test2); + + surfaceFragment = new CaptureFragment(); + m1Fragment = new CaptureFragment(); + weightFragment = new WeightFragment(); + fillFragment = new FillFragment(); + pictureFragment = new PhotographFragment(); + infoFragment = new InfoFragment(); + + + findViewById(R.id.textViewRadiation).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplicationContext(), SearchActivity.class); + intent.putExtra("boolean",false); + startActivity(intent); + } + }); + + + //기본 탭 세팅 + getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit(); + + TabLayout tabs = (TabLayout) findViewById(R.id.tabs); + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + int position = tab.getPosition(); + Fragment selected = null; + 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 + public void onTabUnselected(TabLayout.Tab tab) { + + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + + } + }); + + } +} \ 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 new file mode 100644 index 0000000..9047b5b --- /dev/null +++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java @@ -0,0 +1,52 @@ +package com.qtagger.Activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; + +import com.qtagger.Data.TestEnum; +import com.qtagger.R; +import com.qtagger.util.DataManager; + +public class TestSelectActivity extends AppCompatActivity { + private DataManager dataManager = DataManager.getInstance(); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_test_select); + + + findViewById(R.id.button_발생지특성검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.발생지특성검사; + Intent intent = new Intent(getApplicationContext(), SearchActivity.class); + startActivity(intent); + } + }); + + findViewById(R.id.button_예비검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.예비검사; + } + }); + + findViewById(R.id.button_인수검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.인수검사; + } + }); + + findViewById(R.id.button_처분검사).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dataManager.testEnum = TestEnum.처분검사; + } + }); + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/CustomPalette/SquareButton.java b/app/src/main/java/com/qtagger/CustomPalette/SquareButton.java new file mode 100644 index 0000000..067628f --- /dev/null +++ b/app/src/main/java/com/qtagger/CustomPalette/SquareButton.java @@ -0,0 +1,31 @@ +package com.qtagger.CustomPalette; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.Button; + +public class SquareButton extends androidx.appcompat.widget.AppCompatButton { + public SquareButton(Context context) { + super(context); + } + + public SquareButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public SquareButton(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + + width = Math.min(width, height); + height = width; + + setMeasuredDimension(width, height); + } +} diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index 83c6682..2c71277 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -19,6 +19,7 @@ import android.widget.Toast; import com.qtagger.Activity.AccountAdd; import com.qtagger.Activity.AccountList; import com.qtagger.Activity.NavigationActivity; +import com.qtagger.Activity.TestSelectActivity; import com.qtagger.Database.Account; import com.qtagger.Database.AppDatabase; import com.qtagger.util.DataManager; @@ -44,7 +45,10 @@ public class MainActivity extends AppCompatActivity { findViewById(R.id.imageView).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), test.class); + + //Intent intent = new Intent(getApplicationContext(), test.class); + //startActivity(intent); + Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class); startActivity(intent); } }); diff --git a/app/src/main/java/com/qtagger/test.java b/app/src/main/java/com/qtagger/test.java index 43f6fec..485f3b7 100644 --- a/app/src/main/java/com/qtagger/test.java +++ b/app/src/main/java/com/qtagger/test.java @@ -1,23 +1,70 @@ package com.qtagger; +import static android.content.ContentValues.TAG; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import androidx.room.Room; +import android.graphics.Color; +import android.graphics.drawable.Drawable; +import android.os.AsyncTask; import android.os.Bundle; +import android.util.Log; +import android.util.TypedValue; import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.TextView; import com.qtagger.Database.Account; import com.qtagger.Database.AppDatabase; import com.qtagger.util.DataManager; -public class test extends AppCompatActivity { +import org.json.JSONObject; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.ConnectException; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; + +public class test extends AppCompatActivity { + ListView list1; private DataManager dataManager; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_test); dataManager = DataManager.getInstance(); + list1 = findViewById(R.id.list_test); + + + String testString[] = {"A","B","C"};//,"D","E","A","B","C","D","E"}; + + ArrayAdapter aa_items = new ArrayAdapter(this, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item,testString) + { + @NonNull + @Override + public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) { + View view = super.getView(position, convertView, parent); + view.setPadding(0,0,0,0); + ViewGroup.LayoutParams layoutParams = view.getLayoutParams(); + layoutParams.height = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,30,getResources().getDisplayMetrics()); + //view.setBackground(ContextCompat.getDrawable(getContext(),R.drawable.searchview_background)); + return view; + } + + } + ; + + list1.setAdapter(aa_items); AppDatabase db = Room.databaseBuilder(this,AppDatabase.class,"AccountDB").allowMainThreadQueries().build(); @@ -25,14 +72,80 @@ public class test extends AppCompatActivity { @Override public void onClick(View v) { + HttpGet(); + //http://1.245.98.188:9085/api/cmmn/getNotPassTypeCombo + //URL url = new URL("http://1.245.98.188:9097/api/cmmn/getNotPassTypeCombo"); + //url = new URL("https://api.upbit.com/v1/market/all"); + + +/* for (int i = 1;i<=10;i++) { String str = Integer.toString(i) ; db.accountDao().insert(new Account("User"+str,"김이박","개발팀")); - } + }*/ } }); } + + private void HttpGet(){ + + new AsyncTask(){ + + @Override + protected JSONObject doInBackground(Void... voids) { + + JSONObject result = null; + try{ + URL url = new URL("http://1.245.98.188:9097/api/cmmn/getNotPassTypeCombo"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + + connection.setRequestProperty("content-type", "application/json"); + connection.setRequestMethod("GET"); // 통신방식 + connection.setDoInput(true); // 읽기모드 지정 + connection.setUseCaches(false); // 캐싱데이터를 받을지 안받을지 + connection.setConnectTimeout(15000); // 통신 타임아웃 + + int responseCode = connection.getResponseCode(); + + if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED) { + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String inputLine; + StringBuffer response = new StringBuffer(); + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + + } else { + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getErrorStream())); + String inputLine; + StringBuffer response = new StringBuffer(); + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } + + } catch (ConnectException e) { + Log.e(TAG, "ConnectException"); + e.printStackTrace(); + + + } catch (Exception e){ + e.printStackTrace(); + } + + return result; + } + + @Override + protected void onPostExecute(JSONObject jsonObject) { + super.onPostExecute(jsonObject); + } + + }.execute(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/util/CommonHelper.java b/app/src/main/java/com/qtagger/util/CommonHelper.java new file mode 100644 index 0000000..ccb3a22 --- /dev/null +++ b/app/src/main/java/com/qtagger/util/CommonHelper.java @@ -0,0 +1,6 @@ +package com.qtagger.util; + +import android.util.TypedValue; + +public class CommonHelper { +} diff --git a/app/src/main/res/drawable-v24/accept_64.png b/app/src/main/res/drawable-v24/accept_64.png new file mode 100644 index 0000000..4c896b1 Binary files /dev/null and b/app/src/main/res/drawable-v24/accept_64.png differ diff --git a/app/src/main/res/drawable-v24/barcode_64.png b/app/src/main/res/drawable-v24/barcode_64.png new file mode 100644 index 0000000..a332c6e Binary files /dev/null and b/app/src/main/res/drawable-v24/barcode_64.png differ diff --git a/app/src/main/res/drawable-v24/capture_test_image.png b/app/src/main/res/drawable-v24/capture_test_image.png new file mode 100644 index 0000000..14d97bf Binary files /dev/null and b/app/src/main/res/drawable-v24/capture_test_image.png differ diff --git a/app/src/main/res/drawable-v24/capture_test_image2.png b/app/src/main/res/drawable-v24/capture_test_image2.png new file mode 100644 index 0000000..9963c72 Binary files /dev/null and b/app/src/main/res/drawable-v24/capture_test_image2.png differ diff --git a/app/src/main/res/drawable-v24/disposal_86.png b/app/src/main/res/drawable-v24/disposal_86.png new file mode 100644 index 0000000..8996cf5 Binary files /dev/null and b/app/src/main/res/drawable-v24/disposal_86.png differ diff --git a/app/src/main/res/drawable-v24/fill_test.png b/app/src/main/res/drawable-v24/fill_test.png new file mode 100644 index 0000000..f014068 Binary files /dev/null and b/app/src/main/res/drawable-v24/fill_test.png differ diff --git a/app/src/main/res/drawable-v24/originchrct_86.png b/app/src/main/res/drawable-v24/originchrct_86.png new file mode 100644 index 0000000..b4d1a7d Binary files /dev/null and b/app/src/main/res/drawable-v24/originchrct_86.png differ diff --git a/app/src/main/res/drawable-v24/picture_image_32.png b/app/src/main/res/drawable-v24/picture_image_32.png new file mode 100644 index 0000000..11da9a6 Binary files /dev/null and b/app/src/main/res/drawable-v24/picture_image_32.png differ diff --git a/app/src/main/res/drawable-v24/prepare_86.png b/app/src/main/res/drawable-v24/prepare_86.png new file mode 100644 index 0000000..e86d480 Binary files /dev/null and b/app/src/main/res/drawable-v24/prepare_86.png differ diff --git a/app/src/main/res/drawable-v24/rfid_icon_64.png b/app/src/main/res/drawable-v24/rfid_icon_64.png new file mode 100644 index 0000000..abe47b8 Binary files /dev/null and b/app/src/main/res/drawable-v24/rfid_icon_64.png differ diff --git a/app/src/main/res/drawable-v24/setting_32.png b/app/src/main/res/drawable-v24/setting_32.png new file mode 100644 index 0000000..f865efd Binary files /dev/null and b/app/src/main/res/drawable-v24/setting_32.png differ diff --git a/app/src/main/res/drawable/dropdown_16.png b/app/src/main/res/drawable/dropdown_16.png new file mode 100644 index 0000000..2aef93b Binary files /dev/null and b/app/src/main/res/drawable/dropdown_16.png differ diff --git a/app/src/main/res/drawable/image_squrebutton_background.xml b/app/src/main/res/drawable/image_squrebutton_background.xml new file mode 100644 index 0000000..2b6f09e --- /dev/null +++ b/app/src/main/res/drawable/image_squrebutton_background.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/searchview_background.xml b/app/src/main/res/drawable/searchview_background.xml new file mode 100644 index 0000000..3d71eb3 --- /dev/null +++ b/app/src/main/res/drawable/searchview_background.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml index 1bf5933..12bd55f 100644 --- a/app/src/main/res/drawable/spinner_background.xml +++ b/app/src/main/res/drawable/spinner_background.xml @@ -1,21 +1,29 @@ - + + + + + + + + + + + + + + + + - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/squrebutton_background.xml b/app/src/main/res/drawable/squrebutton_background.xml new file mode 100644 index 0000000..ad03580 --- /dev/null +++ b/app/src/main/res/drawable/squrebutton_background.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000..2fd9ee8 --- /dev/null +++ b/app/src/main/res/layout/activity_search.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml new file mode 100644 index 0000000..86cec51 --- /dev/null +++ b/app/src/main/res/layout/activity_setting.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml index 261de0f..85260f4 100644 --- a/app/src/main/res/layout/activity_test.xml +++ b/app/src/main/res/layout/activity_test.xml @@ -11,7 +11,45 @@ android:id="@+id/button3" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="314dp" android:text="Button" - tools:layout_editor_absoluteX="90dp" - tools:layout_editor_absoluteY="80dp" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml new file mode 100644 index 0000000..8cd3a51 --- /dev/null +++ b/app/src/main/res/layout/activity_test2.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml new file mode 100644 index 0000000..4be5ff9 --- /dev/null +++ b/app/src/main/res/layout/activity_test_select.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_barcode.xml b/app/src/main/res/layout/fragment_barcode.xml new file mode 100644 index 0000000..a05c4c2 --- /dev/null +++ b/app/src/main/res/layout/fragment_barcode.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..e752e28 --- /dev/null +++ b/app/src/main/res/layout/fragment_capture.xml @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_fill.xml b/app/src/main/res/layout/fragment_fill.xml new file mode 100644 index 0000000..aa7be16 --- /dev/null +++ b/app/src/main/res/layout/fragment_fill.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml new file mode 100644 index 0000000..738ec96 --- /dev/null +++ b/app/src/main/res/layout/fragment_info.xml @@ -0,0 +1,14 @@ + + + + + + + \ 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 new file mode 100644 index 0000000..5f19b9d --- /dev/null +++ b/app/src/main/res/layout/fragment_list.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_photograph.xml b/app/src/main/res/layout/fragment_photograph.xml new file mode 100644 index 0000000..86cc75c --- /dev/null +++ b/app/src/main/res/layout/fragment_photograph.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +