Compare commits
3 Commits
master
...
6dfaf02422
| Author | SHA1 | Date | |
|---|---|---|---|
| 6dfaf02422 | |||
| 72c9ce32c0 | |||
| 0dedeaf301 |
@@ -30,12 +30,16 @@ import java.io.IOException;
|
|||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
|
||||||
public class MusicContainer {
|
public class MusicContainer {
|
||||||
@@ -430,10 +434,10 @@ public class MusicContainer {
|
|||||||
|
|
||||||
public List<MusicData> getPlayList() {
|
public List<MusicData> getPlayList() {
|
||||||
System.out.println("playList.size() = " + playList.size() + " tmpList.size() = " + tmpList.size());
|
System.out.println("playList.size() = " + playList.size() + " tmpList.size() = " + tmpList.size());
|
||||||
if (!tmpList.isEmpty()) {
|
List<MusicData> tmp=new ArrayList<>();
|
||||||
return tmpList;
|
tmp.addAll(tmpList);
|
||||||
}
|
tmp.addAll(playList);
|
||||||
return playList;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ public class AlbumsActivity extends AppCompatActivity {
|
|||||||
breakApp.setOnClickListener(v -> finish());
|
breakApp.setOnClickListener(v -> finish());
|
||||||
playAll.setOnClickListener(v -> {
|
playAll.setOnClickListener(v -> {
|
||||||
MusicContainer.getInstance().setPlayList(new ArrayList<>(adapter.getMusicDatas()));
|
MusicContainer.getInstance().setPlayList(new ArrayList<>(adapter.getMusicDatas()));
|
||||||
MusicContainer.getInstance().playNext();
|
browserHelper.play(adapter.getMusicDatas().get(0));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -409,13 +409,11 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
@Override
|
@Override
|
||||||
public void onSessionDestroyed() {
|
public void onSessionDestroyed() {
|
||||||
super.onSessionDestroyed();
|
super.onSessionDestroyed();
|
||||||
System.out.println("连接被销毁");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onQueueChanged(List<MediaSessionCompat.QueueItem> queue) {
|
public void onQueueChanged(List<MediaSessionCompat.QueueItem> queue) {
|
||||||
super.onQueueChanged(queue);
|
super.onQueueChanged(queue);
|
||||||
System.out.println("不知道是啥变换了");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user