修复榜单崩溃，修改自动化编译脚本

caiyonglong · Jul 28, 2020 · 794e99d · 794e99d
1 parent e4d9b80
commit 794e99d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-29.0.2
+    - android-29
     - extra-google-m2repository
     - extra-android-m2repository
     - extra-android-m2repository

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/charts/activity/NeteasePlaylistActivity.kt b/app/src/main/java/com/cyl/musiclake/ui/music/charts/activity/NeteasePlaylistActivity.kt
@@ -25,7 +25,7 @@ class NeteasePlaylistActivity : BasePlaylistActivity() {
         mPlaylist?.pid?.let {
             mPresenter?.loadPlaylist(it, mPlaylist?.type)
         }
-        LogUtil.d(TAG,"mPlaylist "+mPlaylist.toString())
+        LogUtil.d(TAG,"mPlaylist "+mPlaylist?.toString())
     }
 
     override fun retryLoading() {
@@ -47,7 +47,4 @@ class NeteasePlaylistActivity : BasePlaylistActivity() {
         return mPlaylist
     }
 
-    companion object {
-        private val TAG = "NeteasePlaylistActivity"
-    }
 }
diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/edit/EditSongAdapter.kt b/app/src/main/java/com/cyl/musiclake/ui/music/edit/EditSongAdapter.kt
@@ -22,7 +22,7 @@ class EditSongAdapter(list: MutableList<Music>) : BaseItemDraggableAdapter<Music
     override fun convert(holder: BaseViewHolder, item: Music) {
         holder.setText(R.id.tv_title, item.title)
         holder.setText(R.id.tv_artist, item.artist)
-        CoverLoader.loadImageView(mContext, item.coverUri, holder.getView(R.id.iv_cover))
+//        CoverLoader.loadImageView(mContext, item.coverUri, holder.getView(R.id.iv_cover))
         holder.getView<CheckBox>(R.id.cb_select).isChecked = checkedMap.containsKey(item.mid.toString())
         holder.itemView.setOnClickListener {
             if (checkedMap.containsKey(item.mid.toString())) {

diff --git a/app/src/main/res/layout/item_music_edit.xml b/app/src/main/res/layout/item_music_edit.xml
@@ -30,6 +30,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:elevation="1dp"
+        android:visibility="gone"
         android:scaleType="centerCrop"
         android:transitionName="@string/transition_cover"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -45,7 +46,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:ellipsize="end"
         android:lines="1"
@@ -62,7 +63,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:gravity="start"