Skip to content
This repository was archived by the owner on Aug 23, 2024. It is now read-only.

Commit 5d8450b

Browse files
MoriaflyMoriafly
committed
3.12.0-dev01
1 parent 99612c5 commit 5d8450b

File tree

74 files changed

+251
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+251
-267
lines changed

‎.idea/dictionaries/24568.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ dependencies {
9898
implementation 'com.github.team403:DsoKotlinExtensions:1.0.2'
9999
implementation 'com.bitvale:switcher:1.1.1'
100100
implementation 'io.coil-kt:coil:1.4.0'
101-
implementation 'com.android.support:multidex:1.0.3'
102101
implementation 'com.github.chrisbanes.photoview:library:1.2.4'
103102
implementation "com.leinardi.android:speed-dial:3.2.0"
104103
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
tools:ignore="ProtectedPermissions" />
1818

1919
<application
20-
android:name=".MyApp"
20+
android:name=".App"
2121
android:allowBackup="true"
2222
android:icon="@mipmap/ic_launcher"
2323
android:label="@string/app_name"

app/src/main/java/com/dirror/music/MyApp.kt renamed to app/src/main/java/com/dirror/music/App.kt

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import android.os.Build
3232
import android.util.Log
3333
import androidx.annotation.Keep
3434
import androidx.lifecycle.MutableLiveData
35-
import androidx.multidex.MultiDex
3635
import com.dirror.music.manager.ActivityManager
3736
import com.dirror.music.manager.CloudMusicManager
3837
import com.dirror.music.room.AppDatabase
@@ -47,24 +46,23 @@ import java.util.*
4746
import kotlin.coroutines.EmptyCoroutineContext
4847

4948
/**
50-
* 自定义 Application
49+
* Dso Music App
5150
*
5251
* @author Moriafly
53-
* @since 2021年7月13日
52+
* @since 2021-7-13
5453
*/
5554
@Keep
56-
class MyApp : Application() {
55+
@SuppressLint("StaticFieldLeak")
56+
class App : Application() {
5757

5858
companion object {
5959

60-
const val UM_APP_KEY = "5fb38e09257f6b73c0961382"
60+
private val TAG = this::class.java.simpleName
6161

62-
private const val TAG = "MyApp"
62+
const val UM_APP_KEY = "5fb38e09257f6b73c0961382"
6363

6464
lateinit var mmkv: MMKV
6565

66-
/** 注入懒加载 全局 context */
67-
@SuppressLint("StaticFieldLeak")
6866
lateinit var context: Context
6967

7068
var musicController = MutableLiveData<MusicService.MusicController?>()
@@ -78,14 +76,10 @@ class MyApp : Application() {
7876

7977
val coroutineScope = CoroutineScope(EmptyCoroutineContext)
8078

81-
// 数据库
79+
/** 数据库 */
8280
lateinit var appDatabase: AppDatabase
83-
lateinit var realIP: String
84-
}
8581

86-
override fun attachBaseContext(base: Context?) {
87-
super.attachBaseContext(base)
88-
MultiDex.install(this)
82+
lateinit var realIP: String
8983
}
9084

9185
override fun onCreate() {
@@ -106,17 +100,17 @@ class MyApp : Application() {
106100
if (mmkv.decodeBool(Config.DARK_THEME, false)) {
107101
DarkThemeUtil.setDarkTheme(true)
108102
}
109-
realIP = "175.16.1.195"
110103

111-
GlobalScope.launch {
104+
realIP = "175.16.1.195"
105+
coroutineScope.launch {
112106
val lastIP = "LAST_IP"
113-
val lastIPExpiredTime = "LAST_IP_TIME"//过期时间
107+
val lastIPExpiredTime = "LAST_IP_TIME" // 过期时间
114108
val ip = mmkv.decodeString(lastIP, "")
115109
val now = System.currentTimeMillis()
116110
val expiredTime = mmkv.decodeLong(lastIPExpiredTime, now)
117111
if (ip == null || ip.isEmpty() || expiredTime < now) {
118112
Log.i(TAG, "ip is expired.")
119-
realIP = ChineseIPData.getRandomIP(this@MyApp)
113+
realIP = ChineseIPData.getRandomIP(this@App)
120114
mmkv.encode(lastIP, realIP)
121115
mmkv.encode(lastIPExpiredTime, now + 24 * 60 * 60 * 1000)
122116
} else{

‎app/src/main/java/com/dirror/music/adapter/AlbumAdapter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.ListAdapter
1212
import androidx.recyclerview.widget.RecyclerView
1313
import coil.load
1414
import coil.size.ViewSizeResolver
15-
import com.dirror.music.MyApp
15+
import com.dirror.music.App
1616
import com.dirror.music.R
1717
import com.dirror.music.music.standard.data.StandardAlbum
1818
import com.dirror.music.util.dp
@@ -49,7 +49,7 @@ class AlbumAdapter (private val itemClickListener: (StandardAlbum) -> Unit)
4949
val album = getItem(position)
5050
selectPlaylist = album
5151

52-
val url = MyApp.cloudMusicManager.getPicture(album.picUrl, 80.dp())
52+
val url = App.cloudMusicManager.getPicture(album.picUrl, 80.dp())
5353
ivCover.load(url) {
5454
allowHardware(false)
5555
size(ViewSizeResolver(ivCover))

‎app/src/main/java/com/dirror/music/adapter/CommentAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView
1010
import coil.load
1111
import coil.size.ViewSizeResolver
1212
import coil.transform.CircleCropTransformation
13-
import com.dirror.music.MyApp
13+
import com.dirror.music.App
1414
import com.dirror.music.R
1515
import com.dirror.music.data.CommentData
1616
import com.dirror.music.util.msTimeToFormatDate
@@ -47,11 +47,11 @@ class CommentAdapter(private val commentData: CommentData, private val activity:
4747
}
4848

4949
ivCover.setOnClickListener {
50-
MyApp.activityManager.startUserActivity(activity , commentData.hotComments[position].user.userId)
50+
App.activityManager.startUserActivity(activity , commentData.hotComments[position].user.userId)
5151
}
5252

5353
tvName.setOnClickListener {
54-
MyApp.activityManager.startUserActivity(activity , commentData.hotComments[position].user.userId)
54+
App.activityManager.startUserActivity(activity , commentData.hotComments[position].user.userId)
5555
}
5656
}
5757
}

‎app/src/main/java/com/dirror/music/adapter/MyPlaylistAdapter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.ListAdapter
1212
import androidx.recyclerview.widget.RecyclerView
1313
import coil.load
1414
import coil.size.ViewSizeResolver
15-
import com.dirror.music.MyApp
15+
import com.dirror.music.App
1616
import com.dirror.music.R
1717
import com.dirror.music.data.PlaylistData
1818
import com.dirror.music.util.dp
@@ -64,7 +64,7 @@ class MyPlaylistAdapter
6464
// clTrack.background = R.drawable.bg_card_item.asDrawable(clTrack.context)
6565
// }
6666

67-
val url = MyApp.cloudMusicManager.getPicture(playlist.coverImgUrl, 56.dp())
67+
val url = App.cloudMusicManager.getPicture(playlist.coverImgUrl, 56.dp())
6868
ivCover.load(url) {
6969
allowHardware(false)
7070
size(ViewSizeResolver(ivCover))

‎app/src/main/java/com/dirror/music/adapter/NewSongAdapter.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
1111
import androidx.recyclerview.widget.RecyclerView
1212
import coil.load
1313
import coil.size.ViewSizeResolver
14-
import com.dirror.music.MyApp
14+
import com.dirror.music.App
1515
import com.dirror.music.R
1616
import com.dirror.music.music.standard.data.StandardSongData
1717
import com.dirror.music.ui.player.PlayerActivity
@@ -62,9 +62,9 @@ class NewSongAdapter(private val songDataList: ArrayList<StandardSongData>): Rec
6262
*/
6363
private fun playMusic(songData: StandardSongData, view: View?) {
6464
// 歌单相同
65-
if (MyApp.musicController.value?.getPlaylist() == songDataList) {
65+
if (App.musicController.value?.getPlaylist() == songDataList) {
6666
// position 相同
67-
if (songData == MyApp.musicController.value?.getPlayingSongData()?.value) {
67+
if (songData == App.musicController.value?.getPlayingSongData()?.value) {
6868
if (view != null) {
6969
view.context.startActivity(Intent(view.context, PlayerActivity::class.java))
7070
(view.context as Activity).overridePendingTransition(
@@ -73,13 +73,13 @@ class NewSongAdapter(private val songDataList: ArrayList<StandardSongData>): Rec
7373
)
7474
}
7575
} else {
76-
MyApp.musicController.value?.playMusic(songData)
76+
App.musicController.value?.playMusic(songData)
7777
}
7878
} else {
7979
// 设置歌单
80-
MyApp.musicController.value?.setPlaylist(songDataList)
80+
App.musicController.value?.setPlaylist(songDataList)
8181
// 播放歌单
82-
MyApp.musicController.value?.playMusic(songData)
82+
App.musicController.value?.playMusic(songData)
8383
}
8484
}
8585

‎app/src/main/java/com/dirror/music/adapter/PlaylistAdapter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.ListAdapter
1111
import androidx.recyclerview.widget.RecyclerView
1212
import coil.load
1313
import coil.size.ViewSizeResolver
14-
import com.dirror.music.MyApp
14+
import com.dirror.music.App
1515
import com.dirror.music.R
1616
import com.dirror.music.music.standard.data.StandardPlaylist
1717
import com.dirror.music.util.dp
@@ -47,7 +47,7 @@ class PlaylistAdapter (private val itemClickListener: (StandardPlaylist) -> Unit
4747
val playlist = getItem(position)
4848
selectPlaylist = playlist
4949

50-
val url = MyApp.cloudMusicManager.getPicture(playlist.coverImgUrl, 80.dp())
50+
val url = App.cloudMusicManager.getPicture(playlist.coverImgUrl, 80.dp())
5151
ivCover.load(url) {
5252
allowHardware(false)
5353
size(ViewSizeResolver(ivCover))

‎app/src/main/java/com/dirror/music/adapter/PlaylistDialogAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.widget.TextView
77
import androidx.constraintlayout.widget.ConstraintLayout
88
import androidx.core.content.ContextCompat
99
import androidx.recyclerview.widget.RecyclerView
10-
import com.dirror.music.MyApp
10+
import com.dirror.music.App
1111
import com.dirror.music.R
1212
import com.dirror.music.music.standard.data.StandardSongData
1313
import com.dirror.music.util.parseArtist
@@ -30,7 +30,7 @@ class PlaylistDialogAdapter(private val list: ArrayList<StandardSongData>): Recy
3030
}
3131

3232
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
33-
val lightSongData = MyApp.musicController.value?.getPlayingSongData()?.value
33+
val lightSongData = App.musicController.value?.getPlayingSongData()?.value
3434
val songData = list[position]
3535
if (songData == lightSongData) {
3636
holder.tvName.setTextColor(ContextCompat.getColor(holder.tvName.context, R.color.colorAppThemeColor))
@@ -43,7 +43,7 @@ class PlaylistDialogAdapter(private val list: ArrayList<StandardSongData>): Recy
4343
holder.tvName.text = songData.name
4444
holder.tvArtist.text = list[position].artists?.let { parseArtist(it) }
4545
holder.clSong.setOnClickListener {
46-
MyApp.musicController.value?.playMusic(songData)
46+
App.musicController.value?.playMusic(songData)
4747
}
4848
}
4949

0 commit comments

Comments
 (0)