更新musicApi版本到1.1.4

caiyonglong · Apr 25, 2021 · f6aad14 · f6aad14
1 parent c3de344
commit f6aad14
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@
 
 # 计划
 - [ ] 整理文档
+    - [musicApi接入和调试文档](./doc/音乐接口组件库接入.md)
 - [ ] 代码重构
 
 # 相关项目|音乐API
@@ -45,6 +46,13 @@
 - [More..](https://github.com/caiyonglong/MusicLake/blob/develop/app/build.gradle)
 
 # 软件运行截图
+
+
+
+    因为github限制，所有图片预览需要翻强或者git clone到本地才能预览
+
+
+
 <p>
 <img src="screenshots/preview1.png" width="225" height="400"/>
 <img src="screenshots/preview2.png" width="225" height="400"/>

diff --git a/app/build.gradle b/app/build.gradle
@@ -68,11 +68,11 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
@@ -160,7 +160,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
 
     //bugly的仓库
-    implementation 'com.tencent.bugly:crashreport_upgrade:1.4.2'
+    implementation 'com.tencent.bugly:crashreport_upgrade:1.5.0'
 //    implementation 'com.tencent.bugly:nativecrashreport:3.7.1'
 
     //微博
@@ -173,13 +173,13 @@ dependencies {
 
 
     //youtube接口
-    implementation 'com.google.android.gms:play-services-auth:18.1.0'
+    implementation 'com.google.android.gms:play-services-auth:19.0.0'
     implementation 'com.google.api-client:google-api-client-android:1.23.0'
     implementation 'com.google.apis:google-api-services-youtube:v3-rev198-1.23.0'
     implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.3'
 
-    //Android音乐接口Api
-    implementation 'com.github.caiyonglong:musicapi:1.1.3'
+    //Android音乐接口Api， 远程和本地只能保留一个！！
+    implementation 'com.github.caiyonglong:musicapi:1.1.4'
 //    implementation project(':musicapi')
     //缓存
     implementation 'com.danikula:videocache:2.7.1'

diff --git a/app/src/main/java/com/cyl/musiclake/api/music/netease/NeteaseApiServiceImpl.kt b/app/src/main/java/com/cyl/musiclake/api/music/netease/NeteaseApiServiceImpl.kt
@@ -54,7 +54,7 @@ object NeteaseApiServiceImpl {
     }
 
     /**
-     * 获取歌单歌曲数据
+     * 获取歌单数据
      */
     fun getTopPlaylists(cat: String, limit: Int): Observable<MutableList<Playlist>> {
         return apiService.getTopPlaylist(cat, limit)

diff --git a/app/src/main/java/com/cyl/musiclake/api/net/ApiManager.java b/app/src/main/java/com/cyl/musiclake/api/net/ApiManager.java
@@ -45,8 +45,8 @@ public class ApiManager {
     private static ApiManager sApiManager;
 
     private static long CONNECT_TIMEOUT = 60L;
-    private static long READ_TIMEOUT = 10L;
-    private static long WRITE_TIMEOUT = 10L;
+    private static long READ_TIMEOUT = 60L;
+    private static long WRITE_TIMEOUT = 60L;
     //设缓存有效期为1天
     private static final long CACHE_STALE_SEC = 60 * 60 * 24 * 1;
     //查询缓存的Cache-Control设置，为if-only-cache时只查询缓存而不会请求服务器，max-stale可以配合设置缓存失效时间
@@ -72,6 +72,14 @@ public class ApiManager {
         }
         return chain.proceed(request);
     };
+    /**
+     * 网络拦截器
+     */
+    private static final Interceptor mNetInterceptor = chain -> {
+        Request request = chain.request().newBuilder()
+                .addHeader("Connection", "close").build();
+        return chain.proceed(request);
+    };
 
     /**
      * 获取OkHttpClient实例
@@ -96,6 +104,7 @@ private static OkHttpClient getOkHttpClient() {
                     }
 
                     mOkHttpClient = builder.cache(cache)
+                            .addInterceptor(mNetInterceptor)
                             .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
                             .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
                             .writeTimeout(WRITE_TIMEOUT, TimeUnit.SECONDS)
@@ -173,11 +182,11 @@ public void onError(Throwable e) {
                             String errorInfo = "";
                             try {
                                 errorInfo = ((HttpException) e).response().errorBody().string();
-                                if (errorInfo.startsWith("{")){
+                                if (errorInfo.startsWith("{")) {
                                     JSONObject jsonObject = new JSONObject(errorInfo);
                                     String error = jsonObject.getString("msg");
                                     result.error(error);
-                                }else{
+                                } else {
                                     result.error(errorInfo);
                                 }
                             } catch (IOException | JSONException e1) {

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/charts/PlaylistPresenter.kt b/app/src/main/java/com/cyl/musiclake/ui/music/charts/PlaylistPresenter.kt
@@ -105,10 +105,10 @@ constructor() : BasePresenter<PlaylistContract.View>(), PlaylistContract.Present
     }
 
     /**
-     * 加载网易排行榜（0歌曲）
+     * 加载推荐歌单列表（0歌曲）
      */
     fun loadNetease(tag: String) {
-        val observable = NeteaseApiServiceImpl.getTopPlaylists(tag, 30)
+        val observable = NeteaseApiServiceImpl.getTopPlaylists(tag, 100)
         ApiManager.request(observable, object : RequestCallBack<MutableList<Playlist>> {
             override fun success(result: MutableList<Playlist>) {
                 mView?.showNeteaseCharts(result)
@@ -121,10 +121,10 @@ constructor() : BasePresenter<PlaylistContract.View>(), PlaylistContract.Present
     }
 
     /**
-     * 加载网易排行榜（0歌曲）
+     * 加载精品歌单列表（0歌曲）
      */
     fun loadHighQualityPlaylist(tag: String) {
-        val observable = NeteaseApiServiceImpl.getTopPlaylistsHigh(tag, 30, null)
+        val observable = NeteaseApiServiceImpl.getTopPlaylistsHigh(tag, 100, null)
         ApiManager.request(observable, object : RequestCallBack<MutableList<Playlist>> {
             override fun success(result: MutableList<Playlist>) {
                 mView?.showNeteaseCharts(result)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -508,7 +508,7 @@
 
     <string name="action_share">Share</string>
     <string name="action_reply">Reply</string>
-    <string name="copyright_info">Copyright© 2020 MusicLake Group</string>
+    <string name="copyright_info">Copyright© 2016-2021 MusicLake Group</string>
     <string name="delete_playlist_tips">是否删除这个歌单？</string>
     <string name="clear_history_playlist_tips">是否清空播放历史？</string>
     <string name="choose_singer">选择歌手</string>

diff --git a/doc/音乐接口组件库接入.md b/doc/音乐接口组件库接入.md
@@ -0,0 +1,35 @@
+# musicApi音乐接口接入文档
+
+
+
+为了减少MusicLake工程对音乐api的依赖，方便api调用和版本隔离，特意将音乐相关的api接口和调用方式封住成了一个库。
+
+### 接入方式
+
+在app/build.gradle配置中添加远程依赖
+```
+implementation 'com.github.caiyonglong:musicapi:1.1.4'
+```
+### 本地调试musicApi库
+
+一、首先将 [https://github.com/caiyonglong/MusicApi](https://github.com/caiyonglong/MusicApi) 库clone到本地
+注意，需要和MusicLake同级目录。
+
+二、修改 setting.gradle
+
+```
+include ':musicapi'
+project (':musicapi').projectDir = new File('../MusicClientApi/musicapi')
+```
+三、在 app/build.gradle配置中添加依赖
+注释远程依赖库、增加本地musicapi依赖看库
+
+```
+implementation project(':musicapi')
+```
+具体可参考项目中的setting.gradle 和app/build.gradle
+
+
+
+**欢迎star 、PR、isuee！！！**
+