Ver Fonte

critical fault of coap_notify_observers in observe.c was fixed related to setObservable() and setPeriodicObservable()

Trishia há 4 anos atrás
pai
commit
d53fa04663

+ 1 - 0
app/build.gradle

@@ -44,5 +44,6 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    implementation 'junit:junit:4.13'
     implementation files('libs/iotivity-lite.jar')
 }

BIN
app/libs/iotivity-lite.jar


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

@@ -208,8 +208,9 @@ public class BridgeServer {
                 OCMain.resourceBindResourceInterface(res_light, OCInterfaceMask.RW);
                 OCMain.resourceSetDefaultInterface(res_light, OCInterfaceMask.RW);
                 OCMain.resourceSetDiscoverable(res_light, true);
-                OCMain.resourceSetObservable(res_light, false);
-                //OCMain.resourceSetPeriodicObservable(res_light, 60); // seconds
+                OCMain.resourceSetObservable(res_light, true);
+                //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));
                 OCMain.resourceSetRequestHandler(res_light, OCMethod.OC_PUT, new PutLightRequestHandler(service, light));
@@ -221,9 +222,9 @@ public class BridgeServer {
                 OCMain.resourceBindResourceInterface(res_dimming, OCInterfaceMask.RW);
                 OCMain.resourceSetDefaultInterface(res_dimming, OCInterfaceMask.RW);
                 OCMain.resourceSetDiscoverable(res_dimming, true);
-                OCMain.resourceSetObservable(res_dimming, false);
-                //TODO : check if it is needed for notifying to client :
-                //OCMain.resourceSetPeriodicObservable(res_dimming, 60); // seconds
+                OCMain.resourceSetObservable(res_dimming, true);
+                //TODO : check if it is needed for notifying to client
+                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/handler/client/DeviceDiscoveryHandler.java

@@ -35,7 +35,7 @@ public class DeviceDiscoveryHandler implements OcDeviceDiscoveryHandler {
             /* check if Bridge has the discovered device's pairwised credential */
             if(service.hasPairwisedDeviceUUIDs(remoteDevice.getDeviceId())) {
                 service.addPairwisedDevice(remoteDevice);
-                Log.d(TAG, "getAllResources : " + service.getDeviceResources(OCUuidUtil.uuidToString(remoteDevice.getDeviceId())));
+                //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())));

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


+ 11 - 10
app/src/main/res/menu/actionbar_actions.xml

@@ -4,9 +4,10 @@
 
     <item
         android:id="@+id/action_bridge_reset"
-        android:title="Reset Bridge"
+        android:title="Reset Client"
         app:showAsAction="never"/>
 
+
     <item
         android:id="@+id/action_vods_reset"
         android:title="Reset VODs"
@@ -18,15 +19,15 @@
         app:showAsAction="never"/>
 
     <!--
-    <item
-        android:id="@+id/action_settings"
-        android:title="Settings"
-        app:showAsAction="never"/>
+        <item
+            android:id="@+id/action_settings"
+            android:title="Settings"
+            app:showAsAction="never"/>
 
 
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_48dp"
-        android:title="Search"
-        app:showAsAction="ifRoom"/>-->
+        <item
+            android:id="@+id/action_search"
+            android:icon="@drawable/ic_search_white_48dp"
+            android:title="Search"
+            app:showAsAction="ifRoom"/>-->
 </menu>