3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-08-06 10:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

log error messages

Browse source
This commit is contained in:
badaix 2016-05-06 21:28:59 +02:00
parent 6d5ea1596f
commit f11b5aae41
2 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
View file

@ -1,6 +1,5 @@
package de.badaix.snapcast; package de.badaix.snapcast;
import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -15,6 +14,7 @@ import android.net.nsd.NsdServiceInfo;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@ -30,7 +30,6 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.TextureView;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
@ -65,8 +64,9 @@ public class MainActivity extends AppCompatActivity implements ClientItem.Client
private SnapclientService snapclientService; private SnapclientService snapclientService;
private SectionsPagerAdapter sectionsPagerAdapter; private SectionsPagerAdapter sectionsPagerAdapter;
private TabLayout tabLayout; private TabLayout tabLayout;
private Snackbar wrongSamplerateSnackbar = null; private Snackbar warningSamplerateSnackbar = null;
private int nativeSampleRate = 0; private int nativeSampleRate = 0;
private CoordinatorLayout coordinatorLayout;
/** /**
* The {@link ViewPager} that will host the section contents. * The {@link ViewPager} that will host the section contents.
@ -129,6 +129,7 @@ public class MainActivity extends AppCompatActivity implements ClientItem.Client
// tvInfo.setText("Sample rate: " + rate + ", buffer size: " + size); // tvInfo.setText("Sample rate: " + rate + ", buffer size: " + size);
} }
coordinatorLayout = (CoordinatorLayout) findViewById(R.id.myCoordinatorLayout);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
// Create the adapter that will return a fragment for each of the three // Create the adapter that will return a fragment for each of the three
@ -353,8 +354,8 @@ public class MainActivity extends AppCompatActivity implements ClientItem.Client
public void onPlayerStop(SnapclientService snapclientService) { public void onPlayerStop(SnapclientService snapclientService) {
Log.d(TAG, "onPlayerStop"); Log.d(TAG, "onPlayerStop");
updateStartStopMenuItem(); updateStartStopMenuItem();
if (wrongSamplerateSnackbar != null) if (warningSamplerateSnackbar != null)
wrongSamplerateSnackbar.dismiss(); warningSamplerateSnackbar.dismiss();
} }
@Override @Override
@ -367,27 +368,33 @@ public class MainActivity extends AppCompatActivity implements ClientItem.Client
if (msg.indexOf(':') > 0) { if (msg.indexOf(':') > 0) {
int samplerate = Integer.valueOf(msg.substring(0, msg.indexOf(':'))); int samplerate = Integer.valueOf(msg.substring(0, msg.indexOf(':')));
if (wrongSamplerateSnackbar != null) if (warningSamplerateSnackbar != null)
wrongSamplerateSnackbar.dismiss(); warningSamplerateSnackbar.dismiss();
if ((nativeSampleRate != 0) && (nativeSampleRate != samplerate)) { if ((nativeSampleRate != 0) && (nativeSampleRate != samplerate)) {
wrongSamplerateSnackbar = Snackbar.make(findViewById(R.id.myCoordinatorLayout), warningSamplerateSnackbar = Snackbar.make(coordinatorLayout,
getString(R.string.wrong_sample_rate, samplerate, nativeSampleRate), Snackbar.LENGTH_INDEFINITE); getString(R.string.wrong_sample_rate, samplerate, nativeSampleRate), Snackbar.LENGTH_INDEFINITE);
/* wrongSamplerateSnackbar.setAction(android.R.string.ok, new View.OnClickListener() { /* warningSamplerateSnackbar.setAction(android.R.string.ok, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
wrongSamplerateSnackbar.dismiss(); warningSamplerateSnackbar.dismiss();
} }
}); });
*/ */
wrongSamplerateSnackbar.show(); warningSamplerateSnackbar.show();
} else if (nativeSampleRate == 0) { } else if (nativeSampleRate == 0) {
wrongSamplerateSnackbar = Snackbar.make(findViewById(R.id.myCoordinatorLayout), warningSamplerateSnackbar = Snackbar.make(coordinatorLayout,
getString(R.string.unknown_sample_rate), Snackbar.LENGTH_LONG); getString(R.string.unknown_sample_rate), Snackbar.LENGTH_LONG);
wrongSamplerateSnackbar.show(); warningSamplerateSnackbar.show();
} }
} }
} }
} else if ("err".equals(logClass) || "Emerg".equals(logClass) || "Alert".equals(logClass) || "Crit".equals(logClass) || "Err".equals(logClass)) {
if (warningSamplerateSnackbar != null)
warningSamplerateSnackbar.dismiss();
warningSamplerateSnackbar = Snackbar.make(findViewById(R.id.myCoordinatorLayout),
msg, Snackbar.LENGTH_LONG);
warningSamplerateSnackbar.show();
} }
} }

9
android/Snapcast/src/main/res/layout/dialog_server.xml
View file

@ -73,13 +73,16 @@
</TableRow> </TableRow>
</TableLayout>
<CheckBox <CheckBox
android:id="@+id/checkBoxAutoStart" android:id="@+id/checkBoxAutoStart"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/auto_start"/> android:layout_marginBottom="3dp"
android:layout_marginTop="3dp"
android:text="@string/auto_start"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</TableLayout>
<Button <Button
android:id="@+id/btn_scan" android:id="@+id/btn_scan"