From b228b719caff303b83b6e647f32dbd9f6ac3af61 Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Wed, 5 Jun 2024 10:54:38 +0800 Subject: [PATCH] update --- .../com/offline/music/task/player/ProApp.kt | 32 ++++++------- .../music/task/player/db/bean/Category.kt | 2 +- ...ngAudio.kt => CurrentPlayingLocalAudio.kt} | 2 +- ...oDao.kt => CurrentPlayingLocalAudioDao.kt} | 10 ++-- .../db/bean/{Audio.kt => LocalAudio.kt} | 2 +- .../task/player/db/bean/LocalAudioDao.kt | 28 +++++------ ...ResourcesList.kt => LocalResourcesList.kt} | 2 +- .../music/task/player/db/tools/AppDatabase.kt | 4 +- .../player/db/tools/CurrentAudioDatabase.kt | 8 ++-- .../player/db/tools/CurrentAudioManager.kt | 18 ++++---- .../task/player/db/tools/DatabaseManager.kt | 28 +++++------ .../tools/media/MediaControllerManager.kt | 46 +++++++++---------- .../task/player/tools/util/OpenUrlUtil.kt | 2 +- .../player/tools/util/ResourcesMusicUtil.kt | 16 +++---- .../task/player/ui/activity/MainActivity.kt | 14 +++--- .../task/player/ui/activity/PlayerActivity.kt | 26 +++++------ .../player/ui/adapter/HomeRecommendAdapter.kt | 16 +++---- .../ui/adapter/HomeVoiceOfNatureAdapter.kt | 8 ++-- .../ui/adapter/HomeWhiteNoiseAdapter.kt | 8 ++-- .../player/ui/adapter/MeLocalSongAdapter.kt | 18 ++++---- .../task/player/ui/fragment/HomeFragment.kt | 14 +++--- .../task/player/ui/fragment/MeFragment.kt | 14 +++--- 22 files changed, 159 insertions(+), 159 deletions(-) rename app/src/main/java/com/offline/music/task/player/db/bean/{CurrentPlayingAudio.kt => CurrentPlayingLocalAudio.kt} (90%) rename app/src/main/java/com/offline/music/task/player/db/bean/{CurrentPlayingAudioDao.kt => CurrentPlayingLocalAudioDao.kt} (50%) rename app/src/main/java/com/offline/music/task/player/db/bean/{Audio.kt => LocalAudio.kt} (93%) rename app/src/main/java/com/offline/music/task/player/db/bean/{ResourcesList.kt => LocalResourcesList.kt} (77%) diff --git a/app/src/main/java/com/offline/music/task/player/ProApp.kt b/app/src/main/java/com/offline/music/task/player/ProApp.kt index 01fd248..25635b9 100644 --- a/app/src/main/java/com/offline/music/task/player/ProApp.kt +++ b/app/src/main/java/com/offline/music/task/player/ProApp.kt @@ -2,9 +2,9 @@ package com.offline.music.task.player import android.app.Application import android.content.Context -import com.offline.music.task.player.db.bean.Audio -import com.offline.music.task.player.db.bean.CurrentPlayingAudio -import com.offline.music.task.player.db.bean.ResourcesList +import com.offline.music.task.player.db.bean.LocalAudio +import com.offline.music.task.player.db.bean.CurrentPlayingLocalAudio +import com.offline.music.task.player.db.bean.LocalResourcesList import com.offline.music.task.player.db.tools.CurrentAudioManager import com.offline.music.task.player.db.tools.DatabaseManager import com.offline.music.task.player.tools.media.MediaControllerManager @@ -25,20 +25,20 @@ class ProApp : Application() { private set lateinit var databaseManager: DatabaseManager private set - var currentPlayingAudio: CurrentPlayingAudio? = null + var currentPlayingLocalAudio: CurrentPlayingLocalAudio? = null private set - lateinit var importList: List