各曲目列表增加专辑曲目tag标记

BaseLibrary/src/main/java/com/cooleshow/base/utils/MusicSheetUtils.java

@@ -3,6 +3,7 @@ package com.cooleshow.base.utils;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.Gravity;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -16,13 +17,14 @@ public class MusicSheetUtils {
     public static final String CHARGE_TYPE_FREE = "FREE";
     public static final String CHARGE_TYPE_VIP = "VIP";
     public static final String CHARGE_TYPE_CHARGE = "CHARGE";
-    public static void createTag(Context context,ViewGroup viewParent, String chargeType) {
+
+    public static void createTag(Context context, ViewGroup viewParent, String chargeType) {
         TextView textView = new TextView(context);
         textView.setWidth(SizeUtils.dp2px(30));
         textView.setHeight(SizeUtils.dp2px(17));
         textView.setTextSize(10);
         textView.setGravity(Gravity.CENTER);
-        setTagStyle(context,chargeType, textView);
+        setTagStyle(context, chargeType, textView);
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         if (viewParent.getChildCount() >= 1) {
             params.setMargins(SizeUtils.dp2px(4), 0, 0, 0);
@@ -30,7 +32,7 @@ public class MusicSheetUtils {
         viewParent.addView(textView, params);
     }
 
-    private static void setTagStyle(Context context,String chargeType, TextView tvTag) {
+    private static void setTagStyle(Context context, String chargeType, TextView tvTag) {
         if (TextUtils.equals(chargeType, CHARGE_TYPE_FREE)) {
             tvTag.setText("免费");
             tvTag.setTextColor(context.getResources().getColor(com.cooleshow.base.R.color.color_01b84f));
@@ -49,4 +51,21 @@ public class MusicSheetUtils {
             tvTag.setBackgroundResource(R.drawable.shape_3591ce_border);
         }
     }
+
+    /**
+     * 添加专辑曲目标签
+     * @param albumNums
+     * @param albumTagView
+     */
+    public static void addAlbumTag(int albumNums, View albumTagView) {
+        if (albumTagView == null) {
+            return;
+
+        }
+        if (albumNums > 0) {
+            albumTagView.setVisibility(View.VISIBLE);
+        } else {
+            albumTagView.setVisibility(View.GONE);
+        }
+    }
 }

student/src/main/java/com/cooleshow/student/bean/HomeHotMusicSheetBean.java

@@ -121,5 +121,6 @@ public class HomeHotMusicSheetBean {
         public String xmlFileUrl;
         public String exquisiteFlag;//是否是精品曲目 0否 1是
         public String paymentType;
+        public int albumNums;
     }
 }

student/src/main/java/com/cooleshow/student/widgets/HomeHotMusicSheetItemView.java

@@ -40,6 +40,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
     private HomeHotMusicSheetBean.RowsBean mBean;
     private ImageView mIvGoodTag;
     private LinearLayout mTagContainer;
+    private View mIvAlbumTag;
 
     public HomeHotMusicSheetItemView(@NonNull Context context) {
         this(context, null);
@@ -63,6 +64,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
         mTvUploadAuthor = findViewById(R.id.tv_upload_author);
         mLlMusicSubject = findViewById(R.id.ll_music_subject);
         mViewLine = findViewById(R.id.view_line);
+        mIvAlbumTag = findViewById(R.id.iv_album_tag);
         setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -122,6 +124,8 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
                 }
             }
         }
+        //专辑曲目标记
+        MusicSheetUtils.addAlbumTag(data.albumNums,mIvAlbumTag);
     }
 
     private void createSubjectView(String text) {

student/src/main/res/layout/view_hot_music_sheet_child_layout.xml

@@ -41,6 +41,17 @@
         android:layout_width="14dp"
         android:layout_height="17dp"/>
 
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/iv_album_tag"
+        android:layout_marginStart="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
+        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        android:src="@drawable/icon_music_is_album_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="0dp"
@@ -55,7 +66,7 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        app:layout_constraintLeft_toRightOf="@+id/iv_album_tag"
         app:layout_constraintRight_toLeftOf="@+id/tv_author"
         app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
         tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦尔第" />

teacher/src/main/java/com/cooleshow/teacher/adapter/HomePageSheetMusicAdapter.java

@@ -97,6 +97,10 @@ public class HomePageSheetMusicAdapter extends BaseQuickAdapter<HomePageSheetMus
         } else {
             iv_good_tag.setVisibility(View.GONE);
         }
+
+        //专辑曲目标记
+        View iv_album_tag=holder.getView(R.id.iv_album_tag);
+        MusicSheetUtils.addAlbumTag(bean.albumNums,iv_album_tag);
     }
 
     @NonNull

teacher/src/main/java/com/cooleshow/teacher/adapter/MineScoreAdapter.java

@@ -159,6 +159,9 @@ public class MineScoreAdapter extends BaseQuickAdapter<MusicSheetListBean.RowsBe
         } else {
             iv_good_tag.setVisibility(View.GONE);
         }
+        //专辑曲目标记
+        View iv_album_tag=helper.getView(R.id.iv_album_tag);
+        MusicSheetUtils.addAlbumTag(item.albumNums,iv_album_tag);
     }
 
     private void createSubjectView(ViewGroup parent, String text) {

teacher/src/main/java/com/cooleshow/teacher/bean/HomeHotMusicSheetBean.java

@@ -121,5 +121,6 @@ public class HomeHotMusicSheetBean {
         public String xmlFileUrl;
         public String exquisiteFlag;
         public String paymentType;
+        public int albumNums;
     }
 }

teacher/src/main/java/com/cooleshow/teacher/bean/HomePageSheetMusicListBean.java

@@ -199,5 +199,6 @@ public class HomePageSheetMusicListBean {
         public String titleImg;
         public String exquisiteFlag;//精品标志(0:否;1:是)
         public String paymentType;
+        public int albumNums;//是否是专辑曲目标记,大于0既是
     }
 }

teacher/src/main/java/com/cooleshow/teacher/bean/MusicSheetListBean.java

@@ -105,5 +105,6 @@ public class MusicSheetListBean {
         public String titleImg;
         public String exquisiteFlag;//精品标志(0:否;1:是)
         public String paymentType;
+        public int albumNums;//是否是专辑曲目标记
     }
 }

teacher/src/main/java/com/cooleshow/teacher/widgets/HomeHotMusicSheetItemView.java

@@ -37,6 +37,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
     private boolean isGood = false;//是否是精品曲目
     private ImageView mIvGoodTag;
     private LinearLayout mTagContainer;
+    private View mIvAlbumTag;
 
     public HomeHotMusicSheetItemView(@NonNull Context context) {
         this(context, null);
@@ -60,6 +61,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
         mLlMusicSubject = findViewById(R.id.ll_music_subject);
         mViewLine = findViewById(R.id.view_line);
         mIvGoodTag = findViewById(R.id.iv_good_tag);
+        mIvAlbumTag = findViewById(R.id.iv_album_tag);
         setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -116,6 +118,8 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
                 }
             }
         }
+        //专辑曲目标记
+        MusicSheetUtils.addAlbumTag(data.albumNums,mIvAlbumTag);
     }
 
     private void createSubjectView(String text) {

teacher/src/main/res/layout/item_home_page_sheet_music_layout.xml

@@ -43,6 +43,18 @@
         android:src="@drawable/icon_home_good_music_sheet_tag"
         android:layout_width="14dp"
         android:layout_height="17dp"/>
+
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/iv_album_tag"
+        android:layout_marginStart="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
+        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        android:src="@drawable/icon_music_is_album_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/tv_upload_author"
         android:layout_width="wrap_content"
@@ -70,7 +82,7 @@
         android:textColor="@color/color_1a1a1a"
         android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        app:layout_constraintLeft_toRightOf="@+id/iv_album_tag"
         app:layout_constraintRight_toLeftOf="@+id/fl_status"
         app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
         tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦尔第E第一维瓦尔第维瓦尔第维瓦尔第E第一维瓦尔第维瓦尔第维瓦尔第" />

teacher/src/main/res/layout/layout_mine_score_item.xml

@@ -44,6 +44,17 @@
         android:layout_width="14dp"
         android:layout_height="17dp"/>
 
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/iv_album_tag"
+        android:layout_marginStart="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
+        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        android:src="@drawable/icon_music_is_album_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/tv_upload_author"
         android:layout_width="wrap_content"
@@ -73,7 +84,7 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        app:layout_constraintLeft_toRightOf="@+id/iv_album_tag"
         app:layout_constraintRight_toLeftOf="@+id/tv_author"
         app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
         tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦E第一维瓦尔第维瓦尔第维瓦尔第尔第" />

teacher/src/main/res/layout/view_hot_music_sheet_child_layout.xml

@@ -16,7 +16,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <ImageView
         android:id="@+id/iv_good_tag"
         android:layout_width="14dp"
@@ -28,6 +27,18 @@
         app:layout_constraintLeft_toRightOf="@+id/ll_tag_container"
         app:layout_constraintTop_toTopOf="@+id/ll_tag_container" />
 
+
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/iv_album_tag"
+        android:layout_marginStart="5dp"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
+        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        android:src="@drawable/icon_music_is_album_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="0dp"
@@ -42,7 +53,7 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintLeft_toRightOf="@+id/iv_good_tag"
+        app:layout_constraintLeft_toRightOf="@+id/iv_album_tag"
         app:layout_constraintRight_toLeftOf="@+id/tv_author"
         app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
         tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦尔第" />