|
@@ -171,13 +171,13 @@ public class BridgeServer {
|
|
return null ;
|
|
return null ;
|
|
}
|
|
}
|
|
|
|
|
|
- public int addVirtualOCFDevice(String virtual_di, String device_type, String devicename, String econame) {
|
|
|
|
|
|
+ public VirtualOCFDevice addVirtualOCFDevice(String virtual_di, String device_type, String device_name, String eco_name) {
|
|
|
|
|
|
// Add Virtual Device for Light
|
|
// Add Virtual Device for Light
|
|
OCUuid uuid = OCUuidUtil.stringToUuid(virtual_di);
|
|
OCUuid uuid = OCUuidUtil.stringToUuid(virtual_di);
|
|
int vod_index = OCBridge.addVirtualDevice(uuid.getId(),
|
|
int vod_index = OCBridge.addVirtualDevice(uuid.getId(),
|
|
- econame, "/oic/d", device_type, // "oic.d.virtual" automatically added by internal api implements
|
|
|
|
- devicename, "ocf.2.0.0", "ocf.res.1.3.0,ocf.sh.1.3.0",
|
|
|
|
|
|
+ eco_name, "/oic/d", device_type, // "oic.d.virtual" automatically added by internal api implements
|
|
|
|
+ device_name, "ocf.2.0.0", "ocf.res.1.3.0,ocf.sh.1.3.0",
|
|
new OCAddDeviceHandler() {
|
|
new OCAddDeviceHandler() {
|
|
@Override
|
|
@Override
|
|
public void handler() {
|
|
public void handler() {
|
|
@@ -188,7 +188,6 @@ public class BridgeServer {
|
|
if (vod_index != 0) {
|
|
if (vod_index != 0) {
|
|
Log.d(TAG, "VOD Index = " + vod_index + ", VOD Count = " + OCBridge.getVirtualDeviceCount());
|
|
Log.d(TAG, "VOD Index = " + vod_index + ", VOD Count = " + OCBridge.getVirtualDeviceCount());
|
|
|
|
|
|
- light = new Light(devicename);
|
|
|
|
OCDeviceInfo dev_info = OCCoreRes.getDeviceInfo(vod_index);
|
|
OCDeviceInfo dev_info = OCCoreRes.getDeviceInfo(vod_index);
|
|
OCVirtualDevice vod_info = OCBridge.getVirtualDeviceInfo(vod_index);
|
|
OCVirtualDevice vod_info = OCBridge.getVirtualDeviceInfo(vod_index);
|
|
Log.d(TAG, "VOD Info = " + vod_info);
|
|
Log.d(TAG, "VOD Info = " + vod_info);
|
|
@@ -200,8 +199,8 @@ public class BridgeServer {
|
|
|
|
|
|
|
|
|
|
// Add VOD Data
|
|
// Add VOD Data
|
|
- VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, devicename, econame,
|
|
|
|
- OCUuidUtil.bytesToString(vod_info.getId()));
|
|
|
|
|
|
+ VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, device_name, eco_name,
|
|
|
|
+ OCUuidUtil.bytesToString(vod_info.getId()), device_type);
|
|
vod.setDiscovered(true);
|
|
vod.setDiscovered(true);
|
|
vod.setAddedToBridge(true);
|
|
vod.setAddedToBridge(true);
|
|
bridge.addOrReplaceVODList(vod);
|
|
bridge.addOrReplaceVODList(vod);
|
|
@@ -216,17 +215,20 @@ public class BridgeServer {
|
|
// Add OCF Virtual Device IDD
|
|
// Add OCF Virtual Device IDD
|
|
//byte[] idd_bytes = Utils.getFileBytes("idds/virtual_ocf_device_light_IDD.cbor", activity); // example : "dummy_bridge_bridge_device_IDD.cbor"
|
|
//byte[] idd_bytes = Utils.getFileBytes("idds/virtual_ocf_device_light_IDD.cbor", activity); // example : "dummy_bridge_bridge_device_IDD.cbor"
|
|
//OCIntrospection.setIntrospectionData(vod_index, idd_bytes);
|
|
//OCIntrospection.setIntrospectionData(vod_index, idd_bytes);
|
|
|
|
+
|
|
|
|
+ return vod ;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return vod_index ;
|
|
|
|
|
|
+ return null ;
|
|
}
|
|
}
|
|
|
|
|
|
- public void addVirtualDeviceResource(int vod_index, OCFDevice device, String resource_name, String resource_uri, String resource_type, String interfaces) {
|
|
|
|
|
|
+ public void addVirtualDeviceResource(VirtualOCFDevice device, String resource_name, String resource_uri, String resource_type, String resource_if) {
|
|
|
|
|
|
- int interfaceMask = Utils.interfacesStringToMask(interfaces);
|
|
|
|
|
|
+ device.addResource(resource_name, resource_uri, resource_type, resource_if);
|
|
|
|
+ int interfaceMask = Utils.interfacesStringToMask(resource_if);
|
|
|
|
|
|
// Add Device Resource and Handler
|
|
// Add Device Resource and Handler
|
|
- OCResource resource = OCMain.newResource(resource_name, resource_uri, (short)1, (long)vod_index);
|
|
|
|
|
|
+ OCResource resource = OCMain.newResource(resource_name, resource_uri, (short)1, (long)device.getVODIndex());
|
|
OCMain.resourceBindResourceType(resource, resource_type);
|
|
OCMain.resourceBindResourceType(resource, resource_type);
|
|
OCMain.resourceBindResourceInterface(resource, interfaceMask);
|
|
OCMain.resourceBindResourceInterface(resource, interfaceMask);
|
|
OCMain.resourceSetDefaultInterface(resource, interfaceMask);
|
|
OCMain.resourceSetDefaultInterface(resource, interfaceMask);
|
|
@@ -270,7 +272,7 @@ public class BridgeServer {
|
|
|
|
|
|
// Add VOD Data
|
|
// Add VOD Data
|
|
VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, devicename, econame,
|
|
VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, devicename, econame,
|
|
- OCUuidUtil.bytesToString(vod_info.getId()));
|
|
|
|
|
|
+ OCUuidUtil.bytesToString(vod_info.getId()), "oic.d.light");
|
|
vod.setDiscovered(true);
|
|
vod.setDiscovered(true);
|
|
vod.setAddedToBridge(true);
|
|
vod.setAddedToBridge(true);
|
|
bridge.addOrReplaceVODList(vod);
|
|
bridge.addOrReplaceVODList(vod);
|
|
@@ -355,7 +357,7 @@ public class BridgeServer {
|
|
|
|
|
|
// Add VOD Data
|
|
// Add VOD Data
|
|
VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, dev_info.getName(), vod_client.getEconame(),
|
|
VirtualOCFDevice vod = new VirtualOCFDevice(vod_index, dev_info.getName(), vod_client.getEconame(),
|
|
- OCUuidUtil.bytesToString(vod_client.getId()));
|
|
|
|
|
|
+ OCUuidUtil.bytesToString(vod_client.getId()), "oic.d.virtualclient");
|
|
vod.setDiscovered(true);
|
|
vod.setDiscovered(true);
|
|
vod.setAddedToBridge(true);
|
|
vod.setAddedToBridge(true);
|
|
bridge.addOrReplaceVODList(vod);
|
|
bridge.addOrReplaceVODList(vod);
|