Skip to content
Snippets Groups Projects
Commit c5ed544d authored by BAUER EMILIEN's avatar BAUER EMILIEN
Browse files

Bitmap shared from GenerateActivity to SendActivity

parent 0fa19897
No related merge requests found
...@@ -16,7 +16,14 @@ ...@@ -16,7 +16,14 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Qrcode"> android:theme="@style/Theme.Qrcode">
<activity android:name=".SendActivity"></activity> <activity android:name=".SendActivity"></activity>
<activity android:name=".MenuScanActivity" /> <activity android:name=".MenuScanActivity">
<!-- This activity is in charge of receiving images -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter>
</activity>
<activity android:name=".ScanActivity" /> <activity android:name=".ScanActivity" />
<activity android:name=".LauncherActivity"> <activity android:name=".LauncherActivity">
<intent-filter> <intent-filter>
......
...@@ -15,12 +15,15 @@ import com.google.zxing.MultiFormatWriter; ...@@ -15,12 +15,15 @@ import com.google.zxing.MultiFormatWriter;
import com.google.zxing.common.BitMatrix; import com.google.zxing.common.BitMatrix;
import com.journeyapps.barcodescanner.BarcodeEncoder; import com.journeyapps.barcodescanner.BarcodeEncoder;
import java.io.ByteArrayOutputStream;
public class GenerateActivity extends AppCompatActivity { public class GenerateActivity extends AppCompatActivity {
private EditText editText, editKey; private EditText editText, editKey;
private Button generate,goback,save,send; private Button generate,goback,save,send;
private ImageView imageView; private ImageView imageView;
private Bitmap bitmap;
private Intent request; private Intent request;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -44,7 +47,7 @@ public class GenerateActivity extends AppCompatActivity { ...@@ -44,7 +47,7 @@ public class GenerateActivity extends AppCompatActivity {
String msg = EncryptOrDecrypt.encrypt(editText.getText().toString(), editKey.getText().toString()); String msg = EncryptOrDecrypt.encrypt(editText.getText().toString(), editKey.getText().toString());
BitMatrix bitMatrix = multiFormatWriter.encode(msg, BarcodeFormat.QR_CODE,500,500); BitMatrix bitMatrix = multiFormatWriter.encode(msg, BarcodeFormat.QR_CODE,500,500);
BarcodeEncoder barcodeEncoder = new BarcodeEncoder(); BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
Bitmap bitmap = barcodeEncoder.createBitmap(bitMatrix); bitmap = barcodeEncoder.createBitmap(bitMatrix);
imageView.setImageBitmap(bitmap); imageView.setImageBitmap(bitmap);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
...@@ -80,6 +83,10 @@ public class GenerateActivity extends AppCompatActivity { ...@@ -80,6 +83,10 @@ public class GenerateActivity extends AppCompatActivity {
public void onClick(View v) { public void onClick(View v) {
request = new Intent(GenerateActivity.this, SendActivity.class); request = new Intent(GenerateActivity.this, SendActivity.class);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
request.putExtra("Image", stream.toByteArray());
startActivityForResult(request,14); startActivityForResult(request,14);
} }
......
...@@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity; ...@@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
...@@ -12,6 +14,7 @@ import android.view.View; ...@@ -12,6 +14,7 @@ import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toast; import android.widget.Toast;
...@@ -34,7 +37,7 @@ public class SendActivity extends AppCompatActivity { ...@@ -34,7 +37,7 @@ public class SendActivity extends AppCompatActivity {
SendActivity myApp = this; SendActivity myApp = this;
ListView listView; ListView listView;
String test ="yolo"; String test ="yolo";
byte[] msg; byte[] imageData;
private Handler handler=new Handler(new Handler.Callback() { private Handler handler=new Handler(new Handler.Callback() {
@Override @Override
...@@ -72,6 +75,12 @@ public class SendActivity extends AppCompatActivity { ...@@ -72,6 +75,12 @@ public class SendActivity extends AppCompatActivity {
appButton = (Button) findViewById(R.id.appButton); appButton = (Button) findViewById(R.id.appButton);
bluetoothAdapter=BluetoothAdapter.getDefaultAdapter(); bluetoothAdapter=BluetoothAdapter.getDefaultAdapter();
ImageView view = (ImageView) findViewById(R.id.imageView3);
byte[] imageData = getIntent().getByteArrayExtra("Image");
Bitmap bitmap = BitmapFactory.decodeByteArray(imageData, 0, imageData.length);;
view.setImageBitmap(bitmap);
if (!bluetoothAdapter.isEnabled()) { if (!bluetoothAdapter.isEnabled()) {
// Demande à activer l'interface bluetooth // Demande à activer l'interface bluetooth
Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
...@@ -121,7 +130,13 @@ public class SendActivity extends AppCompatActivity { ...@@ -121,7 +130,13 @@ public class SendActivity extends AppCompatActivity {
clientClass.start(); clientClass.start();
//test //test
clientClass.sendReceive.write(test.getBytes()); clientClass.sendReceive.write(test.getBytes());
//clientClass.sendReceive.write(msg); //clientClass.sendReceive.write(imageData);
}
});
appButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
} }
}); });
......
...@@ -44,4 +44,13 @@ ...@@ -44,4 +44,13 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bluetoothButton" /> app:layout_constraintTop_toBottomOf="@+id/bluetoothButton" />
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/ic_launcher_foreground"
tools:layout_editor_absoluteY="257dp" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment