Quellcode durchsuchen

observe test was finalized on BridgeService and BridgeServerActivity.

Trishia vor 4 Jahren
Ursprung
Commit
000403e3b8

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

@@ -210,7 +210,7 @@ public class BridgeServer {
                 OCMain.resourceSetDiscoverable(res_light, true);
                 OCMain.resourceSetObservable(res_light, true);
                 //TODO : check if it is needed for notifying to client
-                OCMain.resourceSetPeriodicObservable(res_light, 60); // seconds
+                //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));
                 OCMain.resourceSetRequestHandler(res_light, OCMethod.OC_PUT, new PutLightRequestHandler(service, light));
@@ -224,7 +224,7 @@ public class BridgeServer {
                 OCMain.resourceSetDiscoverable(res_dimming, true);
                 OCMain.resourceSetObservable(res_dimming, true);
                 //TODO : check if it is needed for notifying to client
-                OCMain.resourceSetPeriodicObservable(res_dimming, 60); // seconds
+                //OCMain.resourceSetPeriodicObservable(res_dimming, 60); // seconds
                 OCMain.resourceSetRequestHandler(res_dimming, OCMethod.OC_GET, new GetLightRequestHandler(service, light));
                 OCMain.resourceSetRequestHandler(res_dimming, OCMethod.OC_POST, new PostLightRequestHandler(service, light));
                 OCMain.resourceSetRequestHandler(res_dimming, OCMethod.OC_PUT, new PutLightRequestHandler(service, light));

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

@@ -690,7 +690,7 @@ public class BridgeServerActivity extends AppCompatActivity {
                                 // post/put
                                 OcRemoteDevice device = findRemoteDevice(resource);
                                 Light res_light = new Light(device.getName());
-                                Post2LightResponseHandler putLight = new Post2LightResponseHandler(BridgeServerActivity.this, resource, res_light);
+                                PostLightResponseHandler putLight = new PostLightResponseHandler(BridgeServerActivity.this, resource, res_light);
                                 if (OcUtils.initPost(resource.getUri(), Utils.getCoapsEndpoint(resource.getEndpoints()), null, putLight, OCQos.LOW_QOS)) {
                                     OcCborEncoder root = OcCborEncoder.createOcCborEncoder(OcCborEncoder.EncoderType.ROOT);
                                     if(property.second instanceof Boolean) {

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

@@ -38,8 +38,8 @@ public class DeviceDiscoveryHandler implements OcDeviceDiscoveryHandler {
                 //Log.d(TAG, "getAllResources : " + service.getDeviceResources(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())));
+                Log.d(TAG, "ObserveAll : " + service.doObserveDeviceSpecificResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
             }
 
             /* check if the device is accessible via coaps get /oic/d or not