From 7349c58e6d6e0ddf4f6ef01872cdd2876aedd2f8 Mon Sep 17 00:00:00 2001 From: litingting Date: Tue, 19 Nov 2024 11:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 3 +-- app/google-services.json | 2 +- .../offline/music/playermp3/firebase/Sp.java | 2 +- .../playermp3/media3/MyPlayCacheManager.java | 4 +--- .../playermp3/media3/PlaybackService.java | 24 ++++++------------- .../playermp3/ui/activity/PlayActivity.java | 2 +- app/src/main/res/layout/activity_play.xml | 4 +++- app/src/main/res/layout/layout_panel.xml | 2 +- settings.gradle.kts | 2 +- 9 files changed, 17 insertions(+), 28 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3c404d3..fc99f1f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,7 @@ android { compileSdk = 34 defaultConfig { - //com.hi.music.player - applicationId = "com.offline.music.playermp3" + applicationId = "com.offline.music.playermp3.test" minSdk = 23 targetSdk = 34 versionCode = 1 diff --git a/app/google-services.json b/app/google-services.json index c0472f0..9ea1714 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.offline.music.playermp3" + "package_name": "com.offline.music.playermp3.test" } }, "oauth_client": [], diff --git a/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java b/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java index b74d1d3..d1e1232 100644 --- a/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java +++ b/app/src/main/java/com/offline/music/playermp3/firebase/Sp.java @@ -39,6 +39,6 @@ public class Sp { } public String getStringValue(String key) { - return preferences.getString(key, RemoteConfigJava.value_open_type_0); + return preferences.getString(key, RemoteConfigJava.value_open_type_1); } } diff --git a/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java b/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java index 9cdb9f4..f695be4 100644 --- a/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/MyPlayCacheManager.java @@ -30,7 +30,5 @@ public class MyPlayCacheManager { return playCache; } - public static SimpleCache getPlayCache() { - return playCache; - } + } diff --git a/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java b/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java index 6a1930c..57b99b0 100644 --- a/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java +++ b/app/src/main/java/com/offline/music/playermp3/media3/PlaybackService.java @@ -70,21 +70,11 @@ public class PlaybackService extends MediaSessionService { DefaultDataSource.Factory factory = new DefaultDataSource.Factory(this); playCache = MyPlayCacheManager.getInitPlayCache(context); CacheDataSource.Factory factory1 = new CacheDataSource.Factory().setCache(playCache) - .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory() - .setConnectTimeoutMs(16000) - .setReadTimeoutMs(8000) - .setUserAgent("Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0")) - .setEventListener(new CacheDataSource.EventListener() { - @Override - public void onCachedBytesRead(long cacheSizeBytes, long cachedBytesRead) { - CommonUtils.LogMsg("-----------缓存2 -PlayCache-" + cacheSizeBytes + "----cacheSizeBytes=" + cachedBytesRead); - } - - @Override - public void onCacheIgnored(int reason) { - CommonUtils.LogMsg("-----------缓存2忽略 PlayCache=" + reason); - } - }); + .setUpstreamDataSourceFactory(factory); +// .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory() +// .setConnectTimeoutMs(16000) +// .setReadTimeoutMs(8000) +// .setUserAgent("Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0")); downloadCache = MyDownloadService.getDownloadCache(); return new CacheDataSource.Factory() .setCache(downloadCache) @@ -113,7 +103,7 @@ public class PlaybackService extends MediaSessionService { @Override public DataSpec resolveDataSpec(DataSpec dataSpec) { - CommonUtils.LogMsg("--------resolveDataSpec dataSpec.key=" + dataSpec.key+"---dataSpec.uri="+dataSpec.uri); + CommonUtils.LogMsg("--------resolveDataSpec dataSpec.key=" + dataSpec.key); return dataSpec; // long length = 1L; @@ -138,7 +128,7 @@ public class PlaybackService extends MediaSessionService { @Override public Uri resolveReportedUri(Uri uri) { CommonUtils.LogMsg("--------resolveDataSpec uri=" + uri); - return ResolvingDataSource.Resolver.super.resolveReportedUri(Uri.parse("---")); + return ResolvingDataSource.Resolver.super.resolveReportedUri(uri); } }); } diff --git a/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java index 16f52d9..c28a088 100644 --- a/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/PlayActivity.java @@ -133,7 +133,7 @@ public class PlayActivity extends BaseActivity implements S musicVideoType = responseSingle.getMusicVideoType(); mDefaultPlayStartIndex = intent.getIntExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY_LIST_INDEX, mDefaultPlayStartIndex); - SimpleCache playCache = MyPlayCacheManager.getPlayCache(); + // boolean songCached = CommonUtils.isSongCached(playCache, videoId); // CommonUtils.LogMsg("---------------是否有播放缓存--songCached="+songCached +"--name="+responseSingle.getSongTitle()); diff --git a/app/src/main/res/layout/activity_play.xml b/app/src/main/res/layout/activity_play.xml index 73fe61a..cf1da91 100644 --- a/app/src/main/res/layout/activity_play.xml +++ b/app/src/main/res/layout/activity_play.xml @@ -21,6 +21,7 @@