diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..6e5389e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0df732..05addba 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,9 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/MASKING/app/src/main/res/layout-land/activity_barcode.xml" value="0.176" />
+        <entry key="..\:/MASKING/app/src/main/res/layout-land/activity_barcode.xml" value="0.1" />
         <entry key="..\:/MASKING/app/src/main/res/layout/activity_beacon_mainactivity.xml" value="0.25364583333333335" />
+        <entry key="..\:/MASKING/app/src/main/res/layout/activity_camera.xml" value="0.1" />
         <entry key="..\:/MASKING/app/src/main/res/layout/activity_camerascan.xml" value="0.25364583333333335" />
         <entry key="..\:/MASKING/app/src/main/res/layout/activity_cart.xml" value="0.25364583333333335" />
         <entry key="..\:/MASKING/app/src/main/res/layout/activity_scan.xml" value="0.25364583333333335" />
@@ -25,6 +26,7 @@
         <entry key="app/src/main/res/layout-land/activity_innercamera.xml" value="0.125" />
         <entry key="app/src/main/res/layout-land/activity_splash.xml" value="0.22552083333333334" />
         <entry key="app/src/main/res/layout/activity_beacon_mainactivity.xml" value="0.15494791666666666" />
+        <entry key="app/src/main/res/layout/activity_camera.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_camerascan.xml" value="0.125" />
         <entry key="app/src/main/res/layout/activity_cart.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_home.xml" value="0.11302083333333333" />
diff --git a/app/build.gradle b/app/build.gradle
index a7904a6..3e08b98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
 }
-
 android {
     compileSdk 32
 
@@ -48,8 +47,8 @@ dependencies {
     implementation "com.airbnb.android:lottie:$lottieVersion"
 
     //바코드 사용
-    implementation('com.journeyapps:zxing-android-embedded:3.6.0') { transitive = false }
-    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+    implementation 'com.google.zxing:core:2.0'
 
     implementation 'com.google.android.gms:play-services-vision:18.0.0'
     implementation 'com.google.api-client:google-api-client-android:1.23.0' exclude module: 'okhttp'
@@ -76,4 +75,9 @@ dependencies {
     // If you want to additionally use the CameraX Extensions library
     implementation "androidx.camera:camera-extensions:${camerax_version}"
 
+    //카메라, 바코드
+    implementation 'com.dynamsoft:dynamsoftbarcodereader:9.2.10@aar'
+    // Remove the following line if you want to use Android Camera sdk or your own sdk to control camera.
+    implementation 'com.dynamsoft:dynamsoftcameraenhancer:2.3.2@aar'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43c1bcb..4b078f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -73,6 +73,9 @@
         <activity
             android:name=".scan.barcordscan.BarcodeScanActivity"
             android:configChanges="screenSize|orientation" />
+        <activity
+            android:name=".scan.barcordscan.BarcodeCameraActivity"
+            android:configChanges="screenSize|orientation" />
         <activity
             android:name=".scan.camerascan.CameraScanActivity"
             android:configChanges="screenSize|orientation" />
diff --git a/app/src/main/java/kr/co/whipping/scan/ScanActivity.java b/app/src/main/java/kr/co/whipping/scan/ScanActivity.java
index f5af3d1..dccfb6e 100644
--- a/app/src/main/java/kr/co/whipping/scan/ScanActivity.java
+++ b/app/src/main/java/kr/co/whipping/scan/ScanActivity.java
@@ -9,7 +9,6 @@
 import kr.co.whipping.R;
 import kr.co.whipping.databinding.ActivityScanBinding;
 import kr.co.whipping.scan.barcordscan.BarcodeScanActivity;
-import kr.co.whipping.scan.barcordscan.IntentIntegrator;
 import kr.co.whipping.scan.camerascan.CameraScanActivity;
 import kr.co.whipping.scan.camerascan.InnerCameraActivity;
 
diff --git a/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeCameraActivity.java b/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeCameraActivity.java
new file mode 100644
index 0000000..f81dacd
--- /dev/null
+++ b/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeCameraActivity.java
@@ -0,0 +1,189 @@
+package kr.co.whipping.scan.barcordscan;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Preview;
+import androidx.camera.core.UseCaseGroup;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.Size;
+import android.widget.TextView;
+
+import com.dynamsoft.dbr.BarcodeReader;
+import com.dynamsoft.dbr.BarcodeReaderException;
+import com.dynamsoft.dbr.DBRLicenseVerificationListener;
+import com.dynamsoft.dbr.EnumImagePixelFormat;
+import com.dynamsoft.dbr.ImageData;
+import com.dynamsoft.dbr.TextResult;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import kr.co.whipping.MainActivity;
+import kr.co.whipping.R;
+
+public class BarcodeCameraActivity extends AppCompatActivity {
+    private PreviewView previewView;
+    private ListenableFuture<ProcessCameraProvider> cameraProviderFuture;
+    private TextView resultView;
+    private ExecutorService exec;
+    private Camera camera;
+    private BarcodeReader dbr;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_camera);
+        previewView = findViewById(R.id.previewView);
+        resultView = findViewById(R.id.resultView);
+        initDBR();
+        exec = Executors.newSingleThreadExecutor();
+        cameraProviderFuture = ProcessCameraProvider.getInstance(this);
+        cameraProviderFuture.addListener(new Runnable() {
+            @RequiresApi(api = Build.VERSION_CODES.R)
+            @Override
+            public void run() {
+                try {
+                    ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
+                    bindPreviewAndImageAnalysis(cameraProvider);
+                } catch (ExecutionException | InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }, ContextCompat.getMainExecutor(this));
+
+
+    }
+
+
+    private class ImageData{
+        private int mWidth,mHeight,mStride;
+        byte[] mBytes;
+        ImageData(byte[] bytes ,int nWidth,int nHeight,int nStride){
+            mBytes = bytes;
+            mWidth = nWidth;
+            mHeight = nHeight;
+            mStride = nStride;
+        }
+    }
+
+
+
+    private void initDBR(){
+        BarcodeReader.initLicense("DLS2eyJoYW5kc2hha2VDb2RlIjoiMTAxMzE4NjE0LVRYbE5iMkpwYkdWUWNtOXFYMlJpY2ciLCJvcmdhbml6YXRpb25JRCI6IjEwMTMxODYxNCIsImNoZWNrQ29kZSI6LTE1MjE0ODM1MzN9", new DBRLicenseVerificationListener() {
+            @Override
+            public void DBRLicenseVerificationCallback(boolean isSuccessful, Exception e) {
+                if (!isSuccessful) {
+                    e.printStackTrace();
+                    Log.d("dd", "라이센스 확인");
+                }
+            }
+        });
+        try {
+            dbr = new BarcodeReader();
+        } catch (BarcodeReaderException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    @SuppressLint("UnsafeExperimentalUsageError")
+    private void bindPreviewAndImageAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
+
+        int orientation = getApplicationContext().getResources().getConfiguration().orientation;
+        Size resolution;
+        if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+            resolution = new Size(720, 1280);
+        }else{
+            resolution = new Size(1280, 720);
+        }
+
+        Preview.Builder previewBuilder = new Preview.Builder();
+        previewBuilder.setTargetResolution(resolution);
+        Preview preview = previewBuilder.build();
+
+        ImageAnalysis.Builder imageAnalysisBuilder=new ImageAnalysis.Builder();
+
+        //invert
+        //Camera2Interop.Extender ext = new Camera2Interop.Extender<>(imageAnalysisBuilder);
+        //ext.setCaptureRequestOption(CaptureRequest.CONTROL_EFFECT_MODE,CaptureRequest.CONTROL_EFFECT_MODE_NEGATIVE);
+
+        imageAnalysisBuilder.setTargetResolution(resolution)
+                .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+
+        ImageAnalysis imageAnalysis = imageAnalysisBuilder.build();
+
+        imageAnalysis.setAnalyzer(exec, new ImageAnalysis.Analyzer() {
+            @RequiresApi(api = Build.VERSION_CODES.O)
+            @Override
+            public void analyze(@NonNull ImageProxy image) {
+                int rotationDegrees =image.getImageInfo().getRotationDegrees();
+                TextResult[] results = null;
+                ByteBuffer buffer = image.getPlanes()[0].getBuffer();
+                int nRowStride = image.getPlanes()[0].getRowStride();
+                int nPixelStride = image.getPlanes()[0].getPixelStride();
+                int length= buffer.remaining();
+                byte[] bytes= new byte[length];
+                buffer.get(bytes);
+                BarcodeCameraActivity.ImageData imageData= new BarcodeCameraActivity.ImageData(bytes,image.getWidth(), image.getHeight(),nRowStride *nPixelStride);
+                try {
+                    results = dbr.decodeBuffer(imageData.mBytes,imageData.mWidth,imageData.mHeight, imageData.mStride, EnumImagePixelFormat.IPF_NV21);
+                } catch (BarcodeReaderException e) {
+                    e.printStackTrace();
+                }
+
+                StringBuilder sb = new StringBuilder();
+ //               sb.append("Found ").append(results.length).append(" barcode(s):\n");
+                for (int i = 0; i < results.length; i++) {
+                    sb.append(results[i].barcodeText);
+//                    sb.append("\n");
+                }
+                Log.d("DBR", sb.toString());
+                String barcode = sb.toString();
+                Log.d("DBR", barcode);
+                resultView.setText(sb.toString());
+
+
+                image.close();
+                if(barcode.length()>5) {
+                    Log.d("result","result found");
+                    Intent intent = new Intent(BarcodeCameraActivity.this, BarcodeScanActivity.class);
+                    intent.putExtra("barcodenum", barcode);
+                    Log.d("before activity start ","!!");
+                    setResult(RESULT_OK, intent);
+                    finish();
+                }
+//
+//                image.close();
+            }
+        });
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        UseCaseGroup useCaseGroup = new UseCaseGroup.Builder()
+                .addUseCase(preview)
+                .addUseCase(imageAnalysis)
+                .build();
+        camera=cameraProvider.bindToLifecycle((LifecycleOwner)this, cameraSelector, useCaseGroup);
+    }
+
+}
+
diff --git a/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeScanActivity.java b/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeScanActivity.java
index 4583965..a3c0f39 100644
--- a/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeScanActivity.java
+++ b/app/src/main/java/kr/co/whipping/scan/barcordscan/BarcodeScanActivity.java
@@ -1,73 +1,269 @@
 package kr.co.whipping.scan.barcordscan;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.Size;
+import android.util.TypedValue;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.JavascriptInterface;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Preview;
+import androidx.camera.core.UseCaseGroup;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
 
+import com.dynamsoft.dbr.BarcodeReader;
+import com.dynamsoft.dbr.BarcodeReaderException;
+import com.dynamsoft.dbr.DBRLicenseVerificationListener;
+import com.dynamsoft.dbr.EnumImagePixelFormat;
+import com.dynamsoft.dbr.TextResult;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.oned.EAN13Writer;
 import com.journeyapps.barcodescanner.BarcodeEncoder;
 
+import java.nio.ByteBuffer;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import kr.co.whipping.CartActivity;
 import kr.co.whipping.DBHelper;
 import kr.co.whipping.R;
 
 public class BarcodeScanActivity extends AppCompatActivity {
+    private static final String[] CAMERA_PERMISSION = new String[]{Manifest.permission.CAMERA};
+    private static final int CAMERA_REQUEST_CODE = 10;
 
-    int count = 1;
 
+    int count = 1;
+    String barcodenums;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_barcode);
 
-        new IntentIntegrator(this).initiateScan();
 
-//        IntentIntegrator integrator = new IntentIntegrator(this);
-//        integrator.initiateScan();
+        permission();
+
+    }
+
+    public void permission() {
+        if (hasCameraPermission()) {
+            Log.d("dd", "카메라실행전");
+            startScan();
+            return;
+
+        } else {
+            requestPermission();
+        }
+    }
+
+    private void startScan() {
+        Intent intent = new Intent(getApplicationContext(), BarcodeCameraActivity.class);
+        startActivityForResult(intent, 1);
+    }
+
+    private boolean hasCameraPermission() {
+        return ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.CAMERA
+        ) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(
+                this,
+                CAMERA_PERMISSION,
+                CAMERA_REQUEST_CODE
+        );
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                                           int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        switch (requestCode) {
+            case CAMERA_REQUEST_CODE:
+                if (grantResults.length > 0 &&
+                        grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startScan();
+                } else {
+                    Toast.makeText(this, "Please grant camera permission", Toast.LENGTH_SHORT).show();
+                }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        Button minus = (Button) findViewById(R.id.btn_count_down);
+        Button plus = (Button) findViewById(R.id.btn_count_up);
+        Button cancel = (Button) findViewById(R.id.btn_cancel);
+        Button add = (Button) findViewById(R.id.btn_add);
+        Button back = (Button) findViewById(R.id.btn_back_scan_barcode);
+        TextView prodCount = (TextView) findViewById(R.id.tv_item_count);
+        TextView category = (TextView) findViewById(R.id.tv_item_type_2);
+        TextView nameOfprod = (TextView) findViewById(R.id.tv_item_name_2);
+        TextView price = (TextView) findViewById(R.id.tv_item_price_2);
+        ImageView image_barcode_scan = (ImageView)findViewById(R.id.image_barcode_scan);
+        if (resultCode == RESULT_OK) {
+            Log.d("dd", "값 전달 확인");
+            barcodenums = intent.getStringExtra("barcodenum");
+            Log.d("dd", "값 setting 확인");
+            Log.d("dd", barcodenums);
+//            Toast.makeText(this, "RESULT_OK : " + barcodenums, Toast.LENGTH_SHORT).show();
+
 
-   }
+  //          image_barcode_scan.setImageResource(R.drawable.btn_minus);
 
-//    public void onClick(View V) {
-//        IntentIntegrator integrator = new IntentIntegrator(this);
-//        integrator.initiateScan();
-//    }
 
+            MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+            final int WIDTH = 400;
+            final int HEIGHT = 300;
 
-//    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-//        super.onActivityResult(requestCode, resultCode, intent);
-//        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-//        if (scanResult != null) {
+          try {
+                BitMatrix bitMatrix = multiFormatWriter.encode(barcodenums, BarcodeFormat.EAN_13, WIDTH, HEIGHT);
+                BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
+                Bitmap bitmap = barcodeEncoder.createBitmap(bitMatrix);
+              image_barcode_scan.setImageBitmap(bitmap);
+              image_barcode_scan.invalidate();
+                Log.d("dd", "바코드 이미지 생성 확인");
+                //InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                //manager.hideSoftInputFromWindow(barcodenums.getApplicationWindow, 0);
+            } catch (WriterException e) {
+                e.printStackTrace();
+                Log.d("dd", "바코드 이미지 생성 실패");
+            }
+
+
+            if (barcodenums.equals("4902430232159")) {
+                Log.d("dd", "샴푸 인식 확인");
+                category.setText("샴푸");
+                nameOfprod.setText("헤드&숄더 두피 토탈 솔루션 가려운 두피케어");
+                price.setText("15,900");
+
+
+//                MultiFormatWriter gen = new MultiFormatWriter();
+//                String data = barcodenums;
+//                try {
+//                    final int WIDTH = 400;
+//                    final int HEIGHT = 300;
+//                    BitMatrix bytemap = gen.encode(data, BarcodeFormat.EAN_13, WIDTH, HEIGHT);
+//                    Bitmap bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888);
+//                    for (int i = 0 ; i < WIDTH ; ++i)
+//                        for (int j = 0 ; j < HEIGHT ; ++j) {
+//                            bitmap.setPixel(i, j, bytemap.get(i,j) ? Color.BLACK : Color.WHITE);
+//                        }
+//                    ImageView img_barcode = (ImageView) findViewById(R.id.image_barcode);
+//                    img_barcode.setImageBitmap(bitmap);
+////                    img_barcode.invalidate();
+//                    System.out.println("done!");}
+//                catch (Exception e) {
+//                    e.printStackTrace();}
+
+
+
+            }
+
+
+            plus.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    count++;
+                    prodCount.setText((count + ""));
+                }
+            });
+            minus.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    count--;
+                    prodCount.setText((count + ""));
+                }
+            });
+
+            //취소
+            cancel.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onBackPressed();
+                }
+            });
+
+            back.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onBackPressed();
+                }
+            });
+
+            //담기
+//        add.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                DBHelper dbHelper = new DBHelper(BarcodeScanActivity.this);
+//
+//                dbHelper.addBasket("1", barcodenum, barcodetype, prodCount.getText().toString());
 //
-//            String barcodenum = scanResult.getContents();
-//            String barcodetype = scanResult.getFormatName();
-
-            Button minus = (Button) findViewById(R.id.btn_count_down);
-            Button plus = (Button) findViewById(R.id.btn_count_up);
-            Button cancel = (Button) findViewById(R.id.btn_cancel);
-            Button add = (Button) findViewById(R.id.btn_add);
-            Button back = (Button) findViewById(R.id.btn_back_scan_barcode);
-            TextView prodCount = (TextView) findViewById(R.id.tv_item_count);
-
-            TextView category = (TextView) findViewById(R.id.tv_item_type_2);
-            TextView nameOfprod = (TextView) findViewById(R.id.tv_item_name_2);
-            TextView price = (TextView) findViewById(R.id.tv_item_price_2);
-
-            //DB에서 상품 정보 가져오는 코드 추가
-            //임시로 코드로 가져옴
-//            if (barcodenum.equals("4902430232159")){
-//                category.setText("샴푸");
-//                nameOfprod.setText("헤드&숄더 두피 토탈 솔루션 가려운 두피케어");
-//                price.setText("15,900");
+
+            //이미지
+//                ImageView img_barcode = (ImageView) findViewById(R.id.image_barcode);
+
+//                MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+//                final int WIDTH = 180;
+//                final int HEIGHT = 90;
+//
+//                try {
+//                    BitMatrix bitMatrix = multiFormatWriter.encode(barcodenum, BarcodeFormat.valueOf(barcodetype), WIDTH, HEIGHT);
+//                    BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
+//                    Bitmap bitmap = barcodeEncoder.createBitmap(bitMatrix);
+//                    img_barcode.setImageBitmap(bitmap);
+//                } catch (Exception e) {
 //                }
+
+
+//
+//            TextView etBarcode = (TextView) findViewById(R.id.etBarcode);
+//            TextView etTyp = (TextView) findViewById(R.id.etTyp);
+//            etBarcode.setText(barcodenum);
+//            etTyp.setText(barcodetype);
+
+        }
+
+
+        //DB에서 상품 정보 가져오는 코드 추가
+        //임시로 코드로 가져옴
+
 //            else if (barcodenum.equals("8801046361252")){
 //                category.setText("트리트먼트");
 //                nameOfprod.setText("케라시스 데미지 클리닉 오리지널 컨디셔너 린스 1,000ml ");
@@ -104,71 +300,27 @@ protected void onCreate(Bundle savedInstanceState) {
 //            }
 
 
-
-
 //            TextView etBarcode = (TextView) findViewById(R.id.etBarcode);
 //            TextView etTyp = (TextView) findViewById(R.id.etTyp);
 //            etBarcode.setText(barcodenum);
 //            etTyp.setText(barcodetype);
 
-//            ImageView img_barcode;
-//            img_barcode = (ImageView)findViewById(R.id.image_barcode) ;
-//
-//            MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
-//            final int WIDTH = 180;
-//            final int HEIGHT = 90;
-//
-//            try {
-//                BitMatrix bitMatrix = multiFormatWriter.encode(barcodenum, BarcodeFormat.valueOf(barcodetype), WIDTH, HEIGHT);
-//                BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
-//                Bitmap bitmap = barcodeEncoder.createBitmap(bitMatrix);
-//                img_barcode.setImageBitmap(bitmap);
-//            } catch (Exception e) {
-//            }
-//
-
-            //플러스, 마이너스
-            plus.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View v){
-                    count++;
-                    prodCount.setText((count+""));
-                }
-            });
-            minus.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View v){
-                    count--;
-                    prodCount.setText((count+""));
-                }
-            });
+    }
+    class ScanHandler {
+        public void onScanned(String result) {
+        }
+    }
 
-            //취소
-            cancel.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View v){
-                    onBackPressed();
-                }
-            });
+    public class JSInterface {
+        private ScanHandler mHandler;
 
-          back.setOnClickListener(new View.OnClickListener() {
-              @Override
-              public void onClick(View v) {
-                  onBackPressed();
-              }
-          });
+        JSInterface(ScanHandler handler) {
+            mHandler = handler;
+        }
 
-            //담기
-//            add.setOnClickListener(new View.OnClickListener(){
-//                @Override
-//                public void onClick(View v){
-//                    DBHelper dbHelper = new DBHelper(BarcodeScanActivity.this);
-//
-//                    dbHelper.addBasket("1", barcodenum, barcodetype, prodCount.getText().toString());
-//
-//                    Intent intent = new Intent(getApplicationContext(), CartActivity.class);
-//                    startActivity(intent);
-//                }
-//            });
+        @JavascriptInterface
+        public void returnResult(String result) {
+            mHandler.onScanned(result);
         }
     }
+}
\ No newline at end of file
diff --git a/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentIntegrator.java b/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentIntegrator.java
index 71d849b..c547acf 100644
--- a/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentIntegrator.java
+++ b/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentIntegrator.java
@@ -1,512 +1,512 @@
-package kr.co.whipping.scan.barcordscan;
-
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.ActivityNotFoundException;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is a simple
- * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or learn the
- * project's source code.</p>
- *
- * <h1>Initiating a barcode scan</h1>
- *
- * <p>To integrate, create an instance of {@code IntentIntegrator} and call {@link #initiateScan()} and wait
- * for the result in your app.</p>
- *
- * <p>It does require that the Barcode Scanner (or work-alike) application is installed. The
- * {@link #initiateScan()} method will prompt the user to download the application, if needed.</p>
- *
- * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
- * the method {@link Activity onActivityResult(int, int, Intent)} and include a line of code like this:</p>
- *
- * <pre>{@code
- * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
- *   if (scanResult != null) {
- *     // handle scan result
- *   }
- *   // else continue with any other code you need in the method
- *   ...
- * }
- * }</pre>
- *
- * <p>This is where you will handle a scan result.</p>
- *
- * <p>Second, just call this in response to a user action somewhere to begin the scan process:</p>
- *
- * <pre>{@code
- * IntentIntegrator integrator = new IntentIntegrator(yourActivity);
- * integrator.initiateScan();
- * }</pre>
- *
- * <p>Note that {@link #initiateScan()} returns an {@link AlertDialog} which is non-null if the
- * user was prompted to download the application. This lets the calling app potentially manage the dialog.
- * In particular, ideally, the app dismisses the dialog if it's still active in its {@link Activity onPause()}
- * method.</p>
- *
- * <p>You can use {@link #setTitle(String)} to customize the title of this download prompt dialog (or, use
- * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt message, and
- * yes/no button labels can be changed.</p>
- *
- * <p>Finally, you can use {@link #addExtra(String, Object)} to add more parameters to the Intent used
- * to invoke the scanner. This can be used to set additional options not directly exposed by this
- * simplified API.</p>
- *
- * <p>By default, this will only allow applications that are known to respond to this intent correctly
- * do so. The apps that are allowed to response can be set with {@link #setTargetApplications(List)}.
- * For example, set to {@link #TARGET_BARCODE_SCANNER_ONLY} to only target the Barcode Scanner app itself.</p>
- *
- * <h1>Sharing text via barcode</h1>
- *
- * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link #shareText(CharSequence)}.</p>
- *
- * <p>Some code, particularly download integration, was contributed from the Anobiit application.</p>
- *
- * <h1>Enabling experimental barcode formats</h1>
- *
- * <p>Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such as
- * PDF417. Use {@link #initiateScan(Collection)} with
- * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such
- * formats.</p>
- *
- * @author Sean Owen
- * @author Fred Lin
- * @author Isaac Potoczny-Jones
- * @author Brad Drehmer
- * @author gcstang
- */
-public class IntentIntegrator {
-
-    public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
-    private static final String TAG = IntentIntegrator.class.getSimpleName();
-
-    public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
-    public static final String DEFAULT_MESSAGE =
-            "This application requires Barcode Scanner. Would you like to install it?";
-    public static final String DEFAULT_YES = "Yes";
-    public static final String DEFAULT_NO = "No";
-
-    private static final String BS_PACKAGE = "com.google.zxing.client.android";
-    private static final String BSPLUS_PACKAGE = "com.srowen.bs.android";
-
-    // supported barcode formats
-    public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
-    public static final Collection<String> ONE_D_CODE_TYPES =
-            list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
-                    "ITF", "RSS_14", "RSS_EXPANDED");
-    public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
-    public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
-
-    public static final Collection<String> ALL_CODE_TYPES = null;
-
-    public static final List<String> TARGET_BARCODE_SCANNER_ONLY = Collections.singletonList(BS_PACKAGE);
-    public static final List<String> TARGET_ALL_KNOWN = list(
-            BSPLUS_PACKAGE,             // Barcode Scanner+
-            BSPLUS_PACKAGE + ".simple", // Barcode Scanner+ Simple
-            BS_PACKAGE                  // Barcode Scanner
-            // What else supports this intent?
-    );
-
-    // Should be FLAG_ACTIVITY_NEW_DOCUMENT in API 21+.
-    // Defined once here because the current value is deprecated, so generates just one warning
-    @SuppressWarnings("deprecation")
-    private static final int FLAG_NEW_DOC = Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
-
-    private final Activity activity;
-    private final Fragment fragment;
-
-    private String title;
-    private String message;
-    private String buttonYes;
-    private String buttonNo;
-    private List<String> targetApplications;
-    private final Map<String,Object> moreExtras = new HashMap<>(3);
-
-    /**
-     * @param activity {@link Activity} invoking the integration
-     */
-    public IntentIntegrator(Activity activity) {
-        this.activity = activity;
-        this.fragment = null;
-        initializeConfiguration();
-    }
-
-    /**
-     * @param fragment {@link Fragment} invoking the integration.
-     *  {@link #startActivityForResult(Intent, int)} will be called on the {@link Fragment} instead
-     *  of an {@link Activity}
-     */
-    public IntentIntegrator(Fragment fragment) {
-        this.activity = fragment.getActivity();
-        this.fragment = fragment;
-        initializeConfiguration();
-    }
-
-    private void initializeConfiguration() {
-        title = DEFAULT_TITLE;
-        message = DEFAULT_MESSAGE;
-        buttonYes = DEFAULT_YES;
-        buttonNo = DEFAULT_NO;
-        targetApplications = TARGET_ALL_KNOWN;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setTitleByID(int titleID) {
-        title = activity.getString(titleID);
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setMessageByID(int messageID) {
-        message = activity.getString(messageID);
-    }
-
-    public String getButtonYes() {
-        return buttonYes;
-    }
-
-    public void setButtonYes(String buttonYes) {
-        this.buttonYes = buttonYes;
-    }
-
-    public void setButtonYesByID(int buttonYesID) {
-        buttonYes = activity.getString(buttonYesID);
-    }
-
-    public String getButtonNo() {
-        return buttonNo;
-    }
-
-    public void setButtonNo(String buttonNo) {
-        this.buttonNo = buttonNo;
-    }
-
-    public void setButtonNoByID(int buttonNoID) {
-        buttonNo = activity.getString(buttonNoID);
-    }
-
-    public Collection<String> getTargetApplications() {
-        return targetApplications;
-    }
-
-    public final void setTargetApplications(List<String> targetApplications) {
-        if (targetApplications.isEmpty()) {
-            throw new IllegalArgumentException("No target applications");
-        }
-        this.targetApplications = targetApplications;
-    }
-
-    public void setSingleTargetApplication(String targetApplication) {
-        this.targetApplications = Collections.singletonList(targetApplication);
-    }
-
-    public Map<String,?> getMoreExtras() {
-        return moreExtras;
-    }
-
-    public final void addExtra(String key, Object value) {
-        moreExtras.put(key, value);
-    }
-
-    /**
-     * Initiates a scan for all known barcode types with the default camera.
-     *
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise.
-     */
-    public final AlertDialog initiateScan() {
-        return initiateScan(ALL_CODE_TYPES, -1);
-    }
-
-    /**
-     * Initiates a scan for all known barcode types with the specified camera.
-     *
-     * @param cameraId camera ID of the camera to use. A negative value means "no preference".
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise.
-     */
-    public final AlertDialog initiateScan(int cameraId) {
-        return initiateScan(ALL_CODE_TYPES, cameraId);
-    }
-
-    /**
-     * Initiates a scan, using the default camera, only for a certain set of barcode types, given as strings corresponding
-     * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
-     * like {@link #PRODUCT_CODE_TYPES} for example.
-     *
-     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise.
-     */
-    public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
-        return initiateScan(desiredBarcodeFormats, -1);
-    }
-
-    /**
-     * Initiates a scan, using the specified camera, only for a certain set of barcode types, given as strings
-     * corresponding to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
-     * like {@link #PRODUCT_CODE_TYPES} for example.
-     *
-     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
-     * @param cameraId camera ID of the camera to use. A negative value means "no preference".
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise
-     */
-    public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats, int cameraId) {
-        Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
-        intentScan.addCategory(Intent.CATEGORY_DEFAULT);
-
-        // check which types of codes to scan for
-        if (desiredBarcodeFormats != null) {
-            // set the desired barcode types
-            StringBuilder joinedByComma = new StringBuilder();
-            for (String format : desiredBarcodeFormats) {
-                if (joinedByComma.length() > 0) {
-                    joinedByComma.append(',');
-                }
-                joinedByComma.append(format);
-            }
-            intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
-        }
-
-        // check requested camera ID
-        if (cameraId >= 0) {
-            intentScan.putExtra("SCAN_CAMERA_ID", cameraId);
-        }
-
-        String targetAppPackage = findTargetAppPackage(intentScan);
-        if (targetAppPackage == null) {
-            return showDownloadDialog();
-        }
-        intentScan.setPackage(targetAppPackage);
-        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intentScan.addFlags(FLAG_NEW_DOC);
-        attachMoreExtras(intentScan);
-        startActivityForResult(intentScan, REQUEST_CODE);
-        return null;
-    }
-
-    /**
-     * Start an activity. This method is defined to allow different methods of activity starting for
-     * newer versions of Android and for compatibility library.
-     *
-     * @param intent Intent to start.
-     * @param code Request code for the activity
-     * @see Activity#startActivityForResult(Intent, int)
-     * @see Fragment#startActivityForResult(Intent, int)
-     */
-    protected void startActivityForResult(Intent intent, int code) {
-        if (fragment == null) {
-            activity.startActivityForResult(intent, code);
-        } else {
-            fragment.startActivityForResult(intent, code);
-        }
-    }
-
-    private String findTargetAppPackage(Intent intent) {
-        PackageManager pm = activity.getPackageManager();
-        List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-        if (availableApps != null) {
-            for (String targetApp : targetApplications) {
-                if (contains(availableApps, targetApp)) {
-                    return targetApp;
-                }
-            }
-        }
-        return null;
-    }
-
-    private static boolean contains(Iterable<ResolveInfo> availableApps, String targetApp) {
-        for (ResolveInfo availableApp : availableApps) {
-            String packageName = availableApp.activityInfo.packageName;
-            if (targetApp.equals(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private AlertDialog showDownloadDialog() {
-        AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
-        downloadDialog.setTitle(title);
-        downloadDialog.setMessage(message);
-        downloadDialog.setPositiveButton(buttonYes, new DialogInterface.OnClickListener() {
-
-            public void onClick(DialogInterface dialogInterface, int i) {
-                String packageName;
-                if (targetApplications.contains(BS_PACKAGE)) {
-                    // Prefer to suggest download of BS if it's anywhere in the list
-                    packageName = BS_PACKAGE;
-                } else {
-                    // Otherwise, first option:
-                    packageName = targetApplications.get(0);
-                }
-                Uri uri = Uri.parse("market://details?id=" + packageName);
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                try {
-                    if (fragment == null) {
-                        activity.startActivity(intent);
-                    } else {
-                        fragment.startActivity(intent);
-                    }
-                } catch (ActivityNotFoundException anfe) {
-                    // Hmm, market is not installed
-                    Log.w(TAG, "Google Play is not installed; cannot install " + packageName);
-                }
-            }
-        });
-        downloadDialog.setNegativeButton(buttonNo, null);
-        downloadDialog.setCancelable(true);
-        return downloadDialog.show();
-    }
-
-
-    /**
-     * <p>Call this from your {@link Activity}'s
-     * {@link Activity onActivityResult(int, int, Intent)} method.</p>
-     *
-     * @param requestCode request code from {@code onActivityResult()}
-     * @param resultCode result code from {@code onActivityResult()}
-     * @param intent {@link Intent} from {@code onActivityResult()}
-     * @return null if the event handled here was not related to this class, or
-     *  else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
-     *  the fields will be null.
-     */
-    public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (requestCode == REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                String contents = intent.getStringExtra("SCAN_RESULT");
-                String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
-                byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
-                int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
-                Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
-                String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
-                return new IntentResult(contents,
-                        formatName,
-                        rawBytes,
-                        orientation,
-                        errorCorrectionLevel);
-            }
-            return new IntentResult();
-        }
-        return null;
-    }
-
-
-    /**
-     * Defaults to type "TEXT_TYPE".
-     *
-     * @param text the text string to encode as a barcode
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise
-     * @see #shareText(CharSequence, CharSequence)
-     */
-    public final AlertDialog shareText(CharSequence text) {
-        return shareText(text, "TEXT_TYPE");
-    }
-
-    /**
-     * Shares the given text by encoding it as a barcode, such that another user can
-     * scan the text off the screen of the device.
-     *
-     * @param text the text string to encode as a barcode
-     * @param type type of data to encode. See {@code com.google.zxing.client.android.Contents.Type} constants.
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     *   if a prompt was needed, or null otherwise
-     */
-    public final AlertDialog shareText(CharSequence text, CharSequence type) {
-        Intent intent = new Intent();
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.setAction(BS_PACKAGE + ".ENCODE");
-        intent.putExtra("ENCODE_TYPE", type);
-        intent.putExtra("ENCODE_DATA", text);
-        String targetAppPackage = findTargetAppPackage(intent);
-        if (targetAppPackage == null) {
-            return showDownloadDialog();
-        }
-        intent.setPackage(targetAppPackage);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(FLAG_NEW_DOC);
-        attachMoreExtras(intent);
-        if (fragment == null) {
-            activity.startActivity(intent);
-        } else {
-            fragment.startActivity(intent);
-        }
-        return null;
-    }
-
-    private static List<String> list(String... values) {
-        return Collections.unmodifiableList(Arrays.asList(values));
-    }
-
-    private void attachMoreExtras(Intent intent) {
-        for (Map.Entry<String,Object> entry : moreExtras.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            // Kind of hacky
-            if (value instanceof Integer) {
-                intent.putExtra(key, (Integer) value);
-            } else if (value instanceof Long) {
-                intent.putExtra(key, (Long) value);
-            } else if (value instanceof Boolean) {
-                intent.putExtra(key, (Boolean) value);
-            } else if (value instanceof Double) {
-                intent.putExtra(key, (Double) value);
-            } else if (value instanceof Float) {
-                intent.putExtra(key, (Float) value);
-            } else if (value instanceof Bundle) {
-                intent.putExtra(key, (Bundle) value);
-            } else {
-                intent.putExtra(key, value.toString());
-            }
-        }
-    }
-
-}
\ No newline at end of file
+//package kr.co.whipping.scan.barcordscan;
+//
+///*
+// * Copyright 2009 ZXing authors
+// *
+// * Licensed under the Apache License, Version 2.0 (the "License");
+// * you may not use this file except in compliance with the License.
+// * You may obtain a copy of the License at
+// *
+// *      http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+//
+//
+//import android.app.Activity;
+//import android.app.AlertDialog;
+//import android.app.Fragment;
+//import android.content.ActivityNotFoundException;
+//import android.content.DialogInterface;
+//import android.content.Intent;
+//import android.content.pm.PackageManager;
+//import android.content.pm.ResolveInfo;
+//import android.net.Uri;
+//import android.os.Bundle;
+//import android.util.Log;
+//
+//import java.util.Arrays;
+//import java.util.Collection;
+//import java.util.Collections;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is a simple
+// * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or learn the
+// * project's source code.</p>
+// *
+// * <h1>Initiating a barcode scan</h1>
+// *
+// * <p>To integrate, create an instance of {@code IntentIntegrator} and call {@link #initiateScan()} and wait
+// * for the result in your app.</p>
+// *
+// * <p>It does require that the Barcode Scanner (or work-alike) application is installed. The
+// * {@link #initiateScan()} method will prompt the user to download the application, if needed.</p>
+// *
+// * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
+// * the method {@link Activity onActivityResult(int, int, Intent)} and include a line of code like this:</p>
+// *
+// * <pre>{@code
+// * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+// *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+// *   if (scanResult != null) {
+// *     // handle scan result
+// *   }
+// *   // else continue with any other code you need in the method
+// *   ...
+// * }
+// * }</pre>
+// *
+// * <p>This is where you will handle a scan result.</p>
+// *
+// * <p>Second, just call this in response to a user action somewhere to begin the scan process:</p>
+// *
+// * <pre>{@code
+// * IntentIntegrator integrator = new IntentIntegrator(yourActivity);
+// * integrator.initiateScan();
+// * }</pre>
+// *
+// * <p>Note that {@link #initiateScan()} returns an {@link AlertDialog} which is non-null if the
+// * user was prompted to download the application. This lets the calling app potentially manage the dialog.
+// * In particular, ideally, the app dismisses the dialog if it's still active in its {@link Activity onPause()}
+// * method.</p>
+// *
+// * <p>You can use {@link #setTitle(String)} to customize the title of this download prompt dialog (or, use
+// * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt message, and
+// * yes/no button labels can be changed.</p>
+// *
+// * <p>Finally, you can use {@link #addExtra(String, Object)} to add more parameters to the Intent used
+// * to invoke the scanner. This can be used to set additional options not directly exposed by this
+// * simplified API.</p>
+// *
+// * <p>By default, this will only allow applications that are known to respond to this intent correctly
+// * do so. The apps that are allowed to response can be set with {@link #setTargetApplications(List)}.
+// * For example, set to {@link #TARGET_BARCODE_SCANNER_ONLY} to only target the Barcode Scanner app itself.</p>
+// *
+// * <h1>Sharing text via barcode</h1>
+// *
+// * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link #shareText(CharSequence)}.</p>
+// *
+// * <p>Some code, particularly download integration, was contributed from the Anobiit application.</p>
+// *
+// * <h1>Enabling experimental barcode formats</h1>
+// *
+// * <p>Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such as
+// * PDF417. Use {@link #initiateScan(Collection)} with
+// * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such
+// * formats.</p>
+// *
+// * @author Sean Owen
+// * @author Fred Lin
+// * @author Isaac Potoczny-Jones
+// * @author Brad Drehmer
+// * @author gcstang
+// */
+//public class IntentIntegrator {
+//
+//    public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
+//    private static final String TAG = IntentIntegrator.class.getSimpleName();
+//
+//    public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
+//    public static final String DEFAULT_MESSAGE =
+//            "This application requires Barcode Scanner. Would you like to install it?";
+//    public static final String DEFAULT_YES = "Yes";
+//    public static final String DEFAULT_NO = "No";
+//
+//    private static final String BS_PACKAGE = "com.google.zxing.client.android";
+//    private static final String BSPLUS_PACKAGE = "com.srowen.bs.android";
+//
+//    // supported barcode formats
+//    public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
+//    public static final Collection<String> ONE_D_CODE_TYPES =
+//            list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
+//                    "ITF", "RSS_14", "RSS_EXPANDED");
+//    public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
+//    public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
+//
+//    public static final Collection<String> ALL_CODE_TYPES = null;
+//
+//    public static final List<String> TARGET_BARCODE_SCANNER_ONLY = Collections.singletonList(BS_PACKAGE);
+//    public static final List<String> TARGET_ALL_KNOWN = list(
+//            BSPLUS_PACKAGE,             // Barcode Scanner+
+//            BSPLUS_PACKAGE + ".simple", // Barcode Scanner+ Simple
+//            BS_PACKAGE                  // Barcode Scanner
+//            // What else supports this intent?
+//    );
+//
+//    // Should be FLAG_ACTIVITY_NEW_DOCUMENT in API 21+.
+//    // Defined once here because the current value is deprecated, so generates just one warning
+//    @SuppressWarnings("deprecation")
+//    private static final int FLAG_NEW_DOC = Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
+//
+//    private final Activity activity;
+//    private final Fragment fragment;
+//
+//    private String title;
+//    private String message;
+//    private String buttonYes;
+//    private String buttonNo;
+//    private List<String> targetApplications;
+//    private final Map<String,Object> moreExtras = new HashMap<>(3);
+//
+//    /**
+//     * @param activity {@link Activity} invoking the integration
+//     */
+//    public IntentIntegrator(Activity activity) {
+//        this.activity = activity;
+//        this.fragment = null;
+//        initializeConfiguration();
+//    }
+//
+//    /**
+//     * @param fragment {@link Fragment} invoking the integration.
+//     *  {@link #startActivityForResult(Intent, int)} will be called on the {@link Fragment} instead
+//     *  of an {@link Activity}
+//     */
+//    public IntentIntegrator(Fragment fragment) {
+//        this.activity = fragment.getActivity();
+//        this.fragment = fragment;
+//        initializeConfiguration();
+//    }
+//
+//    private void initializeConfiguration() {
+//        title = DEFAULT_TITLE;
+//        message = DEFAULT_MESSAGE;
+//        buttonYes = DEFAULT_YES;
+//        buttonNo = DEFAULT_NO;
+//        targetApplications = TARGET_ALL_KNOWN;
+//    }
+//
+//    public String getTitle() {
+//        return title;
+//    }
+//
+//    public void setTitle(String title) {
+//        this.title = title;
+//    }
+//
+//    public void setTitleByID(int titleID) {
+//        title = activity.getString(titleID);
+//    }
+//
+//    public String getMessage() {
+//        return message;
+//    }
+//
+//    public void setMessage(String message) {
+//        this.message = message;
+//    }
+//
+//    public void setMessageByID(int messageID) {
+//        message = activity.getString(messageID);
+//    }
+//
+//    public String getButtonYes() {
+//        return buttonYes;
+//    }
+//
+//    public void setButtonYes(String buttonYes) {
+//        this.buttonYes = buttonYes;
+//    }
+//
+//    public void setButtonYesByID(int buttonYesID) {
+//        buttonYes = activity.getString(buttonYesID);
+//    }
+//
+//    public String getButtonNo() {
+//        return buttonNo;
+//    }
+//
+//    public void setButtonNo(String buttonNo) {
+//        this.buttonNo = buttonNo;
+//    }
+//
+//    public void setButtonNoByID(int buttonNoID) {
+//        buttonNo = activity.getString(buttonNoID);
+//    }
+//
+//    public Collection<String> getTargetApplications() {
+//        return targetApplications;
+//    }
+//
+//    public final void setTargetApplications(List<String> targetApplications) {
+//        if (targetApplications.isEmpty()) {
+//            throw new IllegalArgumentException("No target applications");
+//        }
+//        this.targetApplications = targetApplications;
+//    }
+//
+//    public void setSingleTargetApplication(String targetApplication) {
+//        this.targetApplications = Collections.singletonList(targetApplication);
+//    }
+//
+//    public Map<String,?> getMoreExtras() {
+//        return moreExtras;
+//    }
+//
+//    public final void addExtra(String key, Object value) {
+//        moreExtras.put(key, value);
+//    }
+//
+//    /**
+//     * Initiates a scan for all known barcode types with the default camera.
+//     *
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise.
+//     */
+//    public final AlertDialog initiateScan() {
+//        return initiateScan(ALL_CODE_TYPES, -1);
+//    }
+//
+//    /**
+//     * Initiates a scan for all known barcode types with the specified camera.
+//     *
+//     * @param cameraId camera ID of the camera to use. A negative value means "no preference".
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise.
+//     */
+//    public final AlertDialog initiateScan(int cameraId) {
+//        return initiateScan(ALL_CODE_TYPES, cameraId);
+//    }
+//
+//    /**
+//     * Initiates a scan, using the default camera, only for a certain set of barcode types, given as strings corresponding
+//     * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
+//     * like {@link #PRODUCT_CODE_TYPES} for example.
+//     *
+//     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise.
+//     */
+//    public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
+//        return initiateScan(desiredBarcodeFormats, -1);
+//    }
+//
+//    /**
+//     * Initiates a scan, using the specified camera, only for a certain set of barcode types, given as strings
+//     * corresponding to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
+//     * like {@link #PRODUCT_CODE_TYPES} for example.
+//     *
+//     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
+//     * @param cameraId camera ID of the camera to use. A negative value means "no preference".
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise
+//     */
+//    public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats, int cameraId) {
+//        Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
+//        intentScan.addCategory(Intent.CATEGORY_DEFAULT);
+//
+//        // check which types of codes to scan for
+//        if (desiredBarcodeFormats != null) {
+//            // set the desired barcode types
+//            StringBuilder joinedByComma = new StringBuilder();
+//            for (String format : desiredBarcodeFormats) {
+//                if (joinedByComma.length() > 0) {
+//                    joinedByComma.append(',');
+//                }
+//                joinedByComma.append(format);
+//            }
+//            intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
+//        }
+//
+//        // check requested camera ID
+//        if (cameraId >= 0) {
+//            intentScan.putExtra("SCAN_CAMERA_ID", cameraId);
+//        }
+//
+//        String targetAppPackage = findTargetAppPackage(intentScan);
+//        if (targetAppPackage == null) {
+//            return showDownloadDialog();
+//        }
+//        intentScan.setPackage(targetAppPackage);
+//        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//        intentScan.addFlags(FLAG_NEW_DOC);
+//        attachMoreExtras(intentScan);
+//        startActivityForResult(intentScan, REQUEST_CODE);
+//        return null;
+//    }
+//
+//    /**
+//     * Start an activity. This method is defined to allow different methods of activity starting for
+//     * newer versions of Android and for compatibility library.
+//     *
+//     * @param intent Intent to start.
+//     * @param code Request code for the activity
+//     * @see Activity#startActivityForResult(Intent, int)
+//     * @see Fragment#startActivityForResult(Intent, int)
+//     */
+//    protected void startActivityForResult(Intent intent, int code) {
+//        if (fragment == null) {
+//            activity.startActivityForResult(intent, code);
+//        } else {
+//            fragment.startActivityForResult(intent, code);
+//        }
+//    }
+//
+//    private String findTargetAppPackage(Intent intent) {
+//        PackageManager pm = activity.getPackageManager();
+//        List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+//        if (availableApps != null) {
+//            for (String targetApp : targetApplications) {
+//                if (contains(availableApps, targetApp)) {
+//                    return targetApp;
+//                }
+//            }
+//        }
+//        return null;
+//    }
+//
+//    private static boolean contains(Iterable<ResolveInfo> availableApps, String targetApp) {
+//        for (ResolveInfo availableApp : availableApps) {
+//            String packageName = availableApp.activityInfo.packageName;
+//            if (targetApp.equals(packageName)) {
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
+//
+//    private AlertDialog showDownloadDialog() {
+//        AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
+//        downloadDialog.setTitle(title);
+//        downloadDialog.setMessage(message);
+//        downloadDialog.setPositiveButton(buttonYes, new DialogInterface.OnClickListener() {
+//
+//            public void onClick(DialogInterface dialogInterface, int i) {
+//                String packageName;
+//                if (targetApplications.contains(BS_PACKAGE)) {
+//                    // Prefer to suggest download of BS if it's anywhere in the list
+//                    packageName = BS_PACKAGE;
+//                } else {
+//                    // Otherwise, first option:
+//                    packageName = targetApplications.get(0);
+//                }
+//                Uri uri = Uri.parse("market://details?id=" + packageName);
+//                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+//                try {
+//                    if (fragment == null) {
+//                        activity.startActivity(intent);
+//                    } else {
+//                        fragment.startActivity(intent);
+//                    }
+//                } catch (ActivityNotFoundException anfe) {
+//                    // Hmm, market is not installed
+//                    Log.w(TAG, "Google Play is not installed; cannot install " + packageName);
+//                }
+//            }
+//        });
+//        downloadDialog.setNegativeButton(buttonNo, null);
+//        downloadDialog.setCancelable(true);
+//        return downloadDialog.show();
+//    }
+//
+//
+//    /**
+//     * <p>Call this from your {@link Activity}'s
+//     * {@link Activity onActivityResult(int, int, Intent)} method.</p>
+//     *
+//     * @param requestCode request code from {@code onActivityResult()}
+//     * @param resultCode result code from {@code onActivityResult()}
+//     * @param intent {@link Intent} from {@code onActivityResult()}
+//     * @return null if the event handled here was not related to this class, or
+//     *  else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
+//     *  the fields will be null.
+//     */
+//    public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
+//        if (requestCode == REQUEST_CODE) {
+//            if (resultCode == Activity.RESULT_OK) {
+//                String contents = intent.getStringExtra("SCAN_RESULT");
+//                String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
+//                byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
+//                int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
+//                Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
+//                String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
+//                return new IntentResult(contents,
+//                        formatName,
+//                        rawBytes,
+//                        orientation,
+//                        errorCorrectionLevel);
+//            }
+//            return new IntentResult();
+//        }
+//        return null;
+//    }
+//
+//
+//    /**
+//     * Defaults to type "TEXT_TYPE".
+//     *
+//     * @param text the text string to encode as a barcode
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise
+//     * @see #shareText(CharSequence, CharSequence)
+//     */
+//    public final AlertDialog shareText(CharSequence text) {
+//        return shareText(text, "TEXT_TYPE");
+//    }
+//
+//    /**
+//     * Shares the given text by encoding it as a barcode, such that another user can
+//     * scan the text off the screen of the device.
+//     *
+//     * @param text the text string to encode as a barcode
+//     * @param type type of data to encode. See {@code com.google.zxing.client.android.Contents.Type} constants.
+//     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+//     *   if a prompt was needed, or null otherwise
+//     */
+//    public final AlertDialog shareText(CharSequence text, CharSequence type) {
+//        Intent intent = new Intent();
+//        intent.addCategory(Intent.CATEGORY_DEFAULT);
+//        intent.setAction(BS_PACKAGE + ".ENCODE");
+//        intent.putExtra("ENCODE_TYPE", type);
+//        intent.putExtra("ENCODE_DATA", text);
+//        String targetAppPackage = findTargetAppPackage(intent);
+//        if (targetAppPackage == null) {
+//            return showDownloadDialog();
+//        }
+//        intent.setPackage(targetAppPackage);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+//        intent.addFlags(FLAG_NEW_DOC);
+//        attachMoreExtras(intent);
+//        if (fragment == null) {
+//            activity.startActivity(intent);
+//        } else {
+//            fragment.startActivity(intent);
+//        }
+//        return null;
+//    }
+//
+//    private static List<String> list(String... values) {
+//        return Collections.unmodifiableList(Arrays.asList(values));
+//    }
+//
+//    private void attachMoreExtras(Intent intent) {
+//        for (Map.Entry<String,Object> entry : moreExtras.entrySet()) {
+//            String key = entry.getKey();
+//            Object value = entry.getValue();
+//            // Kind of hacky
+//            if (value instanceof Integer) {
+//                intent.putExtra(key, (Integer) value);
+//            } else if (value instanceof Long) {
+//                intent.putExtra(key, (Long) value);
+//            } else if (value instanceof Boolean) {
+//                intent.putExtra(key, (Boolean) value);
+//            } else if (value instanceof Double) {
+//                intent.putExtra(key, (Double) value);
+//            } else if (value instanceof Float) {
+//                intent.putExtra(key, (Float) value);
+//            } else if (value instanceof Bundle) {
+//                intent.putExtra(key, (Bundle) value);
+//            } else {
+//                intent.putExtra(key, value.toString());
+//            }
+//        }
+//    }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentResult.java b/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentResult.java
index e2f9380..afc89f6 100644
--- a/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentResult.java
+++ b/app/src/main/java/kr/co/whipping/scan/barcordscan/IntentResult.java
@@ -1,92 +1,92 @@
-package kr.co.whipping.scan.barcordscan;
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
- *
- * @author Sean Owen
- */
-
-public final class IntentResult {
-
-    private final String contents;
-    private final String formatName;
-    private final byte[] rawBytes;
-    private final Integer orientation;
-    private final String errorCorrectionLevel;
-
-    IntentResult() {
-        this(null, null, null, null, null);
-    }
-
-    IntentResult(String contents,
-                 String formatName,
-                 byte[] rawBytes,
-                 Integer orientation,
-                 String errorCorrectionLevel) {
-        this.contents = contents;
-        this.formatName = formatName;
-        this.rawBytes = rawBytes;
-        this.orientation = orientation;
-        this.errorCorrectionLevel = errorCorrectionLevel;
-    }
-
-    /**
-     * @return raw content of barcode
-     */
-    public String getContents() {
-        return contents;
-    }
-
-    /**
-     * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format names.
-     */
-    public String getFormatName() {
-        return formatName;
-    }
-
-    /**
-     * @return raw bytes of the barcode content, if applicable, or null otherwise
-     */
-    public byte[] getRawBytes() {
-        return rawBytes;
-    }
-
-    /**
-     * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
-     */
-    public Integer getOrientation() {
-        return orientation;
-    }
-
-    /**
-     * @return name of the error correction level used in the barcode, if applicable
-     */
-    public String getErrorCorrectionLevel() {
-        return errorCorrectionLevel;
-    }
-
-    @Override
-    public String toString() {
-        int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
-        return "Format: " + formatName + '\n' +
-                "Contents: " + contents + '\n' +
-                "Raw bytes: (" + rawBytesLength + " bytes)\n" +
-                "Orientation: " + orientation + '\n' +
-                "EC level: " + errorCorrectionLevel + '\n';
-    }
-
-}
\ No newline at end of file
+//package kr.co.whipping.scan.barcordscan;
+///*
+// * Copyright 2009 ZXing authors
+// *
+// * Licensed under the Apache License, Version 2.0 (the "License");
+// * you may not use this file except in compliance with the License.
+// * You may obtain a copy of the License at
+// *
+// *      http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// */
+///**
+// * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
+// *
+// * @author Sean Owen
+// */
+//
+//public final class IntentResult {
+//
+//    private final String contents;
+//    private final String formatName;
+//    private final byte[] rawBytes;
+//    private final Integer orientation;
+//    private final String errorCorrectionLevel;
+//
+//    IntentResult() {
+//        this(null, null, null, null, null);
+//    }
+//
+//    IntentResult(String contents,
+//                 String formatName,
+//                 byte[] rawBytes,
+//                 Integer orientation,
+//                 String errorCorrectionLevel) {
+//        this.contents = contents;
+//        this.formatName = formatName;
+//        this.rawBytes = rawBytes;
+//        this.orientation = orientation;
+//        this.errorCorrectionLevel = errorCorrectionLevel;
+//    }
+//
+//    /**
+//     * @return raw content of barcode
+//     */
+//    public String getContents() {
+//        return contents;
+//    }
+//
+//    /**
+//     * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format names.
+//     */
+//    public String getFormatName() {
+//        return formatName;
+//    }
+//
+//    /**
+//     * @return raw bytes of the barcode content, if applicable, or null otherwise
+//     */
+//    public byte[] getRawBytes() {
+//        return rawBytes;
+//    }
+//
+//    /**
+//     * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
+//     */
+//    public Integer getOrientation() {
+//        return orientation;
+//    }
+//
+//    /**
+//     * @return name of the error correction level used in the barcode, if applicable
+//     */
+//    public String getErrorCorrectionLevel() {
+//        return errorCorrectionLevel;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
+//        return "Format: " + formatName + '\n' +
+//                "Contents: " + contents + '\n' +
+//                "Raw bytes: (" + rawBytesLength + " bytes)\n" +
+//                "Orientation: " + orientation + '\n' +
+//                "EC level: " + errorCorrectionLevel + '\n';
+//    }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_barcode.xml b/app/src/main/res/layout/activity_barcode.xml
similarity index 93%
rename from app/src/main/res/layout-land/activity_barcode.xml
rename to app/src/main/res/layout/activity_barcode.xml
index f413d10..0306ec7 100644
--- a/app/src/main/res/layout-land/activity_barcode.xml
+++ b/app/src/main/res/layout/activity_barcode.xml
@@ -17,25 +17,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatButton
+    <ImageView
         android:id="@+id/image_barcode_scan"
-        android:layout_width="450dp"
-        android:layout_height="330dp"
+        android:layout_width="400dp"
+        android:layout_height="300dp"
         android:layout_marginLeft= "30dp"
         android:layout_marginTop="50dp"
         android:background="@drawable/image_scan_item"
         app:layout_constraintStart_toEndOf="@+id/btn_back_scan_barcode"
         app:layout_constraintTop_toBottomOf="@+id/btn_back_scan_barcode" />
 
-    <ImageView
-        android:id="@+id/image_barcode"
-        android:layout_width="400dp"
-        android:layout_height="300dp"
-        app:layout_constraintBottom_toBottomOf="@+id/image_barcode_scan"
-        app:layout_constraintEnd_toEndOf="@+id/image_barcode_scan"
-        app:layout_constraintStart_toStartOf="@+id/image_barcode_scan"
-        app:layout_constraintTop_toTopOf="@+id/image_barcode_scan"
-        />
+
 
     <TextView
         android:id="@+id/tv_item_type"
@@ -133,7 +125,7 @@
         android:fontFamily="@font/esamanru_medium"
         android:layout_width="100dp"
         android:layout_height="80dp"
-        android:text="3"
+        android:text="1"
         android:gravity= "center"
         android:textSize="50dp"
         android:textColor="@color/black"
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
new file mode 100644
index 0000000..8589b8a
--- /dev/null
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:context=".scan.ScanActivity">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.camera.view.PreviewView
+            android:id="@+id/previewView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+        </androidx.camera.view.PreviewView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/resultContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/resultView"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_gravity="bottom"
+            android:background="#80000000"
+            android:gravity="center_horizontal|top"
+            android:textColor="#9999ff"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index ec58632..1233457 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/settings.gradle b/settings.gradle
index 218bc05..aae32eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,9 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url "https://download2.dynamsoft.com/maven/aar"
+        }
     }
 }
 rootProject.name = "Whipping"