Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build bug and fix bug #306

Closed
wants to merge 8 commits into from
Closed

fix build bug and fix bug #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5284ac
Add support StatusBarLyric
ghhccghk Oct 23, 2024
791c980
Merge remote-tracking branch 'origin/beta' into beta
ghhccghk Oct 23, 2024
2a38c59
Add support StatusBarLyric
ghhccghk Oct 23, 2024
481d331
Modify the text to make it more logical
ghhccghk Oct 23, 2024
4432a37
Removed Lyric Getting APi, optimized code logic, added open notificat…
ghhccghk Oct 25, 2024
6df7e9e
update ProGuard rules
ghhccghk Oct 25, 2024
4c23dc2
Merge remote-tracking branch 'origin/beta' into betaa
ghhccghk Oct 25, 2024
acf4ff0
fix build bug and fix bug
ghhccghk Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ import org.akanework.gramophone.logic.utils.LrcUtils.loadAndParseLyricsFile
import org.akanework.gramophone.logic.utils.LrcUtils.loadAndParseLyricsFileLegacy
import org.akanework.gramophone.logic.utils.MediaStoreUtils
import org.akanework.gramophone.logic.utils.SemanticLyrics
import org.akanework.gramophone.logic.utils.convertForLegacy
import org.akanework.gramophone.logic.utils.exoplayer.EndedWorkaroundPlayer
import org.akanework.gramophone.logic.utils.exoplayer.GramophoneMediaSourceFactory
import org.akanework.gramophone.logic.utils.exoplayer.GramophoneRenderFactory
Expand Down Expand Up @@ -795,8 +796,8 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis

fun updateLyrics(parsedLyrics: MutableList<MediaStoreUtils.Lyric>?, parsedLyricsa: SemanticLyrics?) {
if ( parsedLyrics.toString() == "null" ){
lyricsLegacy = SemanticLyrics.convertForLegacy(parsedLyricsa)
adapter?.updateLyrics(lyricsLegacy)
lyrics = parsedLyricsa
adapter?.updateLyrics(lyrics.convertForLegacy())
newView?.updateLyrics(null)
} else {
lyricsLegacy = parsedLyrics
Expand Down
5 changes: 5 additions & 0 deletions .../kotlin/org/akanework/gramophone/ui/fragments/settings/ExperimentalSettingsTopFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ class ExperimentalSettingsTopFragment : BasePreferenceFragment() {

private fun checkAndRequestNotificationPermission() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
if (!isAdded) {
// Fragment 未附着，推迟操作或记录日志
Log.e("Fragment", "Fragment not attached to context yet")
return
}
when {
ActivityCompat.checkSelfPermission(
requireContext(),
Expand Down