|
|
@ -8,7 +8,7 @@ import android.view.View; |
|
|
|
import android.widget.Button; |
|
|
|
import android.widget.TextView; |
|
|
|
|
|
|
|
import goRicochetMobile.GoRicochetMobile; |
|
|
|
import od.Od; |
|
|
|
|
|
|
|
public class RemoteActivity extends AppCompatActivity { |
|
|
|
private static final String DEVICE_NAME_KEY = "deviceName"; |
|
|
@ -118,7 +118,7 @@ public class RemoteActivity extends AppCompatActivity { |
|
|
|
private class GetDeviceNameTask extends AsyncTask<Void, Void, String> { |
|
|
|
@Override |
|
|
|
protected String doInBackground(Void... params) { |
|
|
|
String name = GoRicochetMobile.getDeviceName(); |
|
|
|
String name = Od.getDeviceName(); |
|
|
|
return name; |
|
|
|
} |
|
|
|
|
|
|
@ -131,7 +131,7 @@ public class RemoteActivity extends AppCompatActivity { |
|
|
|
private class GetBatteryTask extends AsyncTask<Void, Void, String> { |
|
|
|
@Override |
|
|
|
protected String doInBackground(Void... params) { |
|
|
|
String batteryLevel = GoRicochetMobile.getBatteryLevel(); |
|
|
|
String batteryLevel = Od.getBatteryLevel(); |
|
|
|
return batteryLevel; |
|
|
|
} |
|
|
|
|
|
|
@ -144,7 +144,7 @@ public class RemoteActivity extends AppCompatActivity { |
|
|
|
private class GetLevelTask extends AsyncTask<Void, Void, Integer> { |
|
|
|
@Override |
|
|
|
protected Integer doInBackground(Void... params) { |
|
|
|
Integer vibeLevel = (int) GoRicochetMobile.getVibeLevel(); |
|
|
|
Integer vibeLevel = (int) Od.getVibeLevel(); |
|
|
|
return vibeLevel; |
|
|
|
} |
|
|
|
|
|
|
@ -158,7 +158,7 @@ public class RemoteActivity extends AppCompatActivity { |
|
|
|
@Override |
|
|
|
protected Integer doInBackground(Integer... params) { |
|
|
|
Integer newVibeLevel = params[0]; |
|
|
|
GoRicochetMobile.setVibeLevel(newVibeLevel); |
|
|
|
Od.setVibeLevel(newVibeLevel); |
|
|
|
return newVibeLevel; |
|
|
|
} |
|
|
|
|
|
|
@ -171,7 +171,7 @@ public class RemoteActivity extends AppCompatActivity { |
|
|
|
private class DisconnectTask extends AsyncTask<Void, Void, Void> { |
|
|
|
@Override |
|
|
|
protected Void doInBackground(Void ...params) { |
|
|
|
GoRicochetMobile.odClientDisconnect(); |
|
|
|
Od.odClientDisconnect(); |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|