|
@@ -335,7 +335,11 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
resetBridgeDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
resetBridgeDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
@Override
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
- if(bridgeServer!=null) bridgeServer.resetBridgeServer();
|
|
|
|
|
|
+ if(bridgeServer!=null) {
|
|
|
|
+ bridgeServer.resetBridgeServer();
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.resetBridgeOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -359,10 +363,11 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
resetVodsDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
resetVodsDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
@Override
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
- if(bridgeServer!=null) bridgeServer.resetVirtualOCFDevices();
|
|
|
|
- Toast.makeText(BridgeServerActivity.this,
|
|
|
|
- getString(R.string.resetVODsOkMessage)
|
|
|
|
- , Toast.LENGTH_LONG).show();
|
|
|
|
|
|
+ if(bridgeServer!=null) {
|
|
|
|
+ bridgeServer.resetVirtualOCFDevices();
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.resetVODsOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -461,6 +466,8 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
if(bridgeServer!=null) {
|
|
if(bridgeServer!=null) {
|
|
bridgeServer.addLightVirtualOCFServer(BridgeServer.LIGHT_UUID, "Light Switch", "ocf");
|
|
bridgeServer.addLightVirtualOCFServer(BridgeServer.LIGHT_UUID, "Light Switch", "ocf");
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.addVOSOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -486,6 +493,8 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
if(bridgeServer!=null) {
|
|
if(bridgeServer!=null) {
|
|
bridgeServer.addVirtualOCFClient(BridgeServer.CLIENT_UUID, "Virtual OCF Client", "ocf");
|
|
bridgeServer.addVirtualOCFClient(BridgeServer.CLIENT_UUID, "Virtual OCF Client", "ocf");
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.addVOCOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -504,15 +513,17 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
{
|
|
{
|
|
AlertDialog.Builder removeVodsDialogBuilder = new AlertDialog.Builder(BridgeServerActivity.this);
|
|
AlertDialog.Builder removeVodsDialogBuilder = new AlertDialog.Builder(BridgeServerActivity.this);
|
|
removeVodsDialogBuilder.setTitle(getString(R.string.removeVODs));
|
|
removeVodsDialogBuilder.setTitle(getString(R.string.removeVODs));
|
|
- removeVodsDialogBuilder.setMessage(getString(R.string.removeVOSsMessage));
|
|
|
|
|
|
+ removeVodsDialogBuilder.setMessage(getString(R.string.removeVODsMessage));
|
|
|
|
|
|
removeVodsDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
removeVodsDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
@Override
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
- if(bridgeServer!=null) bridgeServer.deleteVirtualOCFDevices();
|
|
|
|
- Toast.makeText(BridgeServerActivity.this,
|
|
|
|
- getString(R.string.removeVODsOkMessage)
|
|
|
|
- , Toast.LENGTH_LONG).show();
|
|
|
|
|
|
+ if(bridgeServer!=null) {
|
|
|
|
+ //bridgeServer.deleteVirtualOCFDevices();
|
|
|
|
+ bridgeServer.removeVirtualOCFDevices();
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.removeVODsOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -570,10 +581,13 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
|
|
|
|
final String device_name = info.getName();
|
|
final String device_name = info.getName();
|
|
- bridgeServer.deleteVirtualOCFDevice(device.getVODIndex());
|
|
|
|
- Toast.makeText(BridgeServerActivity.this,
|
|
|
|
- getString(R.string.removeVODOkMessage).replace("?", device_name)
|
|
|
|
- , Toast.LENGTH_LONG).show();
|
|
|
|
|
|
+ if(bridgeServer!=null) {
|
|
|
|
+ //bridgeServer.deleteVirtualOCFDevice(device.getVODIndex());
|
|
|
|
+ bridgeServer.removeVirtualOCFDevice(device.getVODIndex());
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this,
|
|
|
|
+ getString(R.string.removeVODOkMessage).replace("?", device_name)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -612,6 +626,8 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
if(bridgeService!=null) {
|
|
if(bridgeService!=null) {
|
|
bridgeService.bindLightControlService();
|
|
bridgeService.bindLightControlService();
|
|
bridgeService.startScheduledTaskForLightControl();
|
|
bridgeService.startScheduledTaskForLightControl();
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.startBridgedClientOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -637,14 +653,17 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
if(bridgeService != null ) {
|
|
if(bridgeService != null ) {
|
|
bridgeService.stopScheduledTaskForLightControl();
|
|
bridgeService.stopScheduledTaskForLightControl();
|
|
- if(bridgeServer != null && bridgeServer.getVirtualOCFDeviceList() != null) {
|
|
|
|
- for (VirtualOCFDevice vod : bridgeServer.getVirtualOCFDeviceList()) {
|
|
|
|
|
|
+ if(bridgeServer != null ) {
|
|
|
|
+ ArrayList<VirtualOCFDevice> vods = (ArrayList<VirtualOCFDevice>)bridgeServer.getVirtualOCFDeviceList().clone();
|
|
|
|
+ for (VirtualOCFDevice vod : vods) {
|
|
if (vod.getEcoName().equalsIgnoreCase(BridgeService.LightControlServiceConnection.ECO_NAME)) {
|
|
if (vod.getEcoName().equalsIgnoreCase(BridgeService.LightControlServiceConnection.ECO_NAME)) {
|
|
bridgeServer.removeVirtualOCFDevice(vod.getVODIndex());
|
|
bridgeServer.removeVirtualOCFDevice(vod.getVODIndex());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
bridgeService.unbindLightControlService();
|
|
bridgeService.unbindLightControlService();
|
|
|
|
+ Toast.makeText(BridgeServerActivity.this, getString(R.string.stopBridgedClientOkMessage)
|
|
|
|
+ , Toast.LENGTH_LONG).show();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -668,8 +687,12 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
stopServiceDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
stopServiceDialogBuilder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
|
@Override
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
- // Stop Bridge Service
|
|
|
|
- stopBridgeService();
|
|
|
|
|
|
+ // stop Bridge Service
|
|
|
|
+ if(bridgeService!=null ) {
|
|
|
|
+ //stopBridgeService();
|
|
|
|
+ bridgeService.stopScheduledTaskForPairwised();
|
|
|
|
+ }
|
|
|
|
+ unbindBridgeService();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -695,6 +718,7 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
// kill Bridge Service
|
|
// kill Bridge Service
|
|
stopBridgeService();
|
|
stopBridgeService();
|
|
|
|
+
|
|
Log.d(TAG, "System.exit() will be called");
|
|
Log.d(TAG, "System.exit() will be called");
|
|
System.runFinalizersOnExit(true);
|
|
System.runFinalizersOnExit(true);
|
|
System.exit(0);
|
|
System.exit(0);
|
|
@@ -845,9 +869,13 @@ public class BridgeServerActivity extends AppCompatActivity {
|
|
discoverDevicesButton.setOnClickListener(new View.OnClickListener() {
|
|
discoverDevicesButton.setOnClickListener(new View.OnClickListener() {
|
|
@Override
|
|
@Override
|
|
public void onClick(View v) {
|
|
public void onClick(View v) {
|
|
- deviceArrayAdapter.setNotifyOnChange(false);
|
|
|
|
- deviceArrayAdapter.clear();
|
|
|
|
- deviceArrayAdapter.setNotifyOnChange(true);
|
|
|
|
|
|
+
|
|
|
|
+ synchronized (arrayAdapterSync) {
|
|
|
|
+ deviceArrayAdapter.setNotifyOnChange(false);
|
|
|
|
+ deviceArrayAdapter.clear();
|
|
|
|
+ deviceArrayAdapter.setNotifyOnChange(true);
|
|
|
|
+ }
|
|
|
|
+ deviceArrayAdapter.notifyDataSetChanged();
|
|
|
|
|
|
if(bridgeService!=null) {
|
|
if(bridgeService!=null) {
|
|
bridgeService.clearPairwisedDevices();
|
|
bridgeService.clearPairwisedDevices();
|