Sfoglia il codice sorgente

JNI library and Platform shutdown code was modified but still have shutdown issue.

Trishia 4 anni fa
parent
commit
3a131c22f7

BIN
app/libs/iotivity-lite.jar


+ 1 - 1
app/src/main/aidl/com/icontrols/service/control/ILightControlServiceCallback.aidl

@@ -9,7 +9,7 @@ package com.icontrols.service.control;
 interface ILightControlServiceCallback {
 
     /*
-    * This is notifying async result for requests such as GET, POST, OBSERVE
+    * This is notifying async result for requests such as GET, POST
     * @param result_code 0-OK, 1-FAIL, 2-ERROR
     * @param result_data json format as string (eg.
     * {"tid":"3481704581734918",                                     // Transaction ID

+ 8 - 8
app/src/main/aidl/org/iotivity/bridge/homeserver/IBridgeService.aidl

@@ -43,7 +43,7 @@ interface IBridgeService {
     String retrieveAllDevices();
 
     /**
-     * retrieve all resources of the deivce in BridgeService
+     * retrieve all resources of the pair-wised deivce in BridgeService
      * @param device_uuid : unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @return resource list data with json array format as String
      * [{"anchor":"ocf://15ba3c25-8cdd-41f8-6f9e-fe49105dce0a","uri”:”/light","rt":"[oic.r.switch.binary]","eps":"[coaps://192.168.0.3:43370]","if":"BASELINE | RW","pm":"DISCOVERABLE | OBSERVABLE"},
@@ -52,7 +52,7 @@ interface IBridgeService {
     String retrieveAllResources(in String device_uuid) ;
 
     /**
-     * request Getting all properties of the resource to the remote OCF device
+     * request Getting all properties of the resource to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @param resource_uri uri of ocf resource (eg. /a/light)
      * @return
@@ -62,7 +62,7 @@ interface IBridgeService {
     boolean requestGetProperties(in String device_uuid, in String resource_uri) ;
 
     /**
-     * request Posting the value of properties to the remote OCF device
+     * request Posting the value of properties to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @param resource_uri uri of ocf resource (eg. /a/light)
      * @param prop_data the property values of the resource (eg. { "power" : true, "level" : 100 }
@@ -73,7 +73,7 @@ interface IBridgeService {
     boolean requestPostProperties(in String device_uuid, in String resource_uri, in String prop_data) ;
 
     /**
-     * request Putting the value of properties to the remote OCF device
+     * request Putting the value of properties to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @param resource_uri uri of ocf resource (eg. /a/light)
      * @param prop_data the property values of the resource (eg. { "power" : true, "level" : 100 }
@@ -84,7 +84,7 @@ interface IBridgeService {
     boolean requestPutProperties(String device_uuid, String resource_uri, String prop_data);
 
     /**
-     * request Observing all properties of the resource to the remote OCF device
+     * request Observing all properties of the resource to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @param resource_uri uri of ocf resource (eg. /a/light)
      * @return
@@ -94,7 +94,7 @@ interface IBridgeService {
     boolean requestObserveResource(in String device_uuid, in String resource_uri) ;
 
     /**
-     * request Observing all properties of the resource to the remote OCF device
+     * request Stop Observing all properties of the resource to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @param resource_uri uri of ocf resource (eg. /a/light)
      * @return
@@ -104,7 +104,7 @@ interface IBridgeService {
     boolean requestStopObserveResource(in String device_uuid, in String resource_uri) ;
 
     /**
-     * request Observing only device specific resources to the remote OCF device
+     * request Observing only device specific resources to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @return
      *   - true : function call success,
@@ -113,7 +113,7 @@ interface IBridgeService {
     boolean requestObserveDeviceSpecificResources(in String device_uuid) ;
 
     /**
-     * request Observing only device specific resources to the remote OCF device
+     * request Stop Observing only device specific resources to the pair-wised OCF device
      * @param device_uuid unique identity of ocf device (eg. 15ba3c25-8cdd-41f8-6f9e-fe49105dce0a)
      * @return
      *   - true : function call success,

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

@@ -694,9 +694,9 @@ public class BridgeService extends IntentService {
         // android.os.Process.killProcess(Process.myPid());
         // or below action
 
-        // Log.d(TAG, "System.exit() will be called");
-        // System.runFinalizersOnExit(true);
-        // System.exit(0);
+        Log.d(TAG, "System.exit() will be called");
+        System.runFinalizersOnExit(true);
+        System.exit(0);
     }
 
     @Override

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