diff --git a/app/OfflineMusicPlayer.jks b/app/OfflineMusicPlayer.jks new file mode 100644 index 0000000..dc46e9f Binary files /dev/null and b/app/OfflineMusicPlayer.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c7489f2..3c404d3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,19 +13,21 @@ plugins { val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.hi.music.player" + namespace = "com.offline.music.playermp3" compileSdk = 34 defaultConfig { //com.hi.music.player - applicationId = "com.hi.music.player.test1" + applicationId = "com.offline.music.playermp3" minSdk = 23 targetSdk = 34 versionCode = 1 versionName = "1.0.0" - setProperty("archivesBaseName", "MusicApp_V" + versionName + "(${versionCode})_$timestamp") - + setProperty( + "archivesBaseName", + "Offline Music Player" + versionName + "(${versionCode})_$timestamp" + ) testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/google-services.json b/app/google-services.json index c2190eb..c0472f0 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef", "android_client_info": { - "package_name": "com.hi.music.player.test1" + "package_name": "com.offline.music.playermp3" } }, "oauth_client": [], diff --git a/app/keystore.properties b/app/keystore.properties index e447842..6acd881 100644 --- a/app/keystore.properties +++ b/app/keystore.properties @@ -1,6 +1,6 @@ -app_name=Music Player -package_name=com.hi.music.player.test -keystoreFile=app/MusicPlayer.jks -key_alias=MusicPlayerkey0 -key_store_password=MusicPlayer -key_password=MusicPlayer \ No newline at end of file +app_name=Offline Music Player +package_name=com.offline.music.player +keystoreFile=app/OfflineMusicPlayer.jks +key_alias=OfflineMusicPlayerkey0 +key_store_password=OfflineMusicPlayer +key_password=OfflineMusicPlayer \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8993d1b..22fa2d7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -29,7 +29,7 @@ -dontwarn retrofit2.** -dontwarn javax.annotation.Nullable --keep class com.hi.music.player.javabean.A_data.AudioItem { *; } +-keep class com.offline.music.playermp3.javabean.A_data.AudioItem { *; } # 保持 Context、Intent 和权限相关的公共方法 -keep class android.content.Context { *; } diff --git a/app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java index 506e548..fa5d710 100644 --- a/app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.playermp3; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index de2b1d0..f282fca 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/im_logo" + android:icon="@drawable/music_player_launch" android:label="@string/app_name" - android:roundIcon="@mipmap/im_logo" + android:roundIcon="@drawable/music_player_launch" android:supportsRtl="true" android:theme="@style/Theme.MusicApp" tools:targetApi="31"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..a0e5da2 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/hi/music/player/api/onCheckDownload.java b/app/src/main/java/com/hi/music/player/api/onCheckDownload.java deleted file mode 100644 index a1aeed3..0000000 --- a/app/src/main/java/com/hi/music/player/api/onCheckDownload.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.hi.music.player.api; - -import com.hi.music.player.javabean.CustomerDownload; - -public interface onCheckDownload { - void onHasDownload(CustomerDownload customerDownload); -} diff --git a/app/src/main/java/com/hi/music/player/MusicApplication.java b/app/src/main/java/com/offline/music/playermp3/MusicApplication.java similarity index 70% rename from app/src/main/java/com/hi/music/player/MusicApplication.java rename to app/src/main/java/com/offline/music/playermp3/MusicApplication.java index c855d88..70a4a8f 100644 --- a/app/src/main/java/com/hi/music/player/MusicApplication.java +++ b/app/src/main/java/com/offline/music/playermp3/MusicApplication.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.playermp3; import android.app.Application; import android.content.Context; @@ -6,16 +6,14 @@ import android.content.Context; import androidx.annotation.OptIn; import androidx.media3.common.util.UnstableApi; import androidx.media3.database.StandaloneDatabaseProvider; -import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor; -import androidx.media3.datasource.cache.SimpleCache; -import com.hi.music.player.api.MediaControllerStatusListener; -import com.hi.music.player.firebase.RemoteConfigJava; -import com.hi.music.player.firebase.Sp; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.media3.MyDownloadService; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.objectbox.ObjectBoxManager; +import com.offline.music.playermp3.api.MediaControllerStatusListener; +import com.offline.music.playermp3.firebase.RemoteConfigJava; +import com.offline.music.playermp3.firebase.Sp; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.media3.MyDownloadService; +import com.offline.music.playermp3.media3.MyMediaControllerManager; +import com.offline.music.playermp3.objectbox.ObjectBoxManager; public class MusicApplication extends Application { diff --git a/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java similarity index 82% rename from app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java index ed7371b..d3fa31d 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java @@ -1,12 +1,12 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.hi.music.player.ui.fragmnt.A_HomeFragment; -import com.hi.music.player.ui.fragmnt.A_ImportFragment; +import com.offline.music.playermp3.ui.fragmnt.A_HomeFragment; +import com.offline.music.playermp3.ui.fragmnt.A_ImportFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java similarity index 61% rename from app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java index b00ff73..ed9b5c9 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -12,23 +12,24 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.hi.music.player.R; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; - public class A_ImportFragmentAdapter extends RecyclerView.Adapter { private Context context; private List audioFiles = new ArrayList<>(); private AudioItem audioItem; - private OnOptionClickListener onOptionClickListener;; + private OnOptionClickListener onOptionClickListener; + private String newName; - public A_ImportFragmentAdapter(Context context) { + public A_ImportFragmentAdapter(Context context, String newName) { this.context = context; + this.newName = newName; } @NonNull @@ -39,21 +40,31 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter= 0 && position < audioFiles.size()) { audioFiles.get(position).setName(newTitle); // 假设 AudioItem 有一个 setName 方法 @@ -86,12 +102,12 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter { - int position = getBindingAdapterPosition(); - if (position != RecyclerView.NO_POSITION && onOptionClickListener != null) { + int position = getAdapterPosition(); + if (position != RecyclerView.NO_POSITION && onOptionClickListener != null && audioItem != null) { onOptionClickListener.onOptionClick(position, audioItem.getFile(), option); } }); } + + // 添加 bind 方法，将 audioItem 传递给 ViewHolder + public void bind(AudioItem audioItem) { + this.audioItem = audioItem; + } } - } - - diff --git a/app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java index 0e043fd..33aa325 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java index 8e67b8d..f574150 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java index 3067dae..8608d6e 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategory.java similarity index 79% rename from app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategory.java index ba7912d..40fa653 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategory.java @@ -1,27 +1,18 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; -import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemCategoryBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemCategoryBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; public class AdapterCategory extends BaseAdapter{ diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategoryList.java similarity index 83% rename from app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategoryList.java index 3d8d62f..1926b1f 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterCategoryList.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -14,20 +14,15 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.api.onImageColorListener; -import com.hi.music.player.databinding.ItemCategoryListBinding; -import com.hi.music.player.databinding.ItemSingerBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.child.ResponseCategoryListChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemCategoryListBinding; +import com.offline.music.playermp3.databinding.ItemSingerBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; public class AdapterCategoryList extends BaseAdapter { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterDownloadSong.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterDownloadSong.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/AdapterDownloadSong.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterDownloadSong.java index bcbedb4..b363ddb 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterDownloadSong.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterDownloadSong.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -17,12 +17,11 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemLikeSongBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.BoxDownloadSong; -import com.hi.music.player.javabean.BoxLikeSong; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemLikeSongBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.BoxDownloadSong; public class AdapterDownloadSong extends BaseAdapter { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterHome.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterHome.java similarity index 86% rename from app/src/main/java/com/hi/music/player/adapter/AdapterHome.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterHome.java index d395737..2a40683 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterHome.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterHome.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.view.LayoutInflater; import android.view.View; @@ -10,13 +10,13 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.databinding.ItemFooterLoadingBinding; -import com.hi.music.player.databinding.ItemHomeBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseHomeChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.databinding.ItemFooterLoadingBinding; +import com.offline.music.playermp3.databinding.ItemHomeBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.javabean.response.child.ResponseHomeChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterLikeSong.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterLikeSong.java similarity index 88% rename from app/src/main/java/com/hi/music/player/adapter/AdapterLikeSong.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterLikeSong.java index 0ef3cde..0412a8c 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterLikeSong.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterLikeSong.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -12,9 +12,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.OptIn; -import androidx.lifecycle.Observer; import androidx.media3.common.util.UnstableApi; -import androidx.media3.exoplayer.offline.Download; import androidx.media3.exoplayer.offline.DownloadRequest; import androidx.media3.exoplayer.offline.DownloadService; import androidx.recyclerview.widget.RecyclerView; @@ -27,22 +25,20 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; import com.google.gson.Gson; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.api.onCheckDownload; -import com.hi.music.player.databinding.ItemLikeSongBinding; -import com.hi.music.player.databinding.ItemSingerBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.BoxDownloadSong; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.javabean.CustomerDownload; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.media3.MyDownloadService; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.api.onCheckDownload; +import com.offline.music.playermp3.databinding.ItemLikeSongBinding; +import com.offline.music.playermp3.databinding.ItemSingerBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.BoxDownloadSong; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.CustomerDownload; +import com.offline.music.playermp3.javabean.response.ResponsePlayUrl; +import com.offline.music.playermp3.media3.MyDownloadService; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; +import com.offline.music.playermp3.ui.activity.viewmodel.VMApplication; import org.json.JSONObject; @@ -122,7 +118,7 @@ public class AdapterLikeSong extends BaseAdapter() { + RetrofitManager.getInstance().getPlayUrl(videoId, new com.offline.music.playermp3.api.RequestListener() { @Override public void onFail(String errorMsg) { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterPlayList.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterPlayList.java similarity index 86% rename from app/src/main/java/com/hi/music/player/adapter/AdapterPlayList.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterPlayList.java index 28df28d..20177f4 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterPlayList.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterPlayList.java @@ -1,6 +1,4 @@ -package com.hi.music.player.adapter; - -import static androidx.media3.session.legacy.MediaControllerCompat.getMediaController; +package com.offline.music.playermp3.adapter; import android.view.LayoutInflater; import android.view.View; @@ -11,16 +9,12 @@ import androidx.media3.common.MediaItem; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.bumptech.glide.request.RequestOptions; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.api.MediaControllerListener; -import com.hi.music.player.databinding.ItemPlayListBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.media3.MyMediaControllerManager; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemPlayListBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.media3.MyMediaControllerManager; public class AdapterPlayList extends BaseAdapter { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterResult.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResult.java similarity index 85% rename from app/src/main/java/com/hi/music/player/adapter/AdapterResult.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterResult.java index dd47a52..c3325a0 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterResult.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResult.java @@ -1,7 +1,6 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; -import android.content.Intent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,13 +9,10 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.databinding.ItemResultBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.ItemDecoration; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseResultList; -import com.hi.music.player.ui.activity.PlayActivity; +import com.offline.music.playermp3.databinding.ItemResultBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.ItemDecoration; +import com.offline.music.playermp3.javabean.response.ResponseResultList; public class AdapterResult extends BaseAdapter{ public AdapterResult(Context mContext) { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterResultListAlbum.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListAlbum.java similarity index 91% rename from app/src/main/java/com/hi/music/player/adapter/AdapterResultListAlbum.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListAlbum.java index 50139f7..1b4d2f2 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterResultListAlbum.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListAlbum.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -16,11 +16,11 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemResultListAlbumBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemResultListAlbumBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; public class AdapterResultListAlbum extends BaseAdapter{ @Override diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterResultListSong.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListSong.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/AdapterResultListSong.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListSong.java index b005fc8..999df55 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterResultListSong.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterResultListSong.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -16,11 +16,11 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemResultListSongBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemResultListSongBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; public class AdapterResultListSong extends BaseAdapter { @Override diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterSearch.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearch.java similarity index 88% rename from app/src/main/java/com/hi/music/player/adapter/AdapterSearch.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearch.java index 381a982..668e3cc 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterSearch.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearch.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.view.LayoutInflater; import android.view.View; @@ -11,12 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemSearchBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemSearchBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.ResponseSearch; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterSearchChild.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearchChild.java similarity index 86% rename from app/src/main/java/com/hi/music/player/adapter/AdapterSearchChild.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearchChild.java index 4b8d745..d13e715 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterSearchChild.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSearchChild.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -16,13 +16,12 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemSearchBinding; -import com.hi.music.player.databinding.ItemSearchChildBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemSearchBinding; +import com.offline.music.playermp3.databinding.ItemSearchChildBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; public class AdapterSearchChild extends BaseAdapter { @Override diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterSinger.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSinger.java similarity index 89% rename from app/src/main/java/com/hi/music/player/adapter/AdapterSinger.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterSinger.java index 99517ae..42bc759 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterSinger.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSinger.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; @@ -16,11 +16,11 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ItemSingerBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ItemSingerBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; public class AdapterSinger extends BaseAdapter { diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterSuggestion.java b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSuggestion.java similarity index 92% rename from app/src/main/java/com/hi/music/player/adapter/AdapterSuggestion.java rename to app/src/main/java/com/offline/music/playermp3/adapter/AdapterSuggestion.java index 64db4cb..b11f1b2 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterSuggestion.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/AdapterSuggestion.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.view.LayoutInflater; import android.view.View; @@ -7,7 +7,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.hi.music.player.databinding.ItemSuggestionBinding; +import com.offline.music.playermp3.databinding.ItemSuggestionBinding; public class AdapterSuggestion extends BaseAdapter { diff --git a/app/src/main/java/com/hi/music/player/adapter/BaseAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/BaseAdapter.java similarity index 91% rename from app/src/main/java/com/hi/music/player/adapter/BaseAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/BaseAdapter.java index 7483605..7873eb5 100644 --- a/app/src/main/java/com/hi/music/player/adapter/BaseAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/BaseAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,10 +8,8 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.databinding.ItemFooterLoadingBinding; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.ItemFooterLoadingBinding; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/HomeViewPagerAdapter.java similarity index 78% rename from app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/HomeViewPagerAdapter.java index acab625..9992d04 100644 --- a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/HomeViewPagerAdapter.java @@ -1,13 +1,13 @@ -package com.hi.music.player.adapter; +package com.offline.music.playermp3.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.hi.music.player.ui.fragmnt.HomeFragment; -import com.hi.music.player.ui.fragmnt.ProfileFragment; -import com.hi.music.player.ui.fragmnt.SearchFragment; +import com.offline.music.playermp3.ui.fragmnt.HomeFragment; +import com.offline.music.playermp3.ui.fragmnt.ProfileFragment; +import com.offline.music.playermp3.ui.fragmnt.SearchFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/api/HomeItemClickListener.java b/app/src/main/java/com/offline/music/playermp3/api/HomeItemClickListener.java similarity index 75% rename from app/src/main/java/com/hi/music/player/api/HomeItemClickListener.java rename to app/src/main/java/com/offline/music/playermp3/api/HomeItemClickListener.java index d04d97a..e74dc62 100644 --- a/app/src/main/java/com/hi/music/player/api/HomeItemClickListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/HomeItemClickListener.java @@ -1,14 +1,14 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; import androidx.media3.exoplayer.offline.Download; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.javabean.response.ResponseSearch; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; public interface HomeItemClickListener { diff --git a/app/src/main/java/com/hi/music/player/api/LikeSongListener.java b/app/src/main/java/com/offline/music/playermp3/api/LikeSongListener.java similarity index 54% rename from app/src/main/java/com/hi/music/player/api/LikeSongListener.java rename to app/src/main/java/com/offline/music/playermp3/api/LikeSongListener.java index ef28c33..0894b9e 100644 --- a/app/src/main/java/com/hi/music/player/api/LikeSongListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/LikeSongListener.java @@ -1,6 +1,6 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; -import com.hi.music.player.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.BoxLikeSong; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/api/MediaControllerListener.java b/app/src/main/java/com/offline/music/playermp3/api/MediaControllerListener.java similarity index 90% rename from app/src/main/java/com/hi/music/player/api/MediaControllerListener.java rename to app/src/main/java/com/offline/music/playermp3/api/MediaControllerListener.java index 393f5ed..83ffb9a 100644 --- a/app/src/main/java/com/hi/music/player/api/MediaControllerListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/MediaControllerListener.java @@ -1,4 +1,4 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; import androidx.media3.common.MediaItem; diff --git a/app/src/main/java/com/hi/music/player/api/MediaControllerStatusListener.java b/app/src/main/java/com/offline/music/playermp3/api/MediaControllerStatusListener.java similarity index 72% rename from app/src/main/java/com/hi/music/player/api/MediaControllerStatusListener.java rename to app/src/main/java/com/offline/music/playermp3/api/MediaControllerStatusListener.java index 3202399..219aca1 100644 --- a/app/src/main/java/com/hi/music/player/api/MediaControllerStatusListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/MediaControllerStatusListener.java @@ -1,4 +1,4 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; public interface MediaControllerStatusListener { diff --git a/app/src/main/java/com/hi/music/player/api/OnHasUrlAction.java b/app/src/main/java/com/offline/music/playermp3/api/OnHasUrlAction.java similarity index 58% rename from app/src/main/java/com/hi/music/player/api/OnHasUrlAction.java rename to app/src/main/java/com/offline/music/playermp3/api/OnHasUrlAction.java index 6afc635..37c3a26 100644 --- a/app/src/main/java/com/hi/music/player/api/OnHasUrlAction.java +++ b/app/src/main/java/com/offline/music/playermp3/api/OnHasUrlAction.java @@ -1,4 +1,4 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; public interface OnHasUrlAction { void onHasUrl(); diff --git a/app/src/main/java/com/hi/music/player/api/RequestListener.java b/app/src/main/java/com/offline/music/playermp3/api/RequestListener.java similarity index 69% rename from app/src/main/java/com/hi/music/player/api/RequestListener.java rename to app/src/main/java/com/offline/music/playermp3/api/RequestListener.java index 14b687c..7fc4280 100644 --- a/app/src/main/java/com/hi/music/player/api/RequestListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/RequestListener.java @@ -1,9 +1,7 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; import org.json.JSONObject; -import okhttp3.ResponseBody; - public interface RequestListener { void onFail(String errorMsg); diff --git a/app/src/main/java/com/offline/music/playermp3/api/onCheckDownload.java b/app/src/main/java/com/offline/music/playermp3/api/onCheckDownload.java new file mode 100644 index 0000000..0e3af35 --- /dev/null +++ b/app/src/main/java/com/offline/music/playermp3/api/onCheckDownload.java @@ -0,0 +1,7 @@ +package com.offline.music.playermp3.api; + +import com.offline.music.playermp3.javabean.CustomerDownload; + +public interface onCheckDownload { + void onHasDownload(CustomerDownload customerDownload); +} diff --git a/app/src/main/java/com/hi/music/player/api/onImageColorListener.java b/app/src/main/java/com/offline/music/playermp3/api/onImageColorListener.java similarity index 65% rename from app/src/main/java/com/hi/music/player/api/onImageColorListener.java rename to app/src/main/java/com/offline/music/playermp3/api/onImageColorListener.java index 30194d4..c536b76 100644 --- a/app/src/main/java/com/hi/music/player/api/onImageColorListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/onImageColorListener.java @@ -1,4 +1,4 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; public interface onImageColorListener { void onImageColor(int color); diff --git a/app/src/main/java/com/hi/music/player/api/onPlayNextListener.java b/app/src/main/java/com/offline/music/playermp3/api/onPlayNextListener.java similarity index 65% rename from app/src/main/java/com/hi/music/player/api/onPlayNextListener.java rename to app/src/main/java/com/offline/music/playermp3/api/onPlayNextListener.java index 6c9b642..ca18346 100644 --- a/app/src/main/java/com/hi/music/player/api/onPlayNextListener.java +++ b/app/src/main/java/com/offline/music/playermp3/api/onPlayNextListener.java @@ -1,4 +1,4 @@ -package com.hi.music.player.api; +package com.offline.music.playermp3.api; public interface onPlayNextListener { void onPlayNext(boolean hasNext); diff --git a/app/src/main/java/com/hi/music/player/customerview/AnimaPlayingView.java b/app/src/main/java/com/offline/music/playermp3/customerview/AnimaPlayingView.java similarity index 97% rename from app/src/main/java/com/hi/music/player/customerview/AnimaPlayingView.java rename to app/src/main/java/com/offline/music/playermp3/customerview/AnimaPlayingView.java index f3cdc2a..cfac043 100644 --- a/app/src/main/java/com/hi/music/player/customerview/AnimaPlayingView.java +++ b/app/src/main/java/com/offline/music/playermp3/customerview/AnimaPlayingView.java @@ -1,4 +1,4 @@ -package com.hi.music.player.customerview; +package com.offline.music.playermp3.customerview; import android.animation.ValueAnimator; import android.content.Context; @@ -9,7 +9,7 @@ import android.util.AttributeSet; import android.view.View; import android.view.animation.LinearInterpolator; -import com.hi.music.player.helper.CommonUtils; +import com.offline.music.playermp3.helper.CommonUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/dialog/BaseDialog.java b/app/src/main/java/com/offline/music/playermp3/dialog/BaseDialog.java similarity index 95% rename from app/src/main/java/com/hi/music/player/dialog/BaseDialog.java rename to app/src/main/java/com/offline/music/playermp3/dialog/BaseDialog.java index fd87297..88a4a14 100644 --- a/app/src/main/java/com/hi/music/player/dialog/BaseDialog.java +++ b/app/src/main/java/com/offline/music/playermp3/dialog/BaseDialog.java @@ -1,4 +1,4 @@ -package com.hi.music.player.dialog; +package com.offline.music.playermp3.dialog; import android.annotation.SuppressLint; @@ -14,12 +14,10 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; import androidx.viewbinding.ViewBinding; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; +import com.offline.music.playermp3.R; public abstract class BaseDialog extends DialogFragment { diff --git a/app/src/main/java/com/hi/music/player/dialog/DialogPlayList.java b/app/src/main/java/com/offline/music/playermp3/dialog/DialogPlayList.java similarity index 89% rename from app/src/main/java/com/hi/music/player/dialog/DialogPlayList.java rename to app/src/main/java/com/offline/music/playermp3/dialog/DialogPlayList.java index 322e5fe..5f118d9 100644 --- a/app/src/main/java/com/hi/music/player/dialog/DialogPlayList.java +++ b/app/src/main/java/com/offline/music/playermp3/dialog/DialogPlayList.java @@ -1,7 +1,6 @@ -package com.hi.music.player.dialog; +package com.offline.music.playermp3.dialog; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; import android.net.Uri; import android.view.LayoutInflater; import android.view.View; @@ -21,15 +20,14 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterPlayList; -import com.hi.music.player.api.onImageColorListener; -import com.hi.music.player.databinding.DialogPlayListBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.media3.MyControllerView; -import com.hi.music.player.media3.MyMediaControllerManager; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterPlayList; +import com.offline.music.playermp3.api.onImageColorListener; +import com.offline.music.playermp3.databinding.DialogPlayListBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.media3.MyMediaControllerManager; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/firebase/RemoteConfig.kt b/app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfig.kt similarity index 96% rename from app/src/main/java/com/hi/music/player/firebase/RemoteConfig.kt rename to app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfig.kt index 08a6aba..3ca0f77 100644 --- a/app/src/main/java/com/hi/music/player/firebase/RemoteConfig.kt +++ b/app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfig.kt @@ -1,21 +1,19 @@ -package com.hi.music.player.firebase +package com.offline.music.playermp3.firebase -import android.annotation.SuppressLint import android.app.Application import android.content.Context import android.os.Handler import android.os.Looper import android.os.Message import android.text.TextUtils -import android.util.Log import com.google.firebase.remoteconfig.ConfigUpdate import com.google.firebase.remoteconfig.ConfigUpdateListener import com.google.firebase.remoteconfig.FirebaseRemoteConfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigException import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue -import com.hi.music.player.BuildConfig -import com.hi.music.player.helper.CommonUtils +import com.offline.music.playermp3.BuildConfig +import com.offline.music.playermp3.helper.CommonUtils import java.lang.ref.WeakReference diff --git a/app/src/main/java/com/hi/music/player/firebase/RemoteConfigJava.java b/app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfigJava.java similarity index 98% rename from app/src/main/java/com/hi/music/player/firebase/RemoteConfigJava.java rename to app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfigJava.java index c2ea2ac..8ec9e1c 100644 --- a/app/src/main/java/com/hi/music/player/firebase/RemoteConfigJava.java +++ b/app/src/main/java/com/offline/music/playermp3/firebase/RemoteConfigJava.java @@ -1,4 +1,4 @@ -package com.hi.music.player.firebase; +package com.offline.music.playermp3.firebase; import android.content.Context; import android.os.Handler; @@ -17,7 +17,7 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfig; import com.google.firebase.remoteconfig.FirebaseRemoteConfigException; import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings; import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue; -import com.hi.music.player.helper.CommonUtils; +import com.offline.music.playermp3.helper.CommonUtils; import java.lang.ref.WeakReference; import java.util.Map; diff --git a/app/src/main/java/com/hi/music/player/firebase/Sp.java b/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java similarity index 93% rename from app/src/main/java/com/hi/music/player/firebase/Sp.java rename to app/src/main/java/com/offline/music/playermp3/firebase/Sp.java index c0662eb..b74d1d3 100644 --- a/app/src/main/java/com/hi/music/player/firebase/Sp.java +++ b/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java @@ -1,4 +1,4 @@ -package com.hi.music.player.firebase; +package com.offline.music.playermp3.firebase; import android.content.Context; import android.content.SharedPreferences; @@ -39,6 +39,6 @@ public class Sp { } public String getStringValue(String key) { - return preferences.getString(key, RemoteConfigJava.value_open_type_1); + return preferences.getString(key, RemoteConfigJava.value_open_type_0); } } diff --git a/app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java b/app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java similarity index 90% rename from app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java rename to app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java index cc38d3c..d9f9287 100644 --- a/app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java @@ -1,8 +1,8 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import androidx.recyclerview.widget.DiffUtil; -import com.hi.music.player.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.AudioItem; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/hi/music/player/helper/BaseViewModelStoreOwner.java b/app/src/main/java/com/offline/music/playermp3/helper/BaseViewModelStoreOwner.java similarity index 93% rename from app/src/main/java/com/hi/music/player/helper/BaseViewModelStoreOwner.java rename to app/src/main/java/com/offline/music/playermp3/helper/BaseViewModelStoreOwner.java index e11b0f3..6109ea8 100644 --- a/app/src/main/java/com/hi/music/player/helper/BaseViewModelStoreOwner.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/BaseViewModelStoreOwner.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModelStore; diff --git a/app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java b/app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java similarity index 98% rename from app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java rename to app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java index 152f042..42c113c 100644 --- a/app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/hi/music/player/helper/CommonUtils.java b/app/src/main/java/com/offline/music/playermp3/helper/CommonUtils.java similarity index 95% rename from app/src/main/java/com/hi/music/player/helper/CommonUtils.java rename to app/src/main/java/com/offline/music/playermp3/helper/CommonUtils.java index a741e6a..1c3eba5 100644 --- a/app/src/main/java/com/hi/music/player/helper/CommonUtils.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/CommonUtils.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.Context; import android.graphics.Bitmap; @@ -10,36 +10,26 @@ import android.net.Uri; import android.util.DisplayMetrics; import android.util.Log; import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; import androidx.annotation.OptIn; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaMetadata; import androidx.media3.common.util.UnstableApi; -import androidx.media3.datasource.cache.Cache; -import androidx.media3.datasource.cache.CacheEvictor; -import androidx.media3.datasource.cache.CacheSpan; -import androidx.media3.datasource.cache.SimpleCache; import androidx.media3.exoplayer.offline.Download; import androidx.palette.graphics.Palette; import com.google.gson.Gson; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.api.onImageColorListener; -import com.hi.music.player.javabean.BoxDownloadSong; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.api.onImageColorListener; +import com.offline.music.playermp3.javabean.BoxDownloadSong; import org.json.JSONException; import org.json.JSONObject; -import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.NavigableSet; -import java.util.TreeSet; - import okhttp3.ResponseBody; public class CommonUtils { diff --git a/app/src/main/java/com/hi/music/player/helper/ItemDecoration.java b/app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java similarity index 96% rename from app/src/main/java/com/hi/music/player/helper/ItemDecoration.java rename to app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java index 735d63a..9577526 100644 --- a/app/src/main/java/com/hi/music/player/helper/ItemDecoration.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import android.graphics.Rect; import android.view.View; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.hi.music.player.MusicApplication; +import com.offline.music.playermp3.MusicApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/hi/music/player/helper/JsonUtils.java b/app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java similarity index 93% rename from app/src/main/java/com/hi/music/player/helper/JsonUtils.java rename to app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java index 54e9094..66a2051 100644 --- a/app/src/main/java/com/hi/music/player/helper/JsonUtils.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java @@ -1,9 +1,9 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.Context; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.javabean.A_data.Category; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.Category; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/helper/MyValue.java b/app/src/main/java/com/offline/music/playermp3/helper/MyValue.java similarity index 98% rename from app/src/main/java/com/hi/music/player/helper/MyValue.java rename to app/src/main/java/com/offline/music/playermp3/helper/MyValue.java index f216f66..0349ef5 100644 --- a/app/src/main/java/com/hi/music/player/helper/MyValue.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/MyValue.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; public class MyValue { diff --git a/app/src/main/java/com/hi/music/player/helper/SettingUtil.java b/app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java similarity index 98% rename from app/src/main/java/com/hi/music/player/helper/SettingUtil.java rename to app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java index dee09e7..3537b3d 100644 --- a/app/src/main/java/com/hi/music/player/helper/SettingUtil.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.ActivityNotFoundException; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/helper/ViewModelScope.java b/app/src/main/java/com/offline/music/playermp3/helper/ViewModelScope.java similarity index 93% rename from app/src/main/java/com/hi/music/player/helper/ViewModelScope.java rename to app/src/main/java/com/offline/music/playermp3/helper/ViewModelScope.java index ab25ec8..d39af46 100644 --- a/app/src/main/java/com/hi/music/player/helper/ViewModelScope.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/ViewModelScope.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.playermp3.helper; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; @@ -6,8 +6,6 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; -import com.hi.music.player.MusicApplication; - public class ViewModelScope { private ViewModelProvider mFragmentProvider; private ViewModelProvider mActivityProvider; diff --git a/app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java similarity index 94% rename from app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java rename to app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java index 52068db..30ffdbe 100644 --- a/app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.A_data; +package com.offline.music.playermp3.javabean.A_data; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/A_data/Category.java b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java similarity index 90% rename from app/src/main/java/com/hi/music/player/javabean/A_data/Category.java rename to app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java index 4fd9d64..eb44db6 100644 --- a/app/src/main/java/com/hi/music/player/javabean/A_data/Category.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.A_data; +package com.offline.music.playermp3.javabean.A_data; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/BoxDownloadSong.java b/app/src/main/java/com/offline/music/playermp3/javabean/BoxDownloadSong.java similarity index 97% rename from app/src/main/java/com/hi/music/player/javabean/BoxDownloadSong.java rename to app/src/main/java/com/offline/music/playermp3/javabean/BoxDownloadSong.java index 720849c..3a8cbab 100644 --- a/app/src/main/java/com/hi/music/player/javabean/BoxDownloadSong.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/BoxDownloadSong.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean; +package com.offline.music.playermp3.javabean; import io.objectbox.annotation.Entity; import io.objectbox.annotation.Id; diff --git a/app/src/main/java/com/hi/music/player/javabean/BoxLikeSong.java b/app/src/main/java/com/offline/music/playermp3/javabean/BoxLikeSong.java similarity index 97% rename from app/src/main/java/com/hi/music/player/javabean/BoxLikeSong.java rename to app/src/main/java/com/offline/music/playermp3/javabean/BoxLikeSong.java index 4a6612d..44d8a35 100644 --- a/app/src/main/java/com/hi/music/player/javabean/BoxLikeSong.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/BoxLikeSong.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean; +package com.offline.music.playermp3.javabean; import io.objectbox.annotation.Entity; import io.objectbox.annotation.Id; diff --git a/app/src/main/java/com/hi/music/player/javabean/CustomerDownload.java b/app/src/main/java/com/offline/music/playermp3/javabean/CustomerDownload.java similarity index 90% rename from app/src/main/java/com/hi/music/player/javabean/CustomerDownload.java rename to app/src/main/java/com/offline/music/playermp3/javabean/CustomerDownload.java index 1cd40a8..c474be3 100644 --- a/app/src/main/java/com/hi/music/player/javabean/CustomerDownload.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/CustomerDownload.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean; +package com.offline.music.playermp3.javabean; import androidx.media3.exoplayer.offline.Download; diff --git a/app/src/main/java/com/hi/music/player/javabean/CustomerUrlInfo.java b/app/src/main/java/com/offline/music/playermp3/javabean/CustomerUrlInfo.java similarity index 87% rename from app/src/main/java/com/hi/music/player/javabean/CustomerUrlInfo.java rename to app/src/main/java/com/offline/music/playermp3/javabean/CustomerUrlInfo.java index 2cf56fe..c25e538 100644 --- a/app/src/main/java/com/hi/music/player/javabean/CustomerUrlInfo.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/CustomerUrlInfo.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean; +package com.offline.music.playermp3.javabean; -import com.hi.music.player.javabean.response.ResponsePlayUrl; +import com.offline.music.playermp3.javabean.response.ResponsePlayUrl; public class CustomerUrlInfo { diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyHome.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyHome.java similarity index 80% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/BodyHome.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyHome.java index c565ebf..385c167 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyHome.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyHome.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean.requestbody; +package com.offline.music.playermp3.javabean.requestbody; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.javabean.requestbody.child.ContextBody; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlay.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlay.java similarity index 92% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlay.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlay.java index 69881ed..b87fb8a 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlay.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlay.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean.requestbody; +package com.offline.music.playermp3.javabean.requestbody; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.javabean.requestbody.child.ContextBody; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlayUrl.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlayUrl.java similarity index 82% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlayUrl.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlayUrl.java index 1185799..d3ce64b 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodyPlayUrl.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodyPlayUrl.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean.requestbody; +package com.offline.music.playermp3.javabean.requestbody; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.javabean.requestbody.child.ContextBody; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearch.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearch.java similarity index 73% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearch.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearch.java index e9f6e8b..84d7ad4 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearch.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearch.java @@ -1,7 +1,6 @@ -package com.hi.music.player.javabean.requestbody; +package com.offline.music.playermp3.javabean.requestbody; -import com.hi.music.player.javabean.requestbody.child.Client; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.javabean.requestbody.child.ContextBody; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearchSuggestion.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearchSuggestion.java similarity index 73% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearchSuggestion.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearchSuggestion.java index f55b0f2..9d1ae25 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/BodySearchSuggestion.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/BodySearchSuggestion.java @@ -1,7 +1,6 @@ -package com.hi.music.player.javabean.requestbody; +package com.offline.music.playermp3.javabean.requestbody; -import com.hi.music.player.javabean.requestbody.child.Client; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.javabean.requestbody.child.ContextBody; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/child/Client.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/Client.java similarity index 94% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/child/Client.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/Client.java index 0038b66..7583004 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/child/Client.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/Client.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.requestbody.child; +package com.offline.music.playermp3.javabean.requestbody.child; import java.io.Serializable; import java.util.Locale; diff --git a/app/src/main/java/com/hi/music/player/javabean/requestbody/child/ContextBody.java b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/ContextBody.java similarity index 84% rename from app/src/main/java/com/hi/music/player/javabean/requestbody/child/ContextBody.java rename to app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/ContextBody.java index ea476ca..b6bd6b8 100644 --- a/app/src/main/java/com/hi/music/player/javabean/requestbody/child/ContextBody.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/requestbody/child/ContextBody.java @@ -1,7 +1,4 @@ -package com.hi.music.player.javabean.requestbody.child; - -import java.io.Serializable; -import java.util.Locale; +package com.offline.music.playermp3.javabean.requestbody.child; public class ContextBody { diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponseCategoryList.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseCategoryList.java similarity index 91% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponseCategoryList.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseCategoryList.java index f9dc48e..8d4eeec 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponseCategoryList.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseCategoryList.java @@ -1,6 +1,4 @@ -package com.hi.music.player.javabean.response; - -import com.hi.music.player.javabean.response.child.ResponseCategoryListChild; +package com.offline.music.playermp3.javabean.response; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponseHome.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseHome.java similarity index 91% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponseHome.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseHome.java index 03bbd10..77eaa61 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponseHome.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseHome.java @@ -1,8 +1,8 @@ -package com.hi.music.player.javabean.response; +package com.offline.music.playermp3.javabean.response; import androidx.annotation.Nullable; -import com.hi.music.player.javabean.response.child.ResponseHomeChild; +import com.offline.music.playermp3.javabean.response.child.ResponseHomeChild; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayListInfo.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayListInfo.java similarity index 97% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayListInfo.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayListInfo.java index bf72860..e995f0b 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayListInfo.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayListInfo.java @@ -1,6 +1,4 @@ -package com.hi.music.player.javabean.response; - -import com.hi.music.player.helper.MyValue; +package com.offline.music.playermp3.javabean.response; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayUrl.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayUrl.java similarity index 96% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayUrl.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayUrl.java index 9e12f31..3ba479d 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponsePlayUrl.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponsePlayUrl.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response; +package com.offline.music.playermp3.javabean.response; /** diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponseResult.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResult.java similarity index 92% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponseResult.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResult.java index 321e80d..35838b2 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponseResult.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResult.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response; +package com.offline.music.playermp3.javabean.response; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponseResultList.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResultList.java similarity index 79% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponseResultList.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResultList.java index 7a911c8..b09dd9f 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponseResultList.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseResultList.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean.response; +package com.offline.music.playermp3.javabean.response; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/ResponseSearch.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseSearch.java similarity index 93% rename from app/src/main/java/com/hi/music/player/javabean/response/ResponseSearch.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseSearch.java index 4bc5471..56cbe19 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/ResponseSearch.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/ResponseSearch.java @@ -1,6 +1,6 @@ -package com.hi.music.player.javabean.response; +package com.offline.music.playermp3.javabean.response; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategory.java similarity index 97% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategory.java index 7b6bcef..952ccd5 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategory.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategoryListChild.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategoryListChild.java similarity index 93% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategoryListChild.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategoryListChild.java index f55cd89..23e7d69 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategoryListChild.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseCategoryListChild.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; public class ResponseCategoryListChild { private String SongTitle; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseHomeChild.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseHomeChild.java similarity index 92% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseHomeChild.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseHomeChild.java index 948cb31..c3991e2 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseHomeChild.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseHomeChild.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseResultListChild.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseResultListChild.java similarity index 96% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseResultListChild.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseResultListChild.java index f27d3ee..375e46d 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseResultListChild.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseResultListChild.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; public class ResponseResultListChild { private String thumbnail; diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSearchChild.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSearchChild.java similarity index 95% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSearchChild.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSearchChild.java index 6438aba..aca23e4 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSearchChild.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSearchChild.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; public class ResponseSearchChild { diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSingle.java b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSingle.java similarity index 96% rename from app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSingle.java rename to app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSingle.java index 7f02462..95d659d 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseSingle.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/response/child/ResponseSingle.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.response.child; +package com.offline.music.playermp3.javabean.response.child; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/media3/DynamicMediaSourceFactory.java b/app/src/main/java/com/offline/music/playermp3/media3/DynamicMediaSourceFactory.java similarity index 85% rename from app/src/main/java/com/hi/music/player/media3/DynamicMediaSourceFactory.java rename to app/src/main/java/com/offline/music/playermp3/media3/DynamicMediaSourceFactory.java index 2707a15..decd321 100644 --- a/app/src/main/java/com/hi/music/player/media3/DynamicMediaSourceFactory.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/DynamicMediaSourceFactory.java @@ -1,37 +1,15 @@ -package com.hi.music.player.media3; - -import android.net.Uri; +package com.offline.music.playermp3.media3; import androidx.media3.common.MediaItem; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DataSource; -import androidx.media3.datasource.DataSpec; -import androidx.media3.datasource.DefaultDataSource; -import androidx.media3.datasource.DefaultDataSourceFactory; -import androidx.media3.datasource.DefaultHttpDataSource; -import androidx.media3.datasource.ResolvingDataSource; -import androidx.media3.datasource.cache.CacheDataSource; import androidx.media3.datasource.cache.SimpleCache; -import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; -import androidx.media3.exoplayer.source.DefaultMediaSourceFactory; import androidx.media3.exoplayer.source.MediaSource; -import androidx.media3.exoplayer.source.MediaSourceFactory; import androidx.media3.exoplayer.source.ProgressiveMediaSource; import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; - -import org.json.JSONObject; - -import java.io.IOException; - -import okhttp3.ResponseBody; +import com.offline.music.playermp3.helper.CommonUtils; public class DynamicMediaSourceFactory implements MediaSource.Factory { diff --git a/app/src/main/java/com/hi/music/player/media3/MyControllerView.java b/app/src/main/java/com/offline/music/playermp3/media3/MyControllerView.java similarity index 86% rename from app/src/main/java/com/hi/music/player/media3/MyControllerView.java rename to app/src/main/java/com/offline/music/playermp3/media3/MyControllerView.java index 4ed458f..de36a41 100644 --- a/app/src/main/java/com/hi/music/player/media3/MyControllerView.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyControllerView.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/media3/MyDownloadCacheManager.java b/app/src/main/java/com/offline/music/playermp3/media3/MyDownloadCacheManager.java similarity index 90% rename from app/src/main/java/com/hi/music/player/media3/MyDownloadCacheManager.java rename to app/src/main/java/com/offline/music/playermp3/media3/MyDownloadCacheManager.java index 4f3b0e6..8202ab4 100644 --- a/app/src/main/java/com/hi/music/player/media3/MyDownloadCacheManager.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyDownloadCacheManager.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.content.Context; @@ -8,7 +8,7 @@ import androidx.media3.database.StandaloneDatabaseProvider; import androidx.media3.datasource.cache.NoOpCacheEvictor; import androidx.media3.datasource.cache.SimpleCache; -import com.hi.music.player.MusicApplication; +import com.offline.music.playermp3.MusicApplication; import java.io.File; diff --git a/app/src/main/java/com/hi/music/player/media3/MyDownloadService.java b/app/src/main/java/com/offline/music/playermp3/media3/MyDownloadService.java similarity index 95% rename from app/src/main/java/com/hi/music/player/media3/MyDownloadService.java rename to app/src/main/java/com/offline/music/playermp3/media3/MyDownloadService.java index 68b8e7e..8fee5f2 100644 --- a/app/src/main/java/com/hi/music/player/media3/MyDownloadService.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyDownloadService.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.app.Notification; import android.content.Context; @@ -18,11 +18,11 @@ import androidx.media3.exoplayer.offline.DownloadNotificationHelper; import androidx.media3.exoplayer.offline.DownloadService; import androidx.media3.exoplayer.scheduler.Scheduler; -import com.hi.music.player.R; -import com.hi.music.player.api.onCheckDownload; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.CustomerDownload; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.api.onCheckDownload; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.CustomerDownload; +import com.offline.music.playermp3.ui.activity.viewmodel.VMApplication; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/media3/MyMediaControllerManager.java b/app/src/main/java/com/offline/music/playermp3/media3/MyMediaControllerManager.java similarity index 94% rename from app/src/main/java/com/hi/music/player/media3/MyMediaControllerManager.java rename to app/src/main/java/com/offline/music/playermp3/media3/MyMediaControllerManager.java index 1364be9..6d0a7f1 100644 --- a/app/src/main/java/com/hi/music/player/media3/MyMediaControllerManager.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyMediaControllerManager.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.content.ComponentName; import android.net.Uri; @@ -15,21 +15,20 @@ import androidx.media3.session.SessionToken; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.api.MediaControllerListener; -import com.hi.music.player.api.MediaControllerStatusListener; -import com.hi.music.player.api.OnHasUrlAction; -import com.hi.music.player.api.onCheckDownload; -import com.hi.music.player.api.onPlayNextListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.CustomerDownload; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.network.RetrofitManager; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.api.MediaControllerListener; +import com.offline.music.playermp3.api.MediaControllerStatusListener; +import com.offline.music.playermp3.api.OnHasUrlAction; +import com.offline.music.playermp3.api.onCheckDownload; +import com.offline.music.playermp3.api.onPlayNextListener; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.CustomerDownload; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.javabean.response.ResponsePlayUrl; +import com.offline.music.playermp3.network.RetrofitManager; +import com.offline.music.playermp3.ui.activity.viewmodel.VMApplication; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/app/src/main/java/com/hi/music/player/media3/MyPlayCacheManager.java b/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java similarity index 96% rename from app/src/main/java/com/hi/music/player/media3/MyPlayCacheManager.java rename to app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java index ba86e5e..9cdb9f4 100644 --- a/app/src/main/java/com/hi/music/player/media3/MyPlayCacheManager.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/media3/PlaybackService.java b/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java similarity index 96% rename from app/src/main/java/com/hi/music/player/media3/PlaybackService.java rename to app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java index ec2f200..6a1930c 100644 --- a/app/src/main/java/com/hi/music/player/media3/PlaybackService.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java @@ -1,4 +1,4 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; import android.content.Context; import android.content.Intent; @@ -14,21 +14,17 @@ import androidx.media3.datasource.DataSpec; import androidx.media3.datasource.DefaultDataSource; import androidx.media3.datasource.DefaultHttpDataSource; import androidx.media3.datasource.ResolvingDataSource; -import androidx.media3.datasource.TransferListener; import androidx.media3.datasource.cache.CacheDataSource; import androidx.media3.datasource.cache.SimpleCache; import androidx.media3.exoplayer.DefaultLoadControl; import androidx.media3.exoplayer.ExoPlayer; -import androidx.media3.exoplayer.source.DefaultMediaSourceFactory; import androidx.media3.exoplayer.source.MediaSource; import androidx.media3.exoplayer.source.ProgressiveMediaSource; import androidx.media3.session.MediaSession; import androidx.media3.session.MediaSessionService; -import com.hi.music.player.helper.CommonUtils; - -import java.io.IOException; +import com.offline.music.playermp3.helper.CommonUtils; public class PlaybackService extends MediaSessionService { private MediaSession mediaSession = null; diff --git a/app/src/main/java/com/hi/music/player/media3/testSourceFactory.java b/app/src/main/java/com/offline/music/playermp3/media3/testSourceFactory.java similarity index 88% rename from app/src/main/java/com/hi/music/player/media3/testSourceFactory.java rename to app/src/main/java/com/offline/music/playermp3/media3/testSourceFactory.java index cbea816..0bfd8a4 100644 --- a/app/src/main/java/com/hi/music/player/media3/testSourceFactory.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/testSourceFactory.java @@ -1,14 +1,8 @@ -package com.hi.music.player.media3; +package com.offline.music.playermp3.media3; -import androidx.media3.common.MediaItem; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.DataSource; -import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; import androidx.media3.exoplayer.source.DefaultMediaSourceFactory; -import androidx.media3.exoplayer.source.MediaSource; -import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy; - -import com.hi.music.player.helper.CommonUtils; public class testSourceFactory implements DataSource.Factory { diff --git a/app/src/main/java/com/hi/music/player/network/JsonHelper.java b/app/src/main/java/com/offline/music/playermp3/network/JsonHelper.java similarity index 97% rename from app/src/main/java/com/hi/music/player/network/JsonHelper.java rename to app/src/main/java/com/offline/music/playermp3/network/JsonHelper.java index 711504a..0e2e174 100644 --- a/app/src/main/java/com/hi/music/player/network/JsonHelper.java +++ b/app/src/main/java/com/offline/music/playermp3/network/JsonHelper.java @@ -1,26 +1,25 @@ -package com.hi.music.player.network; +package com.offline.music.playermp3.network; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseCategoryList; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.javabean.response.ResponseResult; -import com.hi.music.player.javabean.response.ResponseResultList; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.ResponseHome; -import com.hi.music.player.javabean.response.child.ResponseHomeChild; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponseCategoryList; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.javabean.response.ResponsePlayUrl; +import com.offline.music.playermp3.javabean.response.ResponseResult; +import com.offline.music.playermp3.javabean.response.ResponseResultList; +import com.offline.music.playermp3.javabean.response.ResponseSearch; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.javabean.response.ResponseHome; +import com.offline.music.playermp3.javabean.response.child.ResponseHomeChild; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/hi/music/player/network/MusicApi.java b/app/src/main/java/com/offline/music/playermp3/network/MusicApi.java similarity index 98% rename from app/src/main/java/com/hi/music/player/network/MusicApi.java rename to app/src/main/java/com/offline/music/playermp3/network/MusicApi.java index eb0fc1a..146dbbb 100644 --- a/app/src/main/java/com/hi/music/player/network/MusicApi.java +++ b/app/src/main/java/com/offline/music/playermp3/network/MusicApi.java @@ -1,10 +1,9 @@ -package com.hi.music.player.network; +package com.offline.music.playermp3.network; import io.reactivex.Observable; import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.http.Body; -import retrofit2.http.GET; import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.POST; diff --git a/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java b/app/src/main/java/com/offline/music/playermp3/network/ObserverWrapper.java similarity index 90% rename from app/src/main/java/com/hi/music/player/network/ObserverWrapper.java rename to app/src/main/java/com/offline/music/playermp3/network/ObserverWrapper.java index a167e23..c931651 100644 --- a/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java +++ b/app/src/main/java/com/offline/music/playermp3/network/ObserverWrapper.java @@ -1,7 +1,7 @@ -package com.hi.music.player.network; +package com.offline.music.playermp3.network; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.helper.CommonUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/network/RetrofitManager.java b/app/src/main/java/com/offline/music/playermp3/network/RetrofitManager.java similarity index 93% rename from app/src/main/java/com/hi/music/player/network/RetrofitManager.java rename to app/src/main/java/com/offline/music/playermp3/network/RetrofitManager.java index e99bde6..d664068 100644 --- a/app/src/main/java/com/hi/music/player/network/RetrofitManager.java +++ b/app/src/main/java/com/offline/music/playermp3/network/RetrofitManager.java @@ -1,15 +1,14 @@ -package com.hi.music.player.network; +package com.offline.music.playermp3.network; import com.google.gson.Gson; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.javabean.requestbody.BodyHome; -import com.hi.music.player.javabean.requestbody.BodyPlay; -import com.hi.music.player.javabean.requestbody.BodyPlayUrl; -import com.hi.music.player.javabean.requestbody.BodySearch; -import com.hi.music.player.javabean.requestbody.BodySearchSuggestion; -import com.hi.music.player.javabean.requestbody.child.Client; -import com.hi.music.player.javabean.requestbody.child.ContextBody; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.javabean.requestbody.BodyHome; +import com.offline.music.playermp3.javabean.requestbody.BodyPlay; +import com.offline.music.playermp3.javabean.requestbody.BodyPlayUrl; +import com.offline.music.playermp3.javabean.requestbody.BodySearch; +import com.offline.music.playermp3.javabean.requestbody.BodySearchSuggestion; +import com.offline.music.playermp3.javabean.requestbody.child.Client; import java.util.HashMap; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/hi/music/player/objectbox/ObjectBoxManager.java b/app/src/main/java/com/offline/music/playermp3/objectbox/ObjectBoxManager.java similarity index 91% rename from app/src/main/java/com/hi/music/player/objectbox/ObjectBoxManager.java rename to app/src/main/java/com/offline/music/playermp3/objectbox/ObjectBoxManager.java index b61d67e..9616e80 100644 --- a/app/src/main/java/com/hi/music/player/objectbox/ObjectBoxManager.java +++ b/app/src/main/java/com/offline/music/playermp3/objectbox/ObjectBoxManager.java @@ -1,14 +1,14 @@ -package com.hi.music.player.objectbox; +package com.offline.music.playermp3.objectbox; import android.content.Context; import androidx.annotation.NonNull; -import com.hi.music.player.api.LikeSongListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.javabean.BoxLikeSong_; -import com.hi.music.player.javabean.MyObjectBox; +import com.offline.music.playermp3.api.LikeSongListener; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.BoxLikeSong_; +import com.offline.music.playermp3.javabean.MyObjectBox; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java b/app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java similarity index 95% rename from app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java rename to app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java index bc956c0..69e5788 100644 --- a/app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java +++ b/app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java @@ -1,4 +1,4 @@ -package com.hi.music.player.service; +package com.offline.music.playermp3.service; import android.app.Notification; import android.app.NotificationChannel; @@ -24,9 +24,9 @@ import androidx.core.app.NotificationCompat; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.hi.music.player.R; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.io.File; import java.io.IOException; @@ -101,8 +101,8 @@ public class MusicPlayerForegroundService extends Service { Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_IMMUTABLE : 0); // 适配Android 12 return new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("正在播放音频") // 通知标题 - .setContentText("您的音频正在播放") // 通知内容 + .setContentTitle("Playing audio") // 通知标题 + .setContentText("Your audio is playing") // 通知内容 .setSmallIcon(R.drawable.home_select) // 小图标 .setContentIntent(pendingIntent) // 点击通知的Intent .setPriority(NotificationCompat.PRIORITY_LOW) // 低优先级 @@ -113,7 +113,7 @@ public class MusicPlayerForegroundService extends Service { private void createNotificationChannel() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel serviceChannel = new NotificationChannel( - CHANNEL_ID, "音乐播放器频道", NotificationManager.IMPORTANCE_LOW); + CHANNEL_ID, "Music player channel", NotificationManager.IMPORTANCE_LOW); NotificationManager manager = getSystemService(NotificationManager.class); if (manager != null) { manager.createNotificationChannel(serviceChannel); // 创建渠道 @@ -190,7 +190,7 @@ public class MusicPlayerForegroundService extends Service { if (afd != null) { mediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength()); // 设置数据源 } else { - throw new IOException("无法打开内容URI: " + path); + throw new IOException("Unable to open the content URI: " + path); } } catch (SecurityException e) { Log.e("MusicPlayerService", "权限被拒绝，无法访问内容URI: " + path, e); @@ -208,7 +208,7 @@ public class MusicPlayerForegroundService extends Service { if (file.exists()) { mediaPlayer.setDataSource(file.getAbsolutePath()); // 从文件加载 } else { - throw new IOException("文件未找到: " + path); + throw new IOException("File not found: " + path); } } } @@ -225,7 +225,7 @@ public class MusicPlayerForegroundService extends Service { return (dotIndex > 0) ? fileName.substring(0, dotIndex) : fileName; } catch (Exception e) { Log.e("MusicPlayerService", "获取文件名失败", e); - return "未知文件"; // 默认文件名 + return "Unknown file"; // 默认文件名 } } @@ -249,7 +249,7 @@ public class MusicPlayerForegroundService extends Service { } else { pauseAudio(); // 时间到，暂停音乐 isPlaying.postValue(false); // 更新播放状态 - Toast.makeText(getApplicationContext(), "定时器结束", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "Timer end", Toast.LENGTH_SHORT).show(); stopTimer(); // 时间到，结束计时器 } } diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java similarity index 95% rename from app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java index dba4520..b36c8af 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java @@ -1,24 +1,22 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.os.Handler; import android.os.IBinder; -import android.os.Looper; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.hi.music.player.R; -import com.hi.music.player.adapter.A_HomeViewPagerAdapter; -import com.hi.music.player.databinding.ActivityAhomeBinding; -import com.hi.music.player.databinding.HomeTabCustomBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.service.MusicPlayerForegroundService; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.A_HomeViewPagerAdapter; +import com.offline.music.playermp3.databinding.ActivityAhomeBinding; +import com.offline.music.playermp3.databinding.HomeTabCustomBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.service.MusicPlayerForegroundService; import java.util.Locale; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java similarity index 94% rename from app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java index 0fca300..5fa67aa 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.ComponentName; import android.content.Context; @@ -11,7 +11,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.IBinder; -import android.os.Looper; import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; @@ -22,7 +21,6 @@ import android.view.View; import android.widget.RadioGroup; import android.widget.SeekBar; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -32,10 +30,10 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ActivityAplayBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.service.MusicPlayerForegroundService; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ActivityAplayBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.service.MusicPlayerForegroundService; import java.util.ArrayList; import java.util.List; @@ -59,6 +57,7 @@ public class A_PlayActivity extends BaseActivity { // 设置观察者 musicService.getIsPlaying().observe(A_PlayActivity.this, this::updatePlayButton); + musicService.getFileName().observe(A_PlayActivity.this, vb.songTitle::setText); // 更新进度条和时间 @@ -100,6 +99,10 @@ public class A_PlayActivity extends BaseActivity { loadBackgroundPreference(); // 加载之前保存的背景状态 + updateSeekBarAndTime(); + if (musicService != null) { + musicService.startUpdatingProgress(); + } // 从Intent获取音频项 AudioItem audioItem = (AudioItem) getIntent().getSerializableExtra("Path"); @@ -108,6 +111,8 @@ public class A_PlayActivity extends BaseActivity { return; } + Log.d("paly","-----" +audioItem.getName()); + Glide.with(this) .load("file:///android_asset/" + audioItem.getImage()) .placeholder(R.mipmap.playing_background) // 默认图片 @@ -120,7 +125,7 @@ public class A_PlayActivity extends BaseActivity { @Override public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { // 对图片进行高斯模糊处理 - Bitmap blurredBitmap = blurBitmap(A_PlayActivity.this, resource,5); + Bitmap blurredBitmap = blurBitmap(A_PlayActivity.this, resource, 5); // 将模糊后的图片作为背景设置到 vb.topContainer Drawable blurredDrawable = new BitmapDrawable(getResources(), blurredBitmap); @@ -134,7 +139,6 @@ public class A_PlayActivity extends BaseActivity { }); - startMusicService(audioItem); // 启动音乐服务 setupPlayButtonClickListener(); // 设置播放按钮的点击事件 @@ -210,21 +214,21 @@ public class A_PlayActivity extends BaseActivity { // 更新进度条和时间显示 private void updateSeekBarAndTime() { - if (isBound && musicService != null) { + if (isBound && musicService!= null) { // 观察当前播放进度 musicService.getCurrentPositionLiveData().observe(this, position -> { - if (musicService.getDurationLiveData().getValue() != null) { - int duration = musicService.getDurationLiveData().getValue(); - if (duration > 0) { - vb.songSeekbar.setProgress((int) ((position / (float) duration) * 100)); - vb.current.setText(formatTime(position)); - } + Integer duration = musicService.getDurationLiveData().getValue(); + if (duration!= null && duration > 0) { + vb.songSeekbar.setProgress((int) ((position / (float) duration) * 100)); + vb.current.setText(formatTime(position)); } }); // 观察音频总时长 musicService.getDurationLiveData().observe(this, duration -> { - vb.time.setText(formatTime(duration)); + if (duration!= null) { + vb.time.setText(formatTime(duration)); + } }); } } @@ -279,7 +283,6 @@ public class A_PlayActivity extends BaseActivity { } - // 保存背景状态到SharedPreferences private void saveBackgroundPreference() { SharedPreferences sharedPreferences = getSharedPreferences("AppPreferences", MODE_PRIVATE); diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java similarity index 82% rename from app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java index 3d38618..8d8c0c2 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java @@ -1,9 +1,9 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.view.View; -import com.hi.music.player.databinding.ActivityAsettingBinding; -import com.hi.music.player.helper.SettingUtil; +import com.offline.music.playermp3.databinding.ActivityAsettingBinding; +import com.offline.music.playermp3.helper.SettingUtil; public class A_SettingActivity extends BaseActivity { @@ -40,6 +40,10 @@ public class A_SettingActivity extends BaseActivity { SettingUtil.openTermsOfService(this); }); + vb.back.setOnClickListener(v -> { + finish(); + }); + } diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java similarity index 87% rename from app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java index 8f435f8..f6bc5f4 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java @@ -1,12 +1,12 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.os.CountDownTimer; import android.view.View; -import com.hi.music.player.databinding.ActivityAsplashBinding; -import com.hi.music.player.firebase.RemoteConfigJava; -import com.hi.music.player.firebase.Sp; +import com.offline.music.playermp3.databinding.ActivityAsplashBinding; +import com.offline.music.playermp3.firebase.RemoteConfigJava; +import com.offline.music.playermp3.firebase.Sp; public class A_SplashActivity extends BaseActivity { @@ -46,7 +46,7 @@ public class A_SplashActivity extends BaseActivity { return false; } - public void intData(){ + public void intData() { countDownTimer = new CountDownTimer(SPLASH_TIME_OUT, 100) { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java similarity index 93% rename from app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java index 35d24e9..f111a12 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.net.Uri; @@ -25,16 +25,16 @@ import androidx.viewbinding.ViewBinding; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.api.onPlayNextListener; -import com.hi.music.player.databinding.ActivityBaseBinding; -import com.hi.music.player.databinding.LayoutPanelBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.helper.ViewModelScope; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.api.onPlayNextListener; +import com.offline.music.playermp3.databinding.ActivityBaseBinding; +import com.offline.music.playermp3.databinding.LayoutPanelBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.helper.ViewModelScope; +import com.offline.music.playermp3.media3.MyMediaControllerManager; +import com.offline.music.playermp3.ui.activity.viewmodel.VMApplication; public abstract class BaseActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/CategoryListActivity.java similarity index 86% rename from app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/CategoryListActivity.java index 4644a37..06b2a97 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/CategoryListActivity.java @@ -1,48 +1,34 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import static com.bumptech.glide.request.RequestOptions.bitmapTransform; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.OptIn; -import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.media3.common.util.UnstableApi; import androidx.recyclerview.widget.LinearLayoutManager; -import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; -import android.os.Bundle; import android.view.View; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterCategoryList; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.api.onImageColorListener; -import com.hi.music.player.databinding.ActivityCategoryListBinding; -import com.hi.music.player.databinding.ActivityHomeBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseCategoryList; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; -import com.hi.music.player.ui.fragmnt.viewmodel.VMCategoryList; -import com.hi.music.player.ui.fragmnt.viewmodel.VMHome; - -import java.io.Serializable; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterCategoryList; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.ActivityCategoryListBinding; +import com.offline.music.playermp3.databinding.ActivityHomeBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponseCategoryList; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.VMCategoryList; import jp.wasabeef.glide.transformations.BlurTransformation; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/HomeActivity.java similarity index 91% rename from app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/HomeActivity.java index a8822e6..b2937e9 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/HomeActivity.java @@ -1,6 +1,5 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; -import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -8,12 +7,12 @@ import androidx.core.content.ContextCompat; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.adapter.HomeViewPagerAdapter; -import com.hi.music.player.databinding.ActivityHomeBinding; -import com.hi.music.player.databinding.HomeTabCustomBinding; -import com.hi.music.player.helper.CommonUtils; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.HomeViewPagerAdapter; +import com.offline.music.playermp3.databinding.ActivityHomeBinding; +import com.offline.music.playermp3.databinding.HomeTabCustomBinding; +import com.offline.music.playermp3.helper.CommonUtils; public class HomeActivity extends BaseActivity { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/LikeSongActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/LikeSongActivity.java similarity index 89% rename from app/src/main/java/com/hi/music/player/ui/activity/LikeSongActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/LikeSongActivity.java index 3425e08..034e3fa 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/LikeSongActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/LikeSongActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.util.Pair; @@ -8,20 +8,19 @@ import androidx.annotation.OptIn; import androidx.lifecycle.Observer; import androidx.media3.common.util.UnstableApi; import androidx.media3.exoplayer.offline.Download; -import androidx.media3.exoplayer.offline.DownloadManager; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterDownloadSong; -import com.hi.music.player.adapter.AdapterLikeSong; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.databinding.ActivityLikeSongBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.media3.MyDownloadService; -import com.hi.music.player.objectbox.ObjectBoxManager; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterDownloadSong; +import com.offline.music.playermp3.adapter.AdapterLikeSong; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.ActivityLikeSongBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.media3.MyDownloadService; +import com.offline.music.playermp3.objectbox.ObjectBoxManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/PlayActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java similarity index 95% rename from app/src/main/java/com/hi/music/player/ui/activity/PlayActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java index bd0caf3..16f52d9 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -14,7 +14,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.OptIn; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaMetadata; @@ -22,7 +21,6 @@ import androidx.media3.common.Player; import androidx.media3.common.util.UnstableApi; import androidx.media3.datasource.cache.SimpleCache; import androidx.media3.exoplayer.offline.Download; -import androidx.media3.exoplayer.offline.DownloadManager; import androidx.media3.exoplayer.offline.DownloadRequest; import androidx.media3.exoplayer.offline.DownloadService; import androidx.recyclerview.widget.LinearLayoutManager; @@ -30,37 +28,31 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; import com.google.gson.Gson; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterDownloadSong; -import com.hi.music.player.adapter.AdapterPlayList; -import com.hi.music.player.api.LikeSongListener; -import com.hi.music.player.api.MediaControllerListener; -import com.hi.music.player.api.onCheckDownload; -import com.hi.music.player.api.onImageColorListener; -import com.hi.music.player.api.onPlayNextListener; -import com.hi.music.player.databinding.ActivityPlayBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.BoxDownloadSong; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.javabean.CustomerDownload; -import com.hi.music.player.javabean.CustomerUrlInfo; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.media3.MyDownloadService; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.media3.MyPlayCacheManager; -import com.hi.music.player.objectbox.ObjectBoxManager; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; -import com.hi.music.player.ui.activity.viewmodel.VMPlay; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterPlayList; +import com.offline.music.playermp3.api.MediaControllerListener; +import com.offline.music.playermp3.api.onCheckDownload; +import com.offline.music.playermp3.api.onImageColorListener; +import com.offline.music.playermp3.api.onPlayNextListener; +import com.offline.music.playermp3.databinding.ActivityPlayBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.BoxDownloadSong; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.javabean.CustomerDownload; +import com.offline.music.playermp3.javabean.CustomerUrlInfo; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.media3.MyDownloadService; +import com.offline.music.playermp3.media3.MyMediaControllerManager; +import com.offline.music.playermp3.media3.MyPlayCacheManager; +import com.offline.music.playermp3.objectbox.ObjectBoxManager; +import com.offline.music.playermp3.ui.activity.viewmodel.VMPlay; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/ResultListActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/ResultListActivity.java similarity index 89% rename from app/src/main/java/com/hi/music/player/ui/activity/ResultListActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/ResultListActivity.java index f5d3a32..2bc7332 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/ResultListActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/ResultListActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -16,18 +16,16 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterResult; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.databinding.ActivityResultListBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseResult; -import com.hi.music.player.javabean.response.child.ResponseResultListChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.ui.fragmnt.viewmodel.VMCategoryList; -import com.hi.music.player.ui.fragmnt.viewmodel.VMResultList; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterResult; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.ActivityResultListBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponseResult; +import com.offline.music.playermp3.javabean.response.child.ResponseResultListChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.VMResultList; public class ResultListActivity extends BaseActivity implements HomeItemClickListener { private VMResultList vm; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java similarity index 81% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java index 2b53f0e..611b0e6 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java similarity index 81% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java index 7eaa3f3..0263ab8 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMApplication.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMApplication.java similarity index 66% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMApplication.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMApplication.java index 0fff645..f04a687 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMApplication.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMApplication.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import android.util.Pair; @@ -8,27 +8,11 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; import androidx.media3.common.util.UnstableApi; import androidx.media3.exoplayer.offline.Download; -import androidx.media3.exoplayer.offline.DownloadCursor; -import com.google.gson.Gson; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.BoxDownloadSong; -import com.hi.music.player.javabean.CustomerUrlInfo; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; -import org.json.JSONObject; - -import java.nio.charset.StandardCharsets; import java.util.List; -import okhttp3.ResponseBody; - public class VMApplication extends ViewModel { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMPlay.java similarity index 84% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMPlay.java index abd777b..31dbeb9 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/VMPlay.java @@ -1,18 +1,17 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.CustomerUrlInfo; -import com.hi.music.player.javabean.response.ResponsePlayListInfo; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.media3.MyMediaControllerManager; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.CustomerUrlInfo; +import com.offline.music.playermp3.javabean.response.ResponsePlayListInfo; +import com.offline.music.playermp3.javabean.response.ResponsePlayUrl; +import com.offline.music.playermp3.media3.MyMediaControllerManager; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java similarity index 78% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java index b92e1ed..0eff884 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java @@ -1,13 +1,14 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.adapter.A_InstrumentAdapter; -import com.hi.music.player.adapter.A_NatureAdapter; -import com.hi.music.player.adapter.A_WhiteAdapter; -import com.hi.music.player.databinding.FragmentAHomeBinding; -import com.hi.music.player.ui.fragmnt.viewmodel.A_VMHome; +import com.offline.music.playermp3.adapter.A_InstrumentAdapter; +import com.offline.music.playermp3.adapter.A_NatureAdapter; +import com.offline.music.playermp3.adapter.A_WhiteAdapter; +import com.offline.music.playermp3.databinding.FragmentAHomeBinding; +import com.offline.music.playermp3.helper.ItemDecoration; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.A_VMHome; public class A_HomeFragment extends BaseFragment { @@ -45,6 +46,9 @@ public class A_HomeFragment extends BaseFragment { Vb.recyclerViewFirst.setAdapter(instrumentAdapter); Vb.recyclerViewSecond.setAdapter(whiteAdapter); Vb.recyclerViewThird.setAdapter(natureAdapter); + + ItemDecoration itemDecoration = new ItemDecoration(12, 10, 9); + Vb.recyclerViewSecond.addItemDecoration(itemDecoration); } public void initEvent() { diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java similarity index 71% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java index 67b8d08..9c012dc 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import static android.app.Activity.RESULT_OK; @@ -9,6 +9,7 @@ import android.content.UriPermission; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.Build; import android.os.Environment; @@ -28,12 +29,12 @@ import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.R; -import com.hi.music.player.adapter.A_ImportFragmentAdapter; -import com.hi.music.player.databinding.FragmentAImportBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_SettingActivity; -import com.hi.music.player.ui.fragmnt.viewmodel.A_VMImport; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.A_ImportFragmentAdapter; +import com.offline.music.playermp3.databinding.FragmentAImportBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_SettingActivity; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.A_VMImport; import java.io.IOException; import java.util.List; @@ -47,6 +48,8 @@ public class A_ImportFragment extends BaseFragment { private A_ImportFragmentAdapter adapter; private A_VMImport viewModel; + private String newName = ""; + @Override protected FragmentAImportBinding getFragmentVb() { return FragmentAImportBinding.inflate(getLayoutInflater()); @@ -55,7 +58,7 @@ public class A_ImportFragment extends BaseFragment { @Override protected void initView() { viewModel = new ViewModelProvider(this).get(A_VMImport.class); - adapter = new A_ImportFragmentAdapter(requireContext()); + adapter = new A_ImportFragmentAdapter(requireContext(),newName); setupRecyclerView(); // observeAudioFiles(); @@ -137,8 +140,12 @@ public class A_ImportFragment extends BaseFragment { confirm.setOnClickListener(view -> { String newName = inputField.getText().toString(); - adapter.updateTitle(position, newName); -// Toast.makeText(requireContext(), "新名称: " + newName + ", 项目: " + position, Toast.LENGTH_SHORT).show(); + adapter.updateTitle(position, newName); // 更新 UI + + // 获取音频文件路径并更新名称 + String filePath = adapter.getAudioFile(position).getFile(); // 获取音频文件路径 + viewModel.updateAudioFileName(filePath, newName); // 更新 ViewModel 中的名称 + subDialog.dismiss(); }); @@ -158,18 +165,36 @@ public class A_ImportFragment extends BaseFragment { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED) { requestPermissions(Manifest.permission.READ_MEDIA_AUDIO); + Log.d("A_ImportFragment", "123Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } else { openAudioPicker(); + Log.d("A_ImportFragment", "Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } } else { if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(Manifest.permission.READ_EXTERNAL_STORAGE); + Log.d("A_ImportFragment", "156Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 + showPermissionDeniedDialog(); } else { openAudioPicker(); + Log.d("A_ImportFragment", "Not Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } } } + private void showPermissionDeniedDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + builder.setTitle("Permission denied"); + builder.setMessage("You have denied permission to read the audio file, and some functions will not work properly. Please go to Application Settings to grant permissions."); + builder.setPositiveButton("Go to Settings", (dialog, which) -> { + Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + Uri uri = Uri.fromParts("package", requireContext().getPackageName(), null); + intent.setData(uri); + startActivity(intent); + }); + builder.setNegativeButton("Cancel", (dialog, which) -> dialog.dismiss()); + builder.show(); + } private void requestPermissions(String permission) { ActivityCompat.requestPermissions(requireActivity(), new String[]{permission}, REQUEST_CODE_READ_MEDIA_AUDIO); @@ -188,10 +213,9 @@ public class A_ImportFragment extends BaseFragment { } } - private void openAudioPicker() { if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { - Toast.makeText(getContext(), "外部存储不可用", Toast.LENGTH_LONG).show(); + Toast.makeText(getContext(), "The external storage is unavailable", Toast.LENGTH_LONG).show(); return; } @@ -213,15 +237,39 @@ public class A_ImportFragment extends BaseFragment { requireActivity().getContentResolver().takePersistableUriPermission( selectedAudioUri, Intent.FLAG_GRANT_READ_URI_PERMISSION); + // 检查音频时长 + long duration = 0; try { - viewModel.addAudioFile(selectedAudioUri); + duration = getAudioDuration(selectedAudioUri); } catch (IOException e) { throw new RuntimeException(e); } + + if (duration < 4000) { + Toast.makeText(requireContext(), "The audio duration cannot be less than 4 seconds", Toast.LENGTH_SHORT).show(); + } else { + try { + viewModel.addAudioFile(selectedAudioUri); // 如果时长符合条件，添加音频文件 + } catch (IOException e) { + Log.e("A_ImportFragment", "IOException while adding audio file", e); + Toast.makeText(requireContext(), "An error occurred while adding the audio file", Toast.LENGTH_SHORT).show(); + } + } } } } + private long getAudioDuration(Uri uri) throws IOException { + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + try { + retriever.setDataSource(requireContext(), uri); + String durationStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION); + return Long.parseLong(durationStr); // 返回音频时长（毫秒） + } finally { + retriever.release(); // 释放资源 + } + } + @Override public void onResume() { super.onResume(); diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java similarity index 90% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java index 496ca3f..8aee7af 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import android.content.Context; import android.os.Bundle; @@ -12,8 +12,8 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModel; import androidx.viewbinding.ViewBinding; -import com.hi.music.player.helper.ViewModelScope; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.helper.ViewModelScope; +import com.offline.music.playermp3.ui.activity.viewmodel.VMApplication; public abstract class BaseFragment extends Fragment { diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/HomeFragment.java similarity index 80% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/HomeFragment.java index f51c019..1ed96ff 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/HomeFragment.java @@ -1,45 +1,31 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import android.content.Intent; -import android.content.RestrictionsManager; -import android.graphics.drawable.Drawable; import android.view.View; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.Target; -import com.hi.music.player.R; -import com.hi.music.player.adapter.AdapterHome; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.api.OnHasUrlAction; -import com.hi.music.player.databinding.FragmentHomeBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseHome; -import com.hi.music.player.javabean.response.child.ResponseCategory; -import com.hi.music.player.javabean.response.child.ResponseHomeChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.network.RetrofitManager; -import com.hi.music.player.ui.activity.CategoryListActivity; -import com.hi.music.player.ui.activity.PlayActivity; -import com.hi.music.player.ui.fragmnt.viewmodel.VMHome; - -import org.json.JSONObject; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.AdapterHome; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.FragmentHomeBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponseHome; +import com.offline.music.playermp3.javabean.response.child.ResponseCategory; +import com.offline.music.playermp3.javabean.response.child.ResponseHomeChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.ui.activity.CategoryListActivity; +import com.offline.music.playermp3.ui.activity.PlayActivity; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.VMHome; import java.util.ArrayList; import java.util.List; -import okhttp3.ResponseBody; - public class HomeFragment extends BaseFragment implements HomeItemClickListener { diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/ProfileFragment.java similarity index 88% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/ProfileFragment.java index 9d7ea09..b1d63ce 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/ProfileFragment.java @@ -1,7 +1,6 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import android.content.Intent; -import android.util.Pair; import android.view.View; import androidx.annotation.OptIn; @@ -10,17 +9,16 @@ import androidx.media3.common.util.UnstableApi; import androidx.media3.exoplayer.offline.Download; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.api.LikeSongListener; -import com.hi.music.player.databinding.FragmentProfileBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.BoxDownloadSong; -import com.hi.music.player.javabean.BoxLikeSong; -import com.hi.music.player.media3.MyDownloadService; -import com.hi.music.player.objectbox.ObjectBoxManager; -import com.hi.music.player.ui.activity.LikeSongActivity; -import com.hi.music.player.ui.activity.viewmodel.VMApplication; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.api.LikeSongListener; +import com.offline.music.playermp3.databinding.FragmentProfileBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.BoxDownloadSong; +import com.offline.music.playermp3.javabean.BoxLikeSong; +import com.offline.music.playermp3.media3.MyDownloadService; +import com.offline.music.playermp3.objectbox.ObjectBoxManager; +import com.offline.music.playermp3.ui.activity.LikeSongActivity; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/SearchFragment.java similarity index 90% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/SearchFragment.java index 37caf28..a78073e 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/SearchFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import android.content.Intent; import android.text.Editable; @@ -11,19 +11,19 @@ import android.widget.TextView; import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.adapter.AdapterSearch; -import com.hi.music.player.adapter.AdapterSuggestion; -import com.hi.music.player.api.HomeItemClickListener; -import com.hi.music.player.databinding.FragmentSearchBinding; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.javabean.response.child.ResponseSearchChild; -import com.hi.music.player.javabean.response.child.ResponseSingle; -import com.hi.music.player.ui.activity.CategoryListActivity; -import com.hi.music.player.ui.activity.PlayActivity; -import com.hi.music.player.ui.activity.ResultListActivity; -import com.hi.music.player.ui.fragmnt.viewmodel.VMSearch; +import com.offline.music.playermp3.adapter.AdapterSearch; +import com.offline.music.playermp3.adapter.AdapterSuggestion; +import com.offline.music.playermp3.api.HomeItemClickListener; +import com.offline.music.playermp3.databinding.FragmentSearchBinding; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.helper.MyValue; +import com.offline.music.playermp3.javabean.response.ResponseSearch; +import com.offline.music.playermp3.javabean.response.child.ResponseSearchChild; +import com.offline.music.playermp3.javabean.response.child.ResponseSingle; +import com.offline.music.playermp3.ui.activity.CategoryListActivity; +import com.offline.music.playermp3.ui.activity.PlayActivity; +import com.offline.music.playermp3.ui.activity.ResultListActivity; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.VMSearch; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java similarity index 92% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java index 839a7ce..2695ae6 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java @@ -1,13 +1,13 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.helper.JsonUtils; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.javabean.A_data.Category; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.helper.JsonUtils; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.Category; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java similarity index 87% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java index 969c998..754e183 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import android.app.Application; import android.content.Context; @@ -13,7 +13,7 @@ import androidx.lifecycle.MutableLiveData; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hi.music.player.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.AudioItem; import java.io.IOException; import java.lang.reflect.Type; @@ -110,6 +110,20 @@ public class A_VMImport extends AndroidViewModel { saveAudioFiles(); // 更新 SharedPreferences } + // 更新音频文件名称并持久化保存 + public void updateAudioFileName(String oldFilePath, String newName) { + for (AudioItem item : audioFiles) { + if (item.getFile().equals(oldFilePath)) { + item.setName(newName); // 更新音频名称 + break; + } + } + + // 更新音频文件列表并保存 + saveAudioFiles(); // 保存更新后的音频文件列表 + audioFilesLiveData.setValue(new ArrayList<>(audioFiles)); // 更新 LiveData + } + // 获取音频文件列表 public MutableLiveData> getAudioFiles() { return audioFilesLiveData; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMCategoryList.java similarity index 69% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMCategoryList.java index fc9d4c2..2daa175 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMCategoryList.java @@ -1,16 +1,13 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponseCategoryList; -import com.hi.music.player.javabean.response.ResponseHome; -import com.hi.music.player.javabean.response.ResponsePlayUrl; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.javabean.response.ResponseCategoryList; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMHome.java similarity index 85% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMHome.java index 4c77133..5bbd626 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMHome.java @@ -1,16 +1,14 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.helper.MyValue; -import com.hi.music.player.javabean.response.ResponseHome; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.javabean.response.ResponseHome; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMResultList.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMResultList.java similarity index 74% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMResultList.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMResultList.java index 707c39b..7bc3fa6 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMResultList.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMResultList.java @@ -1,14 +1,13 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.javabean.response.ResponseCategoryList; -import com.hi.music.player.javabean.response.ResponseResult; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.javabean.response.ResponseResult; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMSearch.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMSearch.java similarity index 84% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMSearch.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMSearch.java index e8602b6..0210681 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMSearch.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/VMSearch.java @@ -1,15 +1,14 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.api.RequestListener; -import com.hi.music.player.helper.CommonUtils; -import com.hi.music.player.javabean.response.ResponseHome; -import com.hi.music.player.javabean.response.ResponseSearch; -import com.hi.music.player.network.JsonHelper; -import com.hi.music.player.network.RetrofitManager; +import com.offline.music.playermp3.api.RequestListener; +import com.offline.music.playermp3.helper.CommonUtils; +import com.offline.music.playermp3.javabean.response.ResponseSearch; +import com.offline.music.playermp3.network.JsonHelper; +import com.offline.music.playermp3.network.RetrofitManager; import org.json.JSONObject; diff --git a/app/src/main/res/drawable-v24/music_player_launch.png b/app/src/main/res/drawable-v24/music_player_launch.png new file mode 100644 index 0000000..38d1bea Binary files /dev/null and b/app/src/main/res/drawable-v24/music_player_launch.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_ahome.xml b/app/src/main/res/layout/activity_ahome.xml index 6d1efdb..a7840b4 100644 --- a/app/src/main/res/layout/activity_ahome.xml +++ b/app/src/main/res/layout/activity_ahome.xml @@ -49,7 +49,7 @@ app:layout_constraintTop_toTopOf="parent"> - + android:src="@mipmap/default_image" /> diff --git a/app/src/main/res/layout/activity_aplay.xml b/app/src/main/res/layout/activity_aplay.xml index 1efaf39..0e77ce3 100644 --- a/app/src/main/res/layout/activity_aplay.xml +++ b/app/src/main/res/layout/activity_aplay.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="28dp" + android:layout_marginTop="50dp" android:src="@drawable/arrow_left" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -31,7 +31,7 @@ android:id="@+id/now_playing_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="28dp" + android:layout_marginTop="50dp" android:text="Now Playing" android:textColor="@android:color/white" android:textSize="16sp" @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="7dp" - android:text="Wonder Where We Land" + android:text="A journey to rest, guided by gentle sounds" android:textColor="@android:color/white" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_asetting.xml b/app/src/main/res/layout/activity_asetting.xml index 88a19a2..581ac40 100644 --- a/app/src/main/res/layout/activity_asetting.xml +++ b/app/src/main/res/layout/activity_asetting.xml @@ -11,10 +11,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:layout_marginTop="4dp" + android:layout_marginTop="10dp" android:orientation="horizontal"> @@ -26,7 +27,6 @@ android:gravity="center"> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index f2933bc..5bc94fd 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -4,8 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:id="@+id/frame_layout" android:background="@color/color_transparent" + android:id="@+id/frameLayout" android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/fragment_a_home.xml b/app/src/main/res/layout/fragment_a_home.xml index 4efcd76..b0d51b5 100644 --- a/app/src/main/res/layout/fragment_a_home.xml +++ b/app/src/main/res/layout/fragment_a_home.xml @@ -25,12 +25,14 @@ android:text="@string/ready_to_sleep" android:textColor="@color/white" android:textSize="44sp" + android:layout_gravity="center" android:textStyle="italic|bold" /> diff --git a/app/src/main/res/layout/fragment_a_import.xml b/app/src/main/res/layout/fragment_a_import.xml index a64575e..56ddc6e 100644 --- a/app/src/main/res/layout/fragment_a_import.xml +++ b/app/src/main/res/layout/fragment_a_import.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="32sp" + android:layout_marginTop="32dp" android:text="Parents voice" android:textColor="@color/white" android:textSize="28sp" @@ -36,6 +36,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" app:layout_constraintTop_toBottomOf="@+id/title" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/item_a_home_1.xml b/app/src/main/res/layout/item_a_home_1.xml index 3435217..dc59684 100644 --- a/app/src/main/res/layout/item_a_home_1.xml +++ b/app/src/main/res/layout/item_a_home_1.xml @@ -1,6 +1,8 @@ + android:src="@mipmap/default_image" /> + android:src="@mipmap/default_image" /> diff --git a/app/src/main/res/layout/item_a_home_3.xml b/app/src/main/res/layout/item_a_home_3.xml index 2daa201..fae54f7 100644 --- a/app/src/main/res/layout/item_a_home_3.xml +++ b/app/src/main/res/layout/item_a_home_3.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" - android:src="@mipmap/im_placeholder" /> + android:src="@mipmap/default_image" /> diff --git a/app/src/main/res/layout/item_a_import.xml b/app/src/main/res/layout/item_a_import.xml index dca649b..9e650cf 100644 --- a/app/src/main/res/layout/item_a_import.xml +++ b/app/src/main/res/layout/item_a_import.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" android:background="@color/black" - android:src="@mipmap/im_placeholder" /> + android:src="@mipmap/default_image" /> @@ -57,6 +57,7 @@ android:layout_marginStart="8dp" android:src="@drawable/options" android:padding="5dp" + android:layout_marginEnd="6dp" android:background="@drawable/rounded" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_play_list.xml b/app/src/main/res/layout/item_play_list.xml index 9d25a99..54462b6 100644 --- a/app/src/main/res/layout/item_play_list.xml +++ b/app/src/main/res/layout/item_play_list.xml @@ -23,7 +23,7 @@ - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..3c3fa10 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..42ee5af Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d..ea56aa8 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..c0dc313 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..a170949 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 62b611d..a4bf276 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..df3155c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..39d5e1b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a695..fbd3073 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..19643ba 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..ee08dc5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index 9287f50..063f15e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bygone.png b/app/src/main/res/mipmap-xxxhdpi/bygone.png new file mode 100644 index 0000000..425ae9e Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/bygone.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..81d7ae9 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..1fda563 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 9126ae3..fdac814 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/music_logo.png b/app/src/main/res/mipmap-xxxhdpi/music_logo.png new file mode 100644 index 0000000..38d1bea Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/music_logo.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56b12ab..8f3e78f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - MusicApp + Offline Music Player Hello blank fragment Song Of The Day @@ -11,8 +11,8 @@ Library Listen Music Anytime Resource Loading... - Ready to sleep - We\'ve carefully prepared sounds for you 🔥 + Sounds of Serenity + Soothing tunes crafted for deep relaxation and sleep 🌙 White noise Voice of Nature Setting diff --git a/app/src/test/java/com/hi/music/player/ExampleUnitTest.java b/app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/hi/music/player/ExampleUnitTest.java rename to app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java index 9682bb7..f513ae3 100644 --- a/app/src/test/java/com/hi/music/player/ExampleUnitTest.java +++ b/app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.playermp3; import org.junit.Test;