diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index 02dbad8..bf3d00e 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -814,12 +814,11 @@ public void onClick(View _view) { image_play.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View _view) { - /*if (tmservice._isPlaying()) { - tmservice._mpPause(); - tmservice._removeFocus(); + if (zz.isPlaying()) { + zz.requestAction("pause"); } else { - tmservice._requestFocus(); - }*/ + zz.requestAction("resume"); + } } }); @@ -1825,38 +1824,29 @@ public void onItemClick(AdapterView parent, View view, int _pos, long id) { } text_playlist.setVisibility(View.GONE); edittext_search.setVisibility(View.GONE); - text_zryte.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_zene.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesansbold.ttf"), 0); - text_playlist.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_data.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_title.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_artist.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_current.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - text_duration.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - edittext_search.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - _drawer_text_zryte.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_zene.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesansbold.ttf"), 0); - - _drawer_text_user.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_email.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_upload.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_theme.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_themesstr.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_info.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_logcat.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_discord.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_daedit.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); - - _drawer_text_settings.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"), 0); + Typeface tsans = Typeface.createFromAsset(getAssets(), "fonts/googlesans.ttf"); + Typeface tbold = Typeface.createFromAsset(getAssets(), "fonts/googlesansbold.ttf"); + text_zryte.setTypeface(tsans, 0); + text_zene.setTypeface(tbold, 0); + text_playlist.setTypeface(tsans, 0); + text_data.setTypeface(tsans, 0); + text_title.setTypeface(tsans, 0); + text_artist.setTypeface(tsans, 0); + text_current.setTypeface(tsans, 0); + text_duration.setTypeface(tsans, 0); + edittext_search.setTypeface(tsans, 0); + _drawer_text_zryte.setTypeface(tsans, 0); + _drawer_text_zene.setTypeface(tbold, 0); + _drawer_text_user.setTypeface(tsans, 0); + _drawer_text_email.setTypeface(tsans, 0); + _drawer_text_upload.setTypeface(tsans, 0); + _drawer_text_theme.setTypeface(tsans, 0); + _drawer_text_themesstr.setTypeface(tsans, 0); + _drawer_text_info.setTypeface(tsans, 0); + _drawer_text_logcat.setTypeface(tsans, 0); + _drawer_text_discord.setTypeface(tsans, 0); + _drawer_text_daedit.setTypeface(tsans, 0); + _drawer_text_settings.setTypeface(tsans, 0); if (data.getString("taptarget", "").equals("1")) { _NewTapTarget(image_user, "Account", "Click here or by clicking account information on the drawer for accessing your account info & settings", "#2196F3"); } else { @@ -1903,6 +1893,36 @@ public void onReceive(Context context, Intent intent) { String m = intent.getStringExtra("update"); if (m.equals("on-prepared")) { _CoreProgressLoading(false); + zz.setPlaying(true); + zz.setCurrentDuration(0); + zz.setDuration(intent.getIntExtra("data")/1000); + seekbar1.setProgress(0); + seekbar1.setMax(zz.getDuration()); + _showPlayer(); + } else if (m.equals("on-reqmedia")) { + } else if (m.equals("on-tick")) { + zz.setCurrentDuration(intent.getIntExtra("data")); + seekbar1.setProgress(zz.getCurrentDuration()); + } else if (m.equals("on-completion")) { + zz.setPlaying(false); + } else if (m.equals("on-error")) { + zz.addError(intent.getStringExtra("data")); + } else if (m.equals("on-seekerror")) { + } else if (m.equals("on-initialized")) { + } else if (m.equals("on-bufferupdate")) { + zz.setBufferingUpdate(intent.getIntExtra("data")); + } else if (m.equals("request-play")) { + } else if (m.equals("request-pause")) { + zz.setPlaying(false); + } else if (m.equals("request-resume")) { + zz.setPlaying(true); + } else if (m.equals("request-stop")) { + zz.setPlaying(false); + } else if (m.equals("request-seek")) { + zz.setCurrentDuration(intent.getIntExtra("data")/1000); + } else if (m.equals("request-restart")) { + zz.setCurrentDuration(0); + } else if (m.equals("request-reset")) { } } } diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java index 611895a..1ac7412 100644 --- a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -9,19 +9,31 @@ public class ZryteZeneAdaptor { - private boolean isr, isp; - private int cd, bu; + private boolean isr, isp, isi; + private int cd, bu, d; private ArrayList e; private Context ctx; + private String sp, n; public ZryteZeneAdaptor(Context a) { isr = false; isp = false; + isi = false; cd = 0; + d = 0; + bu = 0; e = new ArrayList<>(); ctx = a; } + public void setInitialized(boolean a) { + isi = a; + } + + public boolean isInitialized() { + return isi; + } + public void setRunning(boolean a) { isr = a; } @@ -46,6 +58,14 @@ public int getCurrentDuration() { return cd; } + public void setDuration(int a) { + d = a; + } + + public int getDuration() { + return d; + } + public void setBufferingUpdate(int a) { bu = a; } @@ -80,5 +100,6 @@ public void requestAction(String a, String b) { jof.putExtra("action", a); jof.putExtra("req-data", b); ctx.sendBroadcast(jof); + if (a.equals("play")) sp = b; } } \ No newline at end of file diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index f560bf4..1ce25aa 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -90,7 +90,7 @@ public void onReceive(Context a, Intent b) { ief = new IntentFilter(ACTION_BROADCAST); registerReceiver(br, ief); applyMediaListener(); - tellActivity("Initialization completed"); + tellActivity("on-initialized"); } @Override