Browse Source

latest master branch was merged and class and shared library was built. coap_notify_observe() issue was tested.

Trishia 4 năm trước cách đây
mục cha
commit
57a27dbe8f

BIN
app/libs/iotivity-lite.jar


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

@@ -203,13 +203,12 @@ public class BridgeServer {
                 bridge.addOrReplaceVODList(vod);
 
                 // Add Light Device Resources and Handler
-                OCResource res_light = OCMain.newResource(devicename, "/light", (short) 1, (long) vod_index);
+                OCResource res_light = OCMain.newResource(devicename, "/light", (short)1, (long) vod_index);
                 OCMain.resourceBindResourceType(res_light, "oic.r.switch.binary");  // BinarySwitch Resource Type
                 OCMain.resourceBindResourceInterface(res_light, OCInterfaceMask.RW);
                 OCMain.resourceSetDefaultInterface(res_light, OCInterfaceMask.RW);
                 OCMain.resourceSetDiscoverable(res_light, true);
                 OCMain.resourceSetObservable(res_light, false);
-                //TODO : check if it is needed for notifying to client :
                 //OCMain.resourceSetPeriodicObservable(res_light, 60); // seconds
                 OCMain.resourceSetRequestHandler(res_light, OCMethod.OC_GET, new GetLightRequestHandler(service, light));
                 OCMain.resourceSetRequestHandler(res_light, OCMethod.OC_POST, new PostLightRequestHandler(service, light));

+ 2 - 2
app/src/main/java/org/iotivity/bridge/homeserver/handler/client/DeviceDiscoveryHandler.java

@@ -37,9 +37,9 @@ public class DeviceDiscoveryHandler implements OcDeviceDiscoveryHandler {
                 service.addPairwisedDevice(remoteDevice);
                 Log.d(TAG, "getAllResources : " + service.getDeviceResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
 
-                //Log.d(TAG, "ObserveAll : " + service.doObserveDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
-                //Log.d(TAG, "StopObserveAll : " + service.stopObserveDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
                 Log.d(TAG, "getDeviceSpecificResources: " + service.doGetDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
+                Log.d(TAG, "ObserveAll : " + service.doObserveDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
+                //Log.d(TAG, "StopObserveAll : " + service.stopObserveDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
             }
 
             /* check if the device is accessible via coaps get /oic/d or not

+ 2 - 2
app/src/main/java/org/iotivity/bridge/homeserver/handler/client/GetResponseHandler.java

@@ -57,9 +57,9 @@ public class GetResponseHandler implements OCResponseHandler {
         }
 
         // for test
-        service.doPostDeviceResource(Utils.getDIFromAnchor(resource.getAnchor()),
+        /*service.doPostDeviceResource(Utils.getDIFromAnchor(resource.getAnchor()),
                 resource.getUri(), json);
         service.doPutDeviceResource(Utils.getDIFromAnchor(resource.getAnchor()),
-                resource.getUri(), json);
+                resource.getUri(), json);*/
     }
 }

BIN
app/src/main/jniLibs/arm64-v8a/libiotivity-lite-jni.so


BIN
app/src/main/jniLibs/armeabi/libiotivity-lite-jni.so


BIN
app/src/main/jniLibs/x86/libiotivity-lite-jni.so


BIN
app/src/main/jniLibs/x86_64/libiotivity-lite-jni.so