瀏覽代碼

ocf.2.0.5 of icv info was changed to ocf2.2.0 for Bridge, VODs.

Trishia 4 年之前
父節點
當前提交
fee7376923

+ 3 - 3
app/src/main/java/org/iotivity/bridge/homeserver/BridgeServer.java

@@ -282,7 +282,7 @@ public class BridgeServer {
         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(),
                 eco_name, "/oic/d", device_type,  // "oic.d.virtual" automatically added by internal api implements
                 eco_name, "/oic/d", device_type,  // "oic.d.virtual" automatically added by internal api implements
-                device_name, "ocf.2.0.5", "ocf.res.1.3.0,ocf.sh.1.3.0");
+                device_name, "ocf.2.2.0", "ocf.res.1.3.0,ocf.sh.1.3.0");
 
 
         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());
@@ -349,7 +349,7 @@ public class BridgeServer {
         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", "oic.d.light",  // "oic.d.virtual" automatically added by internal api implements
                 econame, "/oic/d", "oic.d.light",  // "oic.d.virtual" automatically added by internal api implements
-                devicename, "ocf.2.0.5", "ocf.res.1.3.0,ocf.sh.1.3.0");
+                devicename, "ocf.2.2.0", "ocf.res.1.3.0,ocf.sh.1.3.0");
 
 
         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());
@@ -451,7 +451,7 @@ public class BridgeServer {
         OCUuid uuid = OCUuidUtil.stringToUuid(device_uuid) ;
         OCUuid uuid = OCUuidUtil.stringToUuid(device_uuid) ;
         int vod_index = OCBridge.addVirtualDevice(uuid.getId(),
         int vod_index = OCBridge.addVirtualDevice(uuid.getId(),
                 econame, "/oic/d", "oic.d.virtualclient",  // "oic.d.virtual" automatically added by internal api implements
                 econame, "/oic/d", "oic.d.virtualclient",  // "oic.d.virtual" automatically added by internal api implements
-                devicename, "ocf.2.0.5", "ocf.res.1.3.0,ocf.sh.1.3.0");
+                devicename, "ocf.2.2.0", "ocf.res.1.3.0,ocf.sh.1.3.0");
 
 
         if(vod_index != 0) {
         if(vod_index != 0) {
             OCDeviceInfo dev_info = OCCoreRes.getDeviceInfo(vod_index);
             OCDeviceInfo dev_info = OCCoreRes.getDeviceInfo(vod_index);

+ 1 - 1
app/src/main/java/org/iotivity/bridge/homeserver/handler/BridgeInitHandler.java

@@ -43,7 +43,7 @@ public class BridgeInitHandler implements OCMainInitHandler {
         int ret = ocPlatform.platformInit(Bridge.PLATFORM_MFG_NAME);
         int ret = ocPlatform.platformInit(Bridge.PLATFORM_MFG_NAME);
         if (ret >= 0) {
         if (ret >= 0) {
             // Create the devices and add them to the platform
             // Create the devices and add them to the platform
-            ret = OCBridge.addBridgeDevice(bridge.getName(), "ocf.2.0.5", "ocf.res.1.3.0,ocf.sh.1.3.0");
+            ret = OCBridge.addBridgeDevice(bridge.getName(), "ocf.2.2.0", "ocf.res.1.3.0,ocf.sh.1.3.0");
         } else {
         } else {
             Log.e(TAG, "Error in platformInit, return value = " + ret);
             Log.e(TAG, "Error in platformInit, return value = " + ret);
         }
         }