Selaa lähdekoodia

Iotivity-lite library based on OCF 2.2.0 and bridge api log updated. Bridge VOD Reset API was modified to reset with vod_count info.

Trishia 4 vuotta sitten
vanhempi
commit
d9a81bad8e

BIN
app/libs/iotivity-lite.jar


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

@@ -104,9 +104,16 @@ public class BridgeServer {
     }
 
     public void resetVirtualOCFDevices() {
-        for(VirtualOCFDevice vod : bridge.getVirtualOCFDeviceList()) {
-            OCBridge.removeVirtualDevice(vod.getVODIndex());
-            OCBridge.deleteVirtualDevice(vod.getVODIndex()); //  Note :This includes OCMain.resetDevice(index);
+        int vod_count = OCBridge.getVirtualDeviceCount();
+        Log.d(TAG, "Virtual OCF Device Count = [" + vod_count + "], Core Device Nums = ["+OCCoreRes.getNumDevices()+"] ");
+
+        for(int index = 1; index <= vod_count; index++) {
+            OCVirtualDevice vod = OCBridge.getVirtualDeviceInfo(index);
+            if(vod != null) {
+                OCBridge.removeVirtualDevice(vod.getIndex());
+                OCBridge.deleteVirtualDevice(vod.getIndex()); //  Note :This includes OCMain.resetDevice(index);
+                Log.d(TAG, "Virtual OCF Device [" + vod.getIndex() + "] was reset!");
+            }
         }
         bridge.clearVirtualOCFDeviceList();
     }

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

@@ -537,7 +537,10 @@ public class BridgeServerActivity extends AppCompatActivity {
                 deviceArrayAdapter.clear();
                 deviceArrayAdapter.setNotifyOnChange(true);
 
-                if(bridgeServer!=null) { bridgeServer.loadPairwisedDeviceUUIDs(); }
+                if(bridgeService!=null) {
+                    bridgeService.clearPairwisedDevices();
+                    bridgeService.loadPairwisedDeviceUUIDs();
+                }
 
                 new Thread(new Runnable() {
                     public void run() {

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

@@ -796,7 +796,7 @@ public class BridgeService extends IntentService {
         }, 10, TimeUnit.SECONDS);*/
     }
 
-    private void loadPairwisedDeviceUUIDs() {
+    public void loadPairwisedDeviceUUIDs() {
         if(bridgeServer!=null) {
             bridgeServer.loadPairwisedDeviceUUIDs();
         }

+ 4 - 1
app/src/main/java/org/iotivity/bridge/homeserver/utils/Utils.java

@@ -291,7 +291,10 @@ public class Utils {
                 || containsList(resource_types, "oic.r.cred")          // Credentials Resource
                 || containsList(resource_types, "oic.r.sp")            // Security Profile Resource
                 || containsList(resource_types, "oic.r.csr")           // Certificate Signing Request Resource
-                || containsList(resource_types, "oic.r.roles")) {      // Role Maintain Resource with Role certificate
+                || containsList(resource_types, "oic.r.roles")         // Role Maintain Resource with Role certificate
+                || containsList(resource_types, "oic.r.ael")           // Auditable Events List Resource that have been logged on the device.
+                || containsList(resource_types, "oic.r.sdi")           // Security Domain Information Resource that idendifies OCF Security Domain to which the device belongs.
+        ) {
             return true ;
         }
         return false ;

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


BIN
app/src/main/jniLibs/armeabi-v7a/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