修复json存储播放状态的类型转换错误问题
升级依赖库
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
android:theme="@style/AppTheme"
|
||||
android:usesCleartextTraffic="true">
|
||||
<activity
|
||||
android:screenOrientation="portrait"
|
||||
android:name=".views.OpenActivity"
|
||||
android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
|
||||
<intent-filter>
|
||||
|
||||
@@ -17,6 +17,7 @@ import com.yutou.nas_music_player.tools.AppTools;
|
||||
import com.yutou.nas_music_player.tools.NetworkTool;
|
||||
import com.yutou.nas_music_player.tools.StringUtil;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.palette.graphics.Palette;
|
||||
import androidx.room.ColumnInfo;
|
||||
@@ -81,6 +82,14 @@ public class MusicData {
|
||||
public MusicData() {
|
||||
}
|
||||
|
||||
public void setImg(Bitmap img) {
|
||||
this.img = img;
|
||||
}
|
||||
|
||||
public void setDownloadImg(boolean downloadImg) {
|
||||
isDownloadImg = downloadImg;
|
||||
}
|
||||
|
||||
public String getArtist() {
|
||||
return artist;
|
||||
}
|
||||
@@ -459,4 +468,34 @@ public class MusicData {
|
||||
", md5='" + md5 + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public MusicData clone() {
|
||||
MusicData data=new MusicData();
|
||||
data.setId(id);
|
||||
data.setArtist(artist);
|
||||
data.setAlbum(album);
|
||||
data.setTitle(title);
|
||||
data.setComment(comment);
|
||||
data.setYear(year);
|
||||
data.setTrack(track);
|
||||
data.setDisc_no(disc_no);
|
||||
data.setComposer(composer);
|
||||
data.setArtist_sort(artist_sort);
|
||||
data.setLastDir(lastDir);
|
||||
data.setFile(file);
|
||||
data.setDir(isDir);
|
||||
data.setImg(img);
|
||||
data.setBitRate(bitRate);
|
||||
data.setSampleRate(sampleRate);
|
||||
data.setNoOfSamples(noOfSamples);
|
||||
data.setChannelCount(channelCount);
|
||||
data.setEncodingType(encodingType);
|
||||
data.setDurationAsDouble(durationAsDouble);
|
||||
data.setLossless(lossless);
|
||||
data.setVariableBitRate(variableBitRate);
|
||||
data.setMd5(md5);
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,11 +250,14 @@ public class MusicContainer {
|
||||
}
|
||||
}, 0, 1000);
|
||||
}
|
||||
ConfigTools.getPreferences().edit().putString(ConfigTools.previous_music, JSONObject.toJSONString(data)).apply();
|
||||
MusicData tmp=data.clone();
|
||||
tmp.setImg(null);
|
||||
ConfigTools.getPreferences().edit().putString(ConfigTools.previous_music, JSONObject.toJSONString(tmp)).apply();
|
||||
MediaNotificationManager manager=MediaNotificationManager.getInstance();
|
||||
if(manager!=null){
|
||||
manager.getService().updateNotification();
|
||||
}
|
||||
tmp=null;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user