mirror of
https://github.com/badaix/snapcast.git
synced 2025-07-23 03:17:39 +02:00
Renamed ServerInfo => ServerStatus
This commit is contained in:
parent
ab9ebbaef7
commit
b1d19b0d15
4 changed files with 50 additions and 50 deletions
|
@ -11,7 +11,7 @@ import android.widget.ArrayAdapter;
|
|||
import android.widget.ListView;
|
||||
|
||||
import de.badaix.snapcast.control.ClientInfo;
|
||||
import de.badaix.snapcast.control.ServerInfo;
|
||||
import de.badaix.snapcast.control.ServerStatus;
|
||||
import de.badaix.snapcast.control.Stream;
|
||||
|
||||
|
||||
|
@ -39,7 +39,7 @@ public class ClientListFragment extends Fragment {
|
|||
private OnFragmentInteractionListener mListener;
|
||||
private ClientItem.ClientInfoItemListener clientInfoItemListener;
|
||||
private ClientInfoAdapter clientInfoAdapter;
|
||||
private ServerInfo serverInfo = null;
|
||||
private ServerStatus serverStatus = null;
|
||||
private boolean hideOffline = false;
|
||||
|
||||
public ClientListFragment() {
|
||||
|
@ -78,7 +78,7 @@ public class ClientListFragment extends Fragment {
|
|||
ListView lvClient = (ListView) view.findViewById(R.id.lvClient);
|
||||
clientInfoAdapter = new ClientInfoAdapter(getContext(), clientInfoItemListener);
|
||||
clientInfoAdapter.setHideOffline(hideOffline);
|
||||
clientInfoAdapter.updateServer(serverInfo);
|
||||
clientInfoAdapter.updateServer(serverStatus);
|
||||
lvClient.setAdapter(clientInfoAdapter);
|
||||
return view;
|
||||
}
|
||||
|
@ -108,10 +108,10 @@ public class ClientListFragment extends Fragment {
|
|||
mListener = null;
|
||||
}
|
||||
|
||||
public void updateServer(ServerInfo serverInfo) {
|
||||
this.serverInfo = serverInfo;
|
||||
public void updateServer(ServerStatus serverStatus) {
|
||||
this.serverStatus = serverStatus;
|
||||
if (clientInfoAdapter != null)
|
||||
clientInfoAdapter.updateServer(this.serverInfo);
|
||||
clientInfoAdapter.updateServer(this.serverStatus);
|
||||
}
|
||||
|
||||
public void setHideOffline(boolean hide) {
|
||||
|
@ -149,7 +149,7 @@ public class ClientListFragment extends Fragment {
|
|||
private Context context;
|
||||
private ClientItem.ClientInfoItemListener listener;
|
||||
private boolean hideOffline = false;
|
||||
private ServerInfo serverInfo = new ServerInfo();
|
||||
private ServerStatus serverStatus = new ServerStatus();
|
||||
|
||||
public ClientInfoAdapter(Context context, ClientItem.ClientInfoItemListener listener) {
|
||||
super(context, 0);
|
||||
|
@ -172,9 +172,9 @@ public class ClientListFragment extends Fragment {
|
|||
return clientItem;
|
||||
}
|
||||
|
||||
public void updateServer(final ServerInfo serverInfo) {
|
||||
if (serverInfo != null) {
|
||||
ClientInfoAdapter.this.serverInfo = serverInfo;
|
||||
public void updateServer(final ServerStatus serverStatus) {
|
||||
if (serverStatus != null) {
|
||||
ClientInfoAdapter.this.serverStatus = serverStatus;
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ public class ClientListFragment extends Fragment {
|
|||
@Override
|
||||
public void run() {
|
||||
clear();
|
||||
for (ClientInfo clientInfo : ClientInfoAdapter.this.serverInfo.getClientInfos()) {
|
||||
for (ClientInfo clientInfo : ClientInfoAdapter.this.serverStatus.getClientInfos()) {
|
||||
if ((clientInfo != null) && (!hideOffline || clientInfo.isConnected()) && !clientInfo.isDeleted() && clientInfo.getStream().equals(ClientListFragment.this.stream.getId()))
|
||||
add(clientInfo);
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ import java.util.Vector;
|
|||
|
||||
import de.badaix.snapcast.control.ClientInfo;
|
||||
import de.badaix.snapcast.control.RemoteControl;
|
||||
import de.badaix.snapcast.control.ServerInfo;
|
||||
import de.badaix.snapcast.control.ServerStatus;
|
||||
import de.badaix.snapcast.control.Stream;
|
||||
import de.badaix.snapcast.utils.NsdHelper;
|
||||
import de.badaix.snapcast.utils.Settings;
|
||||
|
@ -64,7 +64,7 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
private int port = 1704;
|
||||
private int controlPort = 1705;
|
||||
private RemoteControl remoteControl = null;
|
||||
private ServerInfo serverInfo = null;
|
||||
private ServerStatus serverStatus = null;
|
||||
private SnapclientService snapclientService;
|
||||
private SectionsPagerAdapter sectionsPagerAdapter;
|
||||
private TabLayout tabLayout;
|
||||
|
@ -459,8 +459,8 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
Log.d(TAG, "new latency: " + clientInfo.getLatency() + ", old latency: " + clientInfoOriginal.getLatency());
|
||||
if (clientInfo.getLatency() != clientInfoOriginal.getLatency())
|
||||
remoteControl.setLatency(clientInfo, clientInfo.getLatency());
|
||||
serverInfo.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
serverStatus.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -485,8 +485,8 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
@Override
|
||||
public void onDisconnected(RemoteControl remoteControl, Exception e) {
|
||||
Log.d(TAG, "onDisconnected");
|
||||
serverInfo = new ServerInfo();
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
serverStatus = new ServerStatus();
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
if (e != null) {
|
||||
if (e instanceof UnknownHostException)
|
||||
setActionbarSubtitle("error: unknown host");
|
||||
|
@ -508,19 +508,19 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
public void onClientEvent(RemoteControl remoteControl, ClientInfo clientInfo, RemoteControl.ClientEvent event) {
|
||||
Log.d(TAG, "onClientEvent: " + event.toString());
|
||||
if (event == RemoteControl.ClientEvent.deleted)
|
||||
serverInfo.removeClient(clientInfo);
|
||||
serverStatus.removeClient(clientInfo);
|
||||
else
|
||||
serverInfo.updateClient(clientInfo);
|
||||
serverStatus.updateClient(clientInfo);
|
||||
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onServerInfo(RemoteControl remoteControl, ServerInfo serverInfo) {
|
||||
this.serverInfo = serverInfo;
|
||||
for (Stream s : serverInfo.getStreams())
|
||||
public void onServerStatus(RemoteControl remoteControl, ServerStatus serverStatus) {
|
||||
this.serverStatus = serverStatus;
|
||||
for (Stream s : serverStatus.getStreams())
|
||||
Log.d(TAG, s.toString());
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
}
|
||||
|
||||
private void setActionbarSubtitle(final String subtitle) {
|
||||
|
@ -598,8 +598,8 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
public void onDeleteClicked(final ClientItem clientItem) {
|
||||
final ClientInfo clientInfo = clientItem.getClientInfo();
|
||||
clientInfo.setDeleted(true);
|
||||
serverInfo.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
serverStatus.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
Snackbar mySnackbar = Snackbar.make(findViewById(R.id.myCoordinatorLayout),
|
||||
getString(R.string.client_deleted, clientInfo.getVisibleName()),
|
||||
Snackbar.LENGTH_SHORT);
|
||||
|
@ -607,8 +607,8 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
@Override
|
||||
public void onClick(View v) {
|
||||
clientInfo.setDeleted(false);
|
||||
serverInfo.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverInfo);
|
||||
serverStatus.updateClient(clientInfo);
|
||||
sectionsPagerAdapter.updateServer(serverStatus);
|
||||
}
|
||||
});
|
||||
mySnackbar.setCallback(new Snackbar.Callback() {
|
||||
|
@ -617,7 +617,7 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
super.onDismissed(snackbar, event);
|
||||
if (event != DISMISS_EVENT_ACTION) {
|
||||
remoteControl.delete(clientInfo);
|
||||
serverInfo.removeClient(clientInfo);
|
||||
serverStatus.removeClient(clientInfo);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -628,7 +628,7 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
public void onPropertiesClicked(ClientItem clientItem) {
|
||||
Intent intent = new Intent(this, ClientSettingsActivity.class);
|
||||
intent.putExtra("client", clientItem.getClientInfo().toJson().toString());
|
||||
intent.putExtra("streams", serverInfo.getJsonStreams().toString());
|
||||
intent.putExtra("streams", serverStatus.getJsonStreams().toString());
|
||||
intent.setFlags(0);
|
||||
startActivityForResult(intent, 1);
|
||||
}
|
||||
|
@ -648,24 +648,24 @@ public class MainActivity extends AppCompatActivity implements ClientListFragmen
|
|||
super(fm);
|
||||
}
|
||||
|
||||
public void updateServer(final ServerInfo serverInfo) {
|
||||
public void updateServer(final ServerStatus serverStatus) {
|
||||
MainActivity.this.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Log.d(TAG, "updateServer: " + serverInfo.getStreams().size());
|
||||
boolean changed = (serverInfo.getStreams().size() != streamCount);
|
||||
Log.d(TAG, "updateServer: " + serverStatus.getStreams().size());
|
||||
boolean changed = (serverStatus.getStreams().size() != streamCount);
|
||||
|
||||
while (serverInfo.getStreams().size() > fragments.size())
|
||||
while (serverStatus.getStreams().size() > fragments.size())
|
||||
fragments.add(ClientListFragment.newInstance("TODO1"));
|
||||
|
||||
for (int i = 0; i < serverInfo.getStreams().size(); ++i) {
|
||||
Log.d(TAG, "updateServer Stream: " + serverInfo.getStreams().get(i).getName());
|
||||
fragments.get(i).setStream(serverInfo.getStreams().get(i));
|
||||
fragments.get(i).updateServer(serverInfo);
|
||||
for (int i = 0; i < serverStatus.getStreams().size(); ++i) {
|
||||
Log.d(TAG, "updateServer Stream: " + serverStatus.getStreams().get(i).getName());
|
||||
fragments.get(i).setStream(serverStatus.getStreams().get(i));
|
||||
fragments.get(i).updateServer(serverStatus);
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
streamCount = serverInfo.getStreams().size();
|
||||
streamCount = serverStatus.getStreams().size();
|
||||
notifyDataSetChanged();
|
||||
tabLayout.setTabsFromPagerAdapter(SectionsPagerAdapter.this);
|
||||
}
|
||||
|
|
|
@ -18,14 +18,14 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
private TcpClient tcpClient;
|
||||
private long msgId;
|
||||
private RemoteControlListener listener;
|
||||
private ServerInfo serverInfo;
|
||||
private ServerStatus serverStatus;
|
||||
private String host;
|
||||
private int port;
|
||||
private HashMap<Long, String> pendingRequests;
|
||||
|
||||
public RemoteControl(RemoteControlListener listener) {
|
||||
this.listener = listener;
|
||||
serverInfo = new ServerInfo();
|
||||
serverStatus = new ServerStatus();
|
||||
msgId = 0;
|
||||
pendingRequests = new HashMap<>();
|
||||
}
|
||||
|
@ -84,9 +84,9 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
Log.e(TAG, "error " + error.getInt("code") + ": " + error.getString("message"));
|
||||
} else if (!TextUtils.isEmpty(request)) {
|
||||
if (request.equals("Server.GetStatus")) {
|
||||
serverInfo.fromJson(json.getJSONObject("result"));
|
||||
serverStatus.fromJson(json.getJSONObject("result"));
|
||||
if (listener != null)
|
||||
listener.onServerInfo(this, serverInfo);
|
||||
listener.onServerStatus(this, serverStatus);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
@ -94,7 +94,7 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
Log.d(TAG, "Notification: " + method);
|
||||
if (method.contains("Client.On")) {
|
||||
final ClientInfo clientInfo = new ClientInfo(json.getJSONObject("params").getJSONObject("data"));
|
||||
// serverInfo.addClient(clientInfo);
|
||||
// serverStatus.addClient(clientInfo);
|
||||
if (listener != null) {
|
||||
ClientEvent event;
|
||||
if (method.equals("Client.OnUpdate"))
|
||||
|
@ -125,7 +125,7 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
@Override
|
||||
public void onConnected(TcpClient tcpClient) {
|
||||
Log.d(TAG, "onConnected");
|
||||
serverInfo = new ServerInfo();
|
||||
serverStatus = new ServerStatus();
|
||||
if (listener != null)
|
||||
listener.onConnected(this);
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
@Override
|
||||
public void onDisconnected(TcpClient tcpClient, Exception e) {
|
||||
Log.d(TAG, "onDisconnected");
|
||||
serverInfo = null;
|
||||
serverStatus = null;
|
||||
if (listener != null)
|
||||
listener.onDisconnected(this, e);
|
||||
}
|
||||
|
@ -229,6 +229,6 @@ public class RemoteControl implements TcpClient.TcpClientListener {
|
|||
|
||||
void onClientEvent(RemoteControl remoteControl, ClientInfo clientInfo, ClientEvent event);
|
||||
|
||||
void onServerInfo(RemoteControl remoteControl, ServerInfo serverInfo);
|
||||
void onServerStatus(RemoteControl remoteControl, ServerStatus serverStatus);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,16 +9,16 @@ import java.util.ArrayList;
|
|||
/**
|
||||
* Created by johannes on 06.01.16.
|
||||
*/
|
||||
public class ServerInfo implements JsonSerialisable {
|
||||
public class ServerStatus implements JsonSerialisable {
|
||||
private ArrayList<ClientInfo> clients = new ArrayList<ClientInfo>();
|
||||
private ArrayList<Stream> streams = new ArrayList<Stream>();
|
||||
private Server server = null;
|
||||
|
||||
public ServerInfo(JSONObject json) {
|
||||
public ServerStatus(JSONObject json) {
|
||||
fromJson(json);
|
||||
}
|
||||
|
||||
public ServerInfo() {
|
||||
public ServerStatus() {
|
||||
}
|
||||
|
||||
@Override
|
Loading…
Add table
Add a link
Reference in a new issue