修改包名为com.offline.music.player

This commit is contained in:
lihongwei 2024-11-11 16:18:36 +08:00
parent 26b36f2e22
commit d7320dc5f7
37 changed files with 99 additions and 103 deletions

Binary file not shown.

BIN
app/OfflineMusicPlayer.jks Normal file

Binary file not shown.

View File

@ -13,18 +13,18 @@ plugins {
val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
android { android {
namespace = "com.hi.music.player" namespace = "com.offline.music.player"
compileSdk = 34 compileSdk = 34
defaultConfig { defaultConfig {
//com.hi.music.player //com.hi.music.player
applicationId = "com.hi.music.player" applicationId = "com.offline.music.player"
minSdk = 23 minSdk = 23
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 1
versionName = "1.0.0" versionName = "1.0.0"
setProperty("archivesBaseName", "MusicApp_V" + versionName + "(${versionCode})_$timestamp") setProperty("archivesBaseName", "Offline Music Player" + versionName + "(${versionCode})_$timestamp")
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }

View File

@ -9,7 +9,7 @@
"client_info": { "client_info": {
"mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef", "mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef",
"android_client_info": { "android_client_info": {
"package_name": "com.hi.music.player" "package_name": "com.offline.music.player"
} }
}, },
"oauth_client": [], "oauth_client": [],

View File

@ -1,6 +1,6 @@
app_name=Music Player app_name=Offline Music Player
package_name=com.hi.music.player package_name=com.offline.music.player
keystoreFile=app/MusicPlayer.jks keystoreFile=app/OfflineMusicPlayer.jks
key_alias=MusicPlayerkey0 key_alias=OfflineMusicPlayerkey0
key_store_password=MusicPlayer key_store_password=OfflineMusicPlayer
key_password=MusicPlayer key_password=OfflineMusicPlayer

View File

@ -29,7 +29,7 @@
-dontwarn retrofit2.** -dontwarn retrofit2.**
-dontwarn javax.annotation.Nullable -dontwarn javax.annotation.Nullable
-keep class com.hi.music.player.javabean.A_data.AudioItem { *; } -keep class com.offline.music.player.javabean.A_data.AudioItem { *; }
# 保持 ContextIntent 和权限相关的公共方法 # 保持 ContextIntent 和权限相关的公共方法
-keep class android.content.Context { *; } -keep class android.content.Context { *; }

View File

@ -1,4 +1,4 @@
package com.hi.music.player; package com.offline.music.player;
import android.content.Context; import android.content.Context;

View File

@ -1,4 +1,4 @@
package com.hi.music.player; package com.offline.music.player;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;

View File

@ -1,12 +1,12 @@
package com.hi.music.player.adapter; package com.offline.music.player.adapter;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.hi.music.player.ui.fragmnt.A_HomeFragment; import com.offline.music.player.ui.fragmnt.A_HomeFragment;
import com.hi.music.player.ui.fragmnt.A_ImportFragment; import com.offline.music.player.ui.fragmnt.A_ImportFragment;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.adapter; package com.offline.music.player.adapter;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -12,9 +12,9 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_PlayActivity; import com.offline.music.player.ui.activity.A_PlayActivity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.adapter; package com.offline.music.player.adapter;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.helper.AudioItemDiffCallback; import com.offline.music.player.helper.AudioItemDiffCallback;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_PlayActivity; import com.offline.music.player.ui.activity.A_PlayActivity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.adapter; package com.offline.music.player.adapter;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -13,10 +13,10 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.helper.AudioItemDiffCallback; import com.offline.music.player.helper.AudioItemDiffCallback;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_PlayActivity; import com.offline.music.player.ui.activity.A_PlayActivity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.adapter; package com.offline.music.player.adapter;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.helper.AudioItemDiffCallback; import com.offline.music.player.helper.AudioItemDiffCallback;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_PlayActivity; import com.offline.music.player.ui.activity.A_PlayActivity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,8 +1,8 @@
package com.hi.music.player.helper; package com.offline.music.player.helper;
import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.helper; package com.offline.music.player.helper;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.helper; package com.offline.music.player.helper;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.View; import android.view.View;
@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import com.hi.music.player.MusicApplication; import com.offline.music.player.MusicApplication;
public class ItemDecoration extends RecyclerView.ItemDecoration { public class ItemDecoration extends RecyclerView.ItemDecoration {

View File

@ -1,9 +1,9 @@
package com.hi.music.player.helper; package com.offline.music.player.helper;
import android.content.Context; import android.content.Context;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.javabean.A_data.Category; import com.offline.music.player.javabean.A_data.Category;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.helper; package com.offline.music.player.helper;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.javabean.A_data; package com.offline.music.player.javabean.A_data;
import java.io.Serializable; import java.io.Serializable;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.javabean.A_data; package com.offline.music.player.javabean.A_data;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.service; package com.offline.music.player.service;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
@ -24,9 +24,9 @@ import androidx.core.app.NotificationCompat;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_PlayActivity; import com.offline.music.player.ui.activity.A_PlayActivity;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

View File

@ -1,24 +1,22 @@
package com.hi.music.player.ui.activity; package com.offline.music.player.ui.activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator; import com.google.android.material.tabs.TabLayoutMediator;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.adapter.A_HomeViewPagerAdapter; import com.offline.music.player.adapter.A_HomeViewPagerAdapter;
import com.hi.music.player.databinding.ActivityAhomeBinding; import com.offline.music.player.databinding.ActivityAhomeBinding;
import com.hi.music.player.databinding.HomeTabCustomBinding; import com.offline.music.player.databinding.HomeTabCustomBinding;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.service.MusicPlayerForegroundService; import com.offline.music.player.service.MusicPlayerForegroundService;
import java.util.Locale; import java.util.Locale;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.activity; package com.offline.music.player.ui.activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@ -11,7 +11,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper;
import android.renderscript.Allocation; import android.renderscript.Allocation;
import android.renderscript.Element; import android.renderscript.Element;
import android.renderscript.RenderScript; import android.renderscript.RenderScript;
@ -22,7 +21,6 @@ import android.view.View;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; 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.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.request.transition.Transition;
import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.databinding.ActivityAplayBinding; import com.offline.music.player.databinding.ActivityAplayBinding;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.service.MusicPlayerForegroundService; import com.offline.music.player.service.MusicPlayerForegroundService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -102,6 +100,9 @@ public class A_PlayActivity extends BaseActivity<ActivityAplayBinding> {
loadBackgroundPreference(); // 加载之前保存的背景状态 loadBackgroundPreference(); // 加载之前保存的背景状态
updateSeekBarAndTime(); updateSeekBarAndTime();
if (musicService != null) {
musicService.startUpdatingProgress();
}
// 从Intent获取音频项 // 从Intent获取音频项
AudioItem audioItem = (AudioItem) getIntent().getSerializableExtra("Path"); AudioItem audioItem = (AudioItem) getIntent().getSerializableExtra("Path");

View File

@ -1,9 +1,9 @@
package com.hi.music.player.ui.activity; package com.offline.music.player.ui.activity;
import android.view.View; import android.view.View;
import com.hi.music.player.databinding.ActivityAsettingBinding; import com.offline.music.player.databinding.ActivityAsettingBinding;
import com.hi.music.player.helper.SettingUtil; import com.offline.music.player.helper.SettingUtil;
public class A_SettingActivity extends BaseActivity<ActivityAsettingBinding> { public class A_SettingActivity extends BaseActivity<ActivityAsettingBinding> {

View File

@ -1,10 +1,10 @@
package com.hi.music.player.ui.activity; package com.offline.music.player.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.view.View; import android.view.View;
import com.hi.music.player.databinding.ActivityAsplashBinding; import com.offline.music.player.databinding.ActivityAsplashBinding;
public class A_SplashActivity extends BaseActivity<ActivityAsplashBinding> { public class A_SplashActivity extends BaseActivity<ActivityAsplashBinding> {

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.activity; package com.offline.music.player.ui.activity;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -6,14 +6,12 @@ import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.WindowCompat; import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsControllerCompat; import androidx.core.view.WindowInsetsControllerCompat;
import androidx.lifecycle.ViewModel;
import androidx.viewbinding.ViewBinding; import androidx.viewbinding.ViewBinding;
import com.hi.music.player.databinding.ActivityBaseBinding; import com.offline.music.player.databinding.ActivityBaseBinding;
public abstract class BaseActivity<T extends ViewBinding> extends AppCompatActivity implements View.OnClickListener { public abstract class BaseActivity<T extends ViewBinding> extends AppCompatActivity implements View.OnClickListener {

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.activity.viewmodel; package com.offline.music.player.ui.activity.viewmodel;
import android.app.Application; import android.app.Application;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.activity.viewmodel; package com.offline.music.player.ui.activity.viewmodel;
import android.app.Application; import android.app.Application;

View File

@ -1,14 +1,14 @@
package com.hi.music.player.ui.fragmnt; package com.offline.music.player.ui.fragmnt;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.hi.music.player.adapter.A_InstrumentAdapter; import com.offline.music.player.adapter.A_InstrumentAdapter;
import com.hi.music.player.adapter.A_NatureAdapter; import com.offline.music.player.adapter.A_NatureAdapter;
import com.hi.music.player.adapter.A_WhiteAdapter; import com.offline.music.player.adapter.A_WhiteAdapter;
import com.hi.music.player.databinding.FragmentAHomeBinding; import com.offline.music.player.databinding.FragmentAHomeBinding;
import com.hi.music.player.helper.ItemDecoration; import com.offline.music.player.helper.ItemDecoration;
import com.hi.music.player.ui.fragmnt.viewmodel.A_VMHome; import com.offline.music.player.ui.fragmnt.viewmodel.A_VMHome;
public class A_HomeFragment extends BaseFragment<FragmentAHomeBinding> { public class A_HomeFragment extends BaseFragment<FragmentAHomeBinding> {

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.fragmnt; package com.offline.music.player.ui.fragmnt;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
@ -28,12 +28,12 @@ import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.hi.music.player.R; import com.offline.music.player.R;
import com.hi.music.player.adapter.A_ImportFragmentAdapter; import com.offline.music.player.adapter.A_ImportFragmentAdapter;
import com.hi.music.player.databinding.FragmentAImportBinding; import com.offline.music.player.databinding.FragmentAImportBinding;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.ui.activity.A_SettingActivity; import com.offline.music.player.ui.activity.A_SettingActivity;
import com.hi.music.player.ui.fragmnt.viewmodel.A_VMImport; import com.offline.music.player.ui.fragmnt.viewmodel.A_VMImport;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.fragmnt; package com.offline.music.player.ui.fragmnt;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@ -9,7 +9,6 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModel;
import androidx.viewbinding.ViewBinding; import androidx.viewbinding.ViewBinding;

View File

@ -1,13 +1,13 @@
package com.hi.music.player.ui.fragmnt.viewmodel; package com.offline.music.player.ui.fragmnt.viewmodel;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
import com.hi.music.player.MusicApplication; import com.offline.music.player.MusicApplication;
import com.hi.music.player.helper.JsonUtils; import com.offline.music.player.helper.JsonUtils;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import com.hi.music.player.javabean.A_data.Category; import com.offline.music.player.javabean.A_data.Category;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package com.hi.music.player.ui.fragmnt.viewmodel; package com.offline.music.player.ui.fragmnt.viewmodel;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
@ -13,7 +13,7 @@ import androidx.lifecycle.MutableLiveData;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.hi.music.player.javabean.A_data.AudioItem; import com.offline.music.player.javabean.A_data.AudioItem;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type; import java.lang.reflect.Type;

View File

@ -49,7 +49,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<!-- 自定义圆形进度条 --> <!-- 自定义圆形进度条 -->
<com.hi.music.player.helper.CircularProgressBar <com.offline.music.player.helper.CircularProgressBar
android:id="@+id/circular_progress_bar" android:id="@+id/circular_progress_bar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 267 KiB

View File

@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">MusicApp</string> <string name="app_name">Offline Music Player</string>
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="listen_music_anytime">Listen Music Anytime</string> <string name="listen_music_anytime">Listen Music Anytime</string>
<string name="resource_loading">Resource Loading...</string> <string name="resource_loading">Resource Loading...</string>

View File

@ -1,4 +1,4 @@
package com.hi.music.player; package com.offline.music.player;
import org.junit.Test; import org.junit.Test;