|
|
@@ -61,7 +61,7 @@ public class MainMusicActivity extends AppCompatActivity {
|
|
|
private void bindServiceConnection() {
|
|
|
LogUtil.d(TAG,"bindServiceConnection()");
|
|
|
Intent intent = new Intent(MainMusicActivity.this, MusicService.class);
|
|
|
- startService(intent);
|
|
|
+// startService(intent);
|
|
|
bindService(intent, serviceConnection, this.BIND_AUTO_CREATE);
|
|
|
}
|
|
|
|
|
|
@@ -120,12 +120,21 @@ public class MainMusicActivity extends AppCompatActivity {
|
|
|
toolbar.setNavigationOnClickListener(new OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
- onBackPressed();
|
|
|
+// onBackPressed();
|
|
|
+ moveTaskToBack(true);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+ @Override
|
|
|
+ protected void onResume() {
|
|
|
+ super.onResume();
|
|
|
+ Log.d(TAG,"musicService:"+musicService);
|
|
|
+ if (musicService!=null){
|
|
|
+ Log.d(TAG,"musicService mediaPlayer:"+musicService.mediaPlayer);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
private void initViews() {
|
|
|
mLrcView = (com.lg.lrcview_master.LrcView) findViewById(R.id.lrcView);
|
|
|
@@ -237,20 +246,24 @@ public class MainMusicActivity extends AppCompatActivity {
|
|
|
@Override
|
|
|
public void onProgressChanged(SeekBar seekBar, int progress,
|
|
|
boolean fromUser) {
|
|
|
- if(seekBar == mPlayerSeekBar){
|
|
|
- mLrcView.seekTo(progress, true,fromUser);
|
|
|
-// Log.d("timeStr",mLrcView.getmLrcRows().get(0).getTime()+"");
|
|
|
- Log.d("timeStrA",progress+"");
|
|
|
- tv_timeStart.setText(formatTimeFromProgress(progress));
|
|
|
- tv_timeTotal.setText(formatTimeFromProgress(musicService.mediaPlayer.getDuration()));
|
|
|
- if(fromUser){
|
|
|
-
|
|
|
- showPlayerToast(formatTimeFromProgress(progress));
|
|
|
- }
|
|
|
- }else if(seekBar == mLrcSeekBar){
|
|
|
- float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + progress*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
|
|
|
- mLrcView.setLrcScalingFactor(scalingFactor);
|
|
|
- showLrcToast((int)(scalingFactor*100)+"%");
|
|
|
+ try {
|
|
|
+ if(seekBar == mPlayerSeekBar){
|
|
|
+ mLrcView.seekTo(progress, true,fromUser);
|
|
|
+ // Log.d("timeStr",mLrcView.getmLrcRows().get(0).getTime()+"");
|
|
|
+ Log.d("timeStrA",progress+"");
|
|
|
+ tv_timeStart.setText(formatTimeFromProgress(progress));
|
|
|
+ tv_timeTotal.setText(formatTimeFromProgress(musicService.mediaPlayer.getDuration()));
|
|
|
+ if(fromUser){
|
|
|
+
|
|
|
+ showPlayerToast(formatTimeFromProgress(progress));
|
|
|
+ }
|
|
|
+ }else if(seekBar == mLrcSeekBar){
|
|
|
+ float scalingFactor = com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR + progress*(com.lg.lrcview_master.LrcView.MAX_SCALING_FACTOR- com.lg.lrcview_master.LrcView.MIN_SCALING_FACTOR)/100;
|
|
|
+ mLrcView.setLrcScalingFactor(scalingFactor);
|
|
|
+ showLrcToast((int)(scalingFactor*100)+"%");
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
|