mirror of
https://github.com/hackku21/nearby_connections.git
synced 2024-10-27 19:14:01 +00:00
setup for file,(untested)
This commit is contained in:
parent
c44a1e0996
commit
146d76bc9f
@ -3,6 +3,8 @@ package com.pkmnapps.nearby_connections;
|
|||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.ParcelFileDescriptor;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v4.app.ActivityCompat;
|
import android.support.v4.app.ActivityCompat;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
@ -23,6 +25,8 @@ import com.google.android.gms.nearby.connection.Strategy;
|
|||||||
import com.google.android.gms.tasks.OnFailureListener;
|
import com.google.android.gms.tasks.OnFailureListener;
|
||||||
import com.google.android.gms.tasks.OnSuccessListener;
|
import com.google.android.gms.tasks.OnSuccessListener;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -221,6 +225,27 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
|
|||||||
result.success(true);
|
result.success(true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case "sendFilePayload": {
|
||||||
|
String endpointId = (String) call.argument("endpointId");
|
||||||
|
String filePath = (String) call.argument("filePath");
|
||||||
|
|
||||||
|
assert endpointId != null;
|
||||||
|
assert filePath != null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
File file = new File(filePath);
|
||||||
|
|
||||||
|
Payload filePayload = Payload.fromFile(file);
|
||||||
|
Nearby.getConnectionsClient(activity).sendPayload(endpointId, filePayload);
|
||||||
|
Log.d("NearbyCon java", "sentFilePayload");
|
||||||
|
result.success(filePayload.getId()); //return payload id to dart
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
Log.e("NearbyCon java", "File not found", e);
|
||||||
|
result.error("Failure", "File Not found", null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
result.notImplemented();
|
result.notImplemented();
|
||||||
}
|
}
|
||||||
@ -326,15 +351,31 @@ public class NearbyConnectionsPlugin implements MethodCallHandler {
|
|||||||
Log.d("NearbyCon java", "onPayloadReceived");
|
Log.d("NearbyCon java", "onPayloadReceived");
|
||||||
Map<String, Object> args = new HashMap<>();
|
Map<String, Object> args = new HashMap<>();
|
||||||
args.put("endpointId", endpointId);
|
args.put("endpointId", endpointId);
|
||||||
|
args.put("payloadId", payload.getId());
|
||||||
|
args.put("type", payload.getType());
|
||||||
|
|
||||||
|
if (payload.getType() == Payload.Type.BYTES) {
|
||||||
byte[] bytes = payload.asBytes();
|
byte[] bytes = payload.asBytes();
|
||||||
assert bytes != null;
|
assert bytes != null;
|
||||||
args.put("bytes", bytes);
|
args.put("bytes", bytes);
|
||||||
|
}
|
||||||
|
|
||||||
channel.invokeMethod("onPayloadReceived", args);
|
channel.invokeMethod("onPayloadReceived", args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPayloadTransferUpdate(@NonNull String s, @NonNull PayloadTransferUpdate payloadTransferUpdate) {
|
public void onPayloadTransferUpdate(@NonNull String endpointId, @NonNull PayloadTransferUpdate payloadTransferUpdate) {
|
||||||
//required for files and streams
|
//required for files and streams
|
||||||
|
|
||||||
|
Log.d("NearbyCon java", "onPayloadTransferUpdate");
|
||||||
|
Map<String, Object> args = new HashMap<>();
|
||||||
|
args.put("endpointId", endpointId);
|
||||||
|
args.put("payloadId", payloadTransferUpdate.getPayloadId());
|
||||||
|
args.put("status", payloadTransferUpdate.getStatus());
|
||||||
|
args.put("bytesTransferred", payloadTransferUpdate.getBytesTransferred());
|
||||||
|
args.put("totalBytes", payloadTransferUpdate.getTotalBytes());
|
||||||
|
|
||||||
|
channel.invokeMethod("onPayloadTransferUpdate", args);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ class _MyBodyState extends State<Body> {
|
|||||||
cId = id;
|
cId = id;
|
||||||
Nearby().acceptConnection(
|
Nearby().acceptConnection(
|
||||||
id,
|
id,
|
||||||
onPayLoadRecieved: (endid, bytes) {
|
onPayLoadRecieved: (endid, bytes, payloadType) {
|
||||||
showSnackbar(endid + ": " + String.fromCharCodes(bytes));
|
showSnackbar(endid + ": " + String.fromCharCodes(bytes));
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
@ -11,7 +11,8 @@ import 'package:flutter/services.dart';
|
|||||||
/// **P2P_POINT_TO_POINT** - single connection, very high bandwidth
|
/// **P2P_POINT_TO_POINT** - single connection, very high bandwidth
|
||||||
enum Strategy { P2P_CLUSTER, P2P_STAR, P2P_POINT_TO_POINT }
|
enum Strategy { P2P_CLUSTER, P2P_STAR, P2P_POINT_TO_POINT }
|
||||||
enum Status { CONNECTED, REJECTED, ERROR }
|
enum Status { CONNECTED, REJECTED, ERROR }
|
||||||
|
enum PayloadStatus { NONE, SUCCESS, FAILURE, IN_PROGRRESS, CANCELED }
|
||||||
|
enum PayloadType { NONE, BYTES, FILES, STREAM }
|
||||||
typedef void OnConnctionInitiated(
|
typedef void OnConnctionInitiated(
|
||||||
String endpointId, ConnectionInfo connectionInfo);
|
String endpointId, ConnectionInfo connectionInfo);
|
||||||
typedef void OnConnectionResult(String endpointId, Status status);
|
typedef void OnConnectionResult(String endpointId, Status status);
|
||||||
@ -21,7 +22,22 @@ typedef void OnEndpointFound(
|
|||||||
String endpointId, String endpointName, String serviceId);
|
String endpointId, String endpointName, String serviceId);
|
||||||
typedef void OnEndpointLost(String endpointId);
|
typedef void OnEndpointLost(String endpointId);
|
||||||
|
|
||||||
typedef void OnPayloadReceived(String endpointId, Uint8List bytes);
|
/// For Bytes, this contains the bytes dala
|
||||||
|
///
|
||||||
|
/// For File, this marks the start of transfer
|
||||||
|
///
|
||||||
|
/// Uint8List bytes may be null, if [payloadType] is not [PayloadType.BYTES]
|
||||||
|
typedef void OnPayloadReceived(
|
||||||
|
String endpointId, Uint8List bytes, PayloadType payloadType);
|
||||||
|
|
||||||
|
/// Called only once for Bytes and repeatedly for File until transfer is complete
|
||||||
|
typedef void OnPayloadTransferUpdate(
|
||||||
|
{String endpointId,
|
||||||
|
int payloadId,
|
||||||
|
PayloadStatus payloadStatus,
|
||||||
|
int bytesTransferred,
|
||||||
|
int totalBytes});
|
||||||
|
|
||||||
// typedef void OnPayloadTransferUpdate();
|
// typedef void OnPayloadTransferUpdate();
|
||||||
/// The NearbyConnection class
|
/// The NearbyConnection class
|
||||||
///
|
///
|
||||||
@ -120,10 +136,26 @@ class Nearby {
|
|||||||
return null;
|
return null;
|
||||||
case "onPayloadReceived":
|
case "onPayloadReceived":
|
||||||
String endpointId = args['endpointId'];
|
String endpointId = args['endpointId'];
|
||||||
|
int type = args['type'];
|
||||||
Uint8List bytes = args['bytes'];
|
Uint8List bytes = args['bytes'];
|
||||||
|
|
||||||
_onPayloadReceived?.call(endpointId, bytes);
|
_onPayloadReceived?.call(endpointId, bytes, PayloadType.values[type]);
|
||||||
|
|
||||||
|
break;
|
||||||
|
case "onPayloadTransferUpdate":
|
||||||
|
String endpointId = args['endpointId'];
|
||||||
|
int payloadId = args['payloadId'];
|
||||||
|
int success = args['success'];
|
||||||
|
int bytesTransferred = args['bytesTransferred'];
|
||||||
|
int totalBytes = args['totalBytes'];
|
||||||
|
|
||||||
|
_onPayloadTransferUpdate?.call(
|
||||||
|
endpointId: endpointId,
|
||||||
|
payloadId: payloadId,
|
||||||
|
payloadStatus: PayloadStatus.values[success],
|
||||||
|
bytesTransferred: bytesTransferred,
|
||||||
|
totalBytes: totalBytes,
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@ -138,6 +170,7 @@ class Nearby {
|
|||||||
OnEndpointLost _onEndpointLost;
|
OnEndpointLost _onEndpointLost;
|
||||||
|
|
||||||
OnPayloadReceived _onPayloadReceived;
|
OnPayloadReceived _onPayloadReceived;
|
||||||
|
OnPayloadTransferUpdate _onPayloadTransferUpdate;
|
||||||
|
|
||||||
static const MethodChannel _channel =
|
static const MethodChannel _channel =
|
||||||
const MethodChannel('nearby_connections');
|
const MethodChannel('nearby_connections');
|
||||||
@ -281,9 +314,10 @@ class Nearby {
|
|||||||
Future<bool> acceptConnection(
|
Future<bool> acceptConnection(
|
||||||
String endpointId, {
|
String endpointId, {
|
||||||
@required OnPayloadReceived onPayLoadRecieved,
|
@required OnPayloadReceived onPayLoadRecieved,
|
||||||
|
OnPayloadTransferUpdate onPayloadTransferUpdate,
|
||||||
}) async {
|
}) async {
|
||||||
this._onPayloadReceived = onPayLoadRecieved;
|
this._onPayloadReceived = onPayLoadRecieved;
|
||||||
|
this._onPayloadTransferUpdate = onPayloadTransferUpdate;
|
||||||
return await _channel.invokeMethod(
|
return await _channel.invokeMethod(
|
||||||
'acceptConnection',
|
'acceptConnection',
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
@ -327,6 +361,23 @@ class Nearby {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns the payloadID as soon as file transfer has begun
|
||||||
|
///
|
||||||
|
/// File is received in DOWNLOADS_DIRECTORY and is given a generic name
|
||||||
|
/// without extension
|
||||||
|
/// You must also send a bytes payload to send the filename and extension
|
||||||
|
/// so that receiver can rename the file accordingly
|
||||||
|
/// Send the payloadID and filename to receiver as bytes payload
|
||||||
|
Future<int> sendFilePayload(String endpointId, String filePath) async {
|
||||||
|
return await _channel.invokeMethod(
|
||||||
|
'sendFilePayload',
|
||||||
|
<String, dynamic>{
|
||||||
|
'endpointId': endpointId,
|
||||||
|
'filePath': filePath,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// ConnectionInfo class
|
/// ConnectionInfo class
|
||||||
|
Loading…
Reference in New Issue
Block a user