diff --git a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadeingActivity.java b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadeingActivity.java deleted file mode 100644 index 73fd7a6..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadeingActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example.cosmosclient.views; - -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.widget.TextView; - -import com.example.cosmosclient.R; -import com.google.zxing.integration.android.IntentIntegrator; -import com.google.zxing.integration.android.IntentResult; -import com.journeyapps.barcodescanner.CaptureActivity; - -public class QRcodeReadeingActivity extends CaptureActivity { - public String QRcodeData = null; - TextView QRcodeResult; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_qrcode_readeing); - QRcodeResult = findViewById(R.id.QRcodeResult); - - //ここでQRコードリーダーオブジェクト生成 - IntentIntegrator integrator = new IntentIntegrator(this); -// new IntentIntegrator(QRcodeReadeingActivity.this).initiateScan(); - // スキャン画面の回転の制御 - integrator.setOrientationLocked(false); - //バーコードリーダーの起動 - integrator.initiateScan(); - - } - - //QRコードから読み取った結果の取得 - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); - if(result != null) { - QRcodeData = (String)result.getContents(); - QRcodeResult.setText(QRcodeData); - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } -} diff --git a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java new file mode 100644 index 0000000..af17d80 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java @@ -0,0 +1,45 @@ +package com.example.cosmosclient.views; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.TextView; + +import com.example.cosmosclient.R; +import com.google.zxing.integration.android.IntentIntegrator; +import com.google.zxing.integration.android.IntentResult; +import com.journeyapps.barcodescanner.CaptureActivity; + +public class QRcodeReadingActivity extends CaptureActivity { + public String QRcodeData = null; + TextView QRcodeResult; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_qrcode_reading); + QRcodeResult = findViewById(R.id.QRcodeResult); + + //ここでQRコードリーダーオブジェクト生成 + IntentIntegrator integrator = new IntentIntegrator(this); +// new IntentIntegrator(QRcodeReadingActivity.this).initiateScan(); + // スキャン画面の回転の制御 + integrator.setOrientationLocked(false); + //バーコードリーダーの起動 + integrator.initiateScan(); + + } + + //QRコードから読み取った結果の取得 + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); + if(result != null) { + QRcodeData = (String)result.getContents(); + QRcodeResult.setText(QRcodeData); + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } +} diff --git a/app/src/main/res/layout/activity_qrcode_readeing.xml b/app/src/main/res/layout/activity_qrcode_readeing.xml deleted file mode 100644 index c03b8c4..0000000 --- a/app/src/main/res/layout/activity_qrcode_readeing.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_qrcode_reading.xml b/app/src/main/res/layout/activity_qrcode_reading.xml new file mode 100644 index 0000000..3a7780e --- /dev/null +++ b/app/src/main/res/layout/activity_qrcode_reading.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file