|
@@ -693,18 +693,16 @@ public class BridgeService extends IntentService {
|
|
// Bridge Service and Application Process Kill
|
|
// Bridge Service and Application Process Kill
|
|
// android.os.Process.killProcess(Process.myPid());
|
|
// android.os.Process.killProcess(Process.myPid());
|
|
// or below action
|
|
// 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
|
|
@Override
|
|
public void onTaskRemoved(Intent rootIntent) {
|
|
public void onTaskRemoved(Intent rootIntent) {
|
|
super.onTaskRemoved(rootIntent);
|
|
super.onTaskRemoved(rootIntent);
|
|
-
|
|
|
|
Log.d(TAG, "onTaskRemoved()");
|
|
Log.d(TAG, "onTaskRemoved()");
|
|
-
|
|
|
|
- //this.restartServiceByAlarmManager();
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -716,7 +714,6 @@ public class BridgeService extends IntentService {
|
|
@Override
|
|
@Override
|
|
public boolean onUnbind(Intent intent) {
|
|
public boolean onUnbind(Intent intent) {
|
|
Log.d(TAG, "Bridge Service onUnbind()");
|
|
Log.d(TAG, "Bridge Service onUnbind()");
|
|
-
|
|
|
|
return super.onUnbind(intent);
|
|
return super.onUnbind(intent);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -769,10 +766,11 @@ public class BridgeService extends IntentService {
|
|
executorService.scheduleAtFixedRate(new Runnable() {
|
|
executorService.scheduleAtFixedRate(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- if(bridgeServer!=null) bridgeServer.loadPairwisedDeviceUUIDs();
|
|
|
|
-
|
|
|
|
- Log.d(TAG, "Before Discovery : " + getAllDiscoveredDevices());
|
|
|
|
|
|
+ // load pair-wised device UUIDs from Bridge Credentials
|
|
|
|
+ loadPairwisedDeviceUUIDs();
|
|
|
|
+ // clear all pair-wised device list discovered pre-time
|
|
clearPairwisedDevices();
|
|
clearPairwisedDevices();
|
|
|
|
+ // discover all pair-wised device except Bridge and OBT
|
|
OCUuid bridge_di = OCCoreRes.getDeviceId(Bridge.BRIDGE_INDEX);
|
|
OCUuid bridge_di = OCCoreRes.getDeviceId(Bridge.BRIDGE_INDEX);
|
|
if (!OcUtils.discoverAllDevices(new DeviceDiscoveryHandler(getService(), bridge_di))) {
|
|
if (!OcUtils.discoverAllDevices(new DeviceDiscoveryHandler(getService(), bridge_di))) {
|
|
final String msg = "Failed to discover devices";
|
|
final String msg = "Failed to discover devices";
|
|
@@ -785,9 +783,7 @@ public class BridgeService extends IntentService {
|
|
executorService.scheduleAtFixedRate(new Runnable() {
|
|
executorService.scheduleAtFixedRate(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- // TODO : Pairwised device UUID
|
|
|
|
- // bridgeServer.loadPairwisedDeviceUUIDs();
|
|
|
|
- // TODO : Getting Properites of Light Control Service
|
|
|
|
|
|
+ // Getting Properites of Light Control Service for resource monitoring
|
|
doGetLightControlResources();
|
|
doGetLightControlResources();
|
|
}
|
|
}
|
|
}, 30, 180, TimeUnit.SECONDS); // 30sec interval after 30sec delay
|
|
}, 30, 180, TimeUnit.SECONDS); // 30sec interval after 30sec delay
|
|
@@ -800,6 +796,12 @@ public class BridgeService extends IntentService {
|
|
}, 10, TimeUnit.SECONDS);*/
|
|
}, 10, TimeUnit.SECONDS);*/
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void loadPairwisedDeviceUUIDs() {
|
|
|
|
+ if(bridgeServer!=null) {
|
|
|
|
+ bridgeServer.loadPairwisedDeviceUUIDs();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
public void clearPairwisedDevices() {
|
|
public void clearPairwisedDevices() {
|
|
if(bridgeServer!=null) {
|
|
if(bridgeServer!=null) {
|
|
bridgeServer.clearPairwisedDevices();
|
|
bridgeServer.clearPairwisedDevices();
|