增加机构首页接口逻辑

gradle.properties

@@ -43,3 +43,7 @@ TEST_BASE_URL_H5_STUDENT ="https://dev.colexiu.com/student"
 RELEASE_BASE_URL_H5_STUDENT ="https://online.colexiu.com/student"
 DEV_BASE_URL_H5_STUDENT ="https://ponline.colexiu.com/student"
 
+TEST_BASE_URL_H5_JG ="https://dev.colexiu.com/tenant"
+RELEASE_BASE_URL_H5_JG ="https://online.colexiu.com/tenant"
+DEV_BASE_URL_H5_JG ="https://ponline.colexiu.com/tenant"
+

institution/build.gradle

@@ -27,9 +27,17 @@ android {
     }
 
     buildTypes {
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "String", "BASE_URL_H5_JG", TEST_BASE_URL_H5_JG
+        }
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField "String", "BASE_URL_H5_JG", RELEASE_BASE_URL_H5_JG
         }
     }
     compileOptions {

institution/src/main/java/com/cooleshow/institution/stu/adapter/HomeHotMusicSheetAdapter.java

@@ -10,7 +10,7 @@ import com.cooleshow.institution.stu.R;
 import com.cooleshow.institution.stu.bean.HomeHotMusicSheetBean;
 import com.cooleshow.institution.stu.bean.HomeHotMusicSheetItemBean;
 import com.cooleshow.institution.stu.constants.Constants;
-import com.cooleshow.institution.stu.widget.HomeHotMusicSheetItemView;
+import com.cooleshow.institution.stu.widget.JGHomeHotMusicSheetItemView;
 
 import androidx.annotation.NonNull;
 
@@ -36,7 +36,7 @@ public class HomeHotMusicSheetAdapter extends BaseQuickAdapter<HomeHotMusicSheet
         if (homeHotMusicSheetItemBean.sheetBeans != null && homeHotMusicSheetItemBean.sheetBeans.size() > 0) {
             for (int i = 0; i < homeHotMusicSheetItemBean.sheetBeans.size(); i++) {
                 HomeHotMusicSheetBean.MusicSheetBean homeHotMusicSheetBean = homeHotMusicSheetItemBean.sheetBeans.get(i);
-                HomeHotMusicSheetItemView hotMusicSheetItemView = new HomeHotMusicSheetItemView(getContext());
+                JGHomeHotMusicSheetItemView hotMusicSheetItemView = new JGHomeHotMusicSheetItemView(getContext());
                 hotMusicSheetItemView.setData(homeHotMusicSheetBean);
                 int result = i % (Constants.MAX_HOT_MUSIC_LIST_PAGE - 1);
                 if (i != 0 && i == homeHotMusicSheetItemBean.sheetBeans.size() - 1 && result == 0) {

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebConstants.java

@@ -0,0 +1,17 @@
+package com.cooleshow.institution.stu.constants;
+
+import com.cooleshow.base.common.BaseApplication;
+import com.cooleshow.institution.stu.BuildConfig;
+
+/**
+ * Author by pq, Date on 2023/9/12.
+ */
+public class JGWebConstants {
+    public static final String STUDENT_MUSIC_ALBUM_DETAIL = getBaseUrlH5() + "/#/music-album-detail/";
+
+    //曲目详情页
+    public static final String MUSIC_SHEET_DETAIL = getBaseUrlH5() + "/#/music-detail?id=";
+    private static String getBaseUrlH5() {
+        return BuildConfig.BASE_URL_H5_JG;
+    }
+}

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebStartHelper.java

@@ -0,0 +1,21 @@
+package com.cooleshow.institution.stu.constants;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.WebConstants;
+import com.cooleshow.base.router.RouterPath;
+
+/**
+ * Author by pq, Date on 2023/9/12.
+ */
+public class JGWebStartHelper {
+    /**
+     * 打开老师个人主页
+     * @param
+     */
+    public static void startMusicSheetDetail(String musicId) {
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, JGWebConstants.MUSIC_SHEET_DETAIL + musicId)
+                .navigation();
+    }
+}

institution/src/main/java/com/cooleshow/institution/stu/ui/main/CardAnimFragment.java

@@ -45,7 +45,6 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
         }
         if (pageType == HomePageType.TRACK_LIST.getValue()) {
             assetName = "lottieHome/track_list.json";
-            mViewBinding.viewLiveAnim.setImageAssetsFolder("lottieHome/trackList/images/");
         }
         mViewBinding.viewLiveAnim.setAnimation(assetName);
     }

institution/src/main/java/com/cooleshow/institution/stu/ui/main/HomeMusicFragment.java

@@ -20,6 +20,7 @@ import com.cooleshow.institution.stu.bean.HomeHotMusicSheetItemBean;
 import com.cooleshow.institution.stu.bean.HomePageMode;
 import com.cooleshow.institution.stu.bean.HotAlbumBean;
 import com.cooleshow.institution.stu.constants.Constants;
+import com.cooleshow.institution.stu.constants.JGWebConstants;
 import com.cooleshow.institution.stu.contract.HomeMusicContract;
 import com.cooleshow.institution.stu.databinding.FgHomeMusicLayoutBinding;
 import com.cooleshow.institution.stu.presenter.HomeMusicPresenter;
@@ -62,7 +63,6 @@ public class HomeMusicFragment extends BaseMVPFragment<FgHomeMusicLayoutBinding,
     @Override
     protected void initData() {
         initViewModel();
-        initListener();
         mBannerImageAdapter = new BannerImageAdapter<AppHomeBean.ItemBean>(itemBeans) {
             @Override
             public void onBindView(BannerImageHolder holder, AppHomeBean.ItemBean data, int position, int size) {
@@ -125,6 +125,8 @@ public class HomeMusicFragment extends BaseMVPFragment<FgHomeMusicLayoutBinding,
         mViewBinding.rvHotTrack.addItemDecoration(itemDecoration);
         mViewBinding.rvHotTrack.setLayoutManager(musicSheetManager);
         mViewBinding.rvHotTrack.setAdapter(mHomeHotMusicSheetAdapter);
+
+        initListener();
     }
 
     private void initListener() {
@@ -135,6 +137,13 @@ public class HomeMusicFragment extends BaseMVPFragment<FgHomeMusicLayoutBinding,
                 getData();
             }
         });
+        mAlbumAdapter.setOnItemClickListener((adapter, view, position) -> {
+            HotAlbumBean.RowsBean item = (HotAlbumBean.RowsBean) adapter.getItem(position);
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, JGWebConstants.STUDENT_MUSIC_ALBUM_DETAIL + item.id)
+                    .navigation();
+        });
     }
 
     private void initViewModel() {
@@ -149,7 +158,7 @@ public class HomeMusicFragment extends BaseMVPFragment<FgHomeMusicLayoutBinding,
 
     private void getData() {
         //banner
-//        presenter.appHome();
+        presenter.appHome();
         //热门专辑
         presenter.userAccountPage();
         //曲目列表

institution/src/main/java/com/cooleshow/institution/stu/widget/HomeHotMusicSheetItemView.java → institution/src/main/java/com/cooleshow/institution/stu/widget/JGHomeHotMusicSheetItemView.java

@@ -11,12 +11,14 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.MusicSheetUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.institution.stu.R;
 import com.cooleshow.institution.stu.bean.HomeHotMusicSheetBean;
+import com.cooleshow.institution.stu.constants.JGWebStartHelper;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -24,7 +26,7 @@ import androidx.annotation.Nullable;
 /**
  * Author by pq, Date on 2022/8/8.
  */
-public class HomeHotMusicSheetItemView extends FrameLayout {
+public class JGHomeHotMusicSheetItemView extends FrameLayout {
     public static final String CHARGE_TYPE_FREE = "FREE";
     public static final String CHARGE_TYPE_VIP = "VIP";
     public static final String CHARGE_TYPE_CHARGE = "CHARGE";
@@ -35,19 +37,22 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
     private LinearLayout mLlMusicSubject;
     private View mViewLine;
     private HomeHotMusicSheetBean.MusicSheetBean mBean;
-    private ImageView mIvGoodTag;
     private LinearLayout mTagContainer;
     private View mIvAlbumTag;
+    private TextView mTvGoodTag;
+    private ImageView mIvCollectStatus;
+    private ImageView mIvCover;
+    private TextView mTvVipTag;
 
-    public HomeHotMusicSheetItemView(@NonNull Context context) {
+    public JGHomeHotMusicSheetItemView(@NonNull Context context) {
         this(context, null);
     }
 
-    public HomeHotMusicSheetItemView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public JGHomeHotMusicSheetItemView(@NonNull Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, -1);
     }
 
-    public HomeHotMusicSheetItemView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    public JGHomeHotMusicSheetItemView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init();
     }
@@ -55,13 +60,16 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
     private void init() {
         LayoutInflater.from(getContext()).inflate(R.layout.jg_view_hot_music_sheet_child_layout, this);
         mTagContainer = findViewById(R.id.ll_tag_container);
-        mIvGoodTag = findViewById(R.id.iv_good_tag);
+        mTvGoodTag = findViewById(R.id.tv_good_tag);
         mTvName = findViewById(R.id.tv_name);
         mTvAuthor = findViewById(R.id.tv_author);
         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);
+        mIvCollectStatus = findViewById(R.id.iv_collect_status);
+        mIvCover = findViewById(R.id.iv_cover);
+        mTvVipTag = findViewById(R.id.tv_vip_tag);
         setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -69,7 +77,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
                     if (UiUtils.isFastClick()) {
                         return;
                     }
-                    WebStartHelper.startMusicSheetDetail(String.valueOf(mBean.id));
+                    JGWebStartHelper.startMusicSheetDetail(String.valueOf(mBean.id));
                 }
             }
         });
@@ -88,25 +96,30 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
         }
         //上传人
         if (mTvUploadAuthor != null) {
-            mTvUploadAuthor.setText(String.format("上传者：%s", data.addName));
+//            mTvUploadAuthor.setText(String.format("上传者：%s", data.addName));
+            mTvUploadAuthor.setText(data.addName);
         }
 
-
-        mLlMusicSubject.removeAllViews();
-        if (!TextUtils.isEmpty(data.subjectNames)) {
-            String[] split = data.subjectNames.split(",");
-            if (split != null && split.length > 0) {
-                for (int i = 0; i < split.length; i++) {
-                    createSubjectView(split[i]);
-                }
-            }
-        }
+        //VIP标记
+        mTvVipTag.setVisibility(TextUtils.equals(data.chargeType, CHARGE_TYPE_VIP) ? View.VISIBLE : View.GONE);
+//        mLlMusicSubject.removeAllViews();
+//        if (!TextUtils.isEmpty(data.subjectNames)) {
+//            String[] split = data.subjectNames.split(",");
+//            if (split != null && split.length > 0) {
+//                for (int i = 0; i < split.length; i++) {
+//                    createSubjectView(split[i]);
+//                }
+//            }
+//        }
+        GlideUtils.INSTANCE.loadImage(getContext(), data.titleImg, mIvCover, R.drawable.icon_music_track_placeholder);
+        boolean isFavorite = TextUtils.equals(data.favorite, "1");
+        mIvCollectStatus.setImageResource(isFavorite ? R.drawable.icon_collected : R.drawable.icon_uncollect);
 
         //精品曲目标记
-        mIvGoodTag.setVisibility(TextUtils.equals(data.exquisiteFlag, "1") ? View.VISIBLE : View.GONE);
+        mTvGoodTag.setVisibility(TextUtils.equals(data.exquisiteFlag, "1") ? View.VISIBLE : View.GONE);
 
-        //专辑曲目标记
-        MusicSheetUtils.addAlbumTag(data.albumNums,mIvAlbumTag);
+//        //专辑曲目标记
+//        MusicSheetUtils.addAlbumTag(data.albumNums,mIvAlbumTag);
     }
 
     private void createSubjectView(String text) {
@@ -123,7 +136,7 @@ public class HomeHotMusicSheetItemView extends FrameLayout {
 
     public void setDividingLineIsShow(boolean isShow) {
         if (mViewLine != null) {
-            mViewLine.setVisibility(isShow ? View.VISIBLE : View.INVISIBLE);
+            mViewLine.setVisibility(isShow ? View.INVISIBLE : View.INVISIBLE);
         }
     }
 }

institution/src/main/res/drawable/shape_border_fe2451_3dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp" android:color="#FE2451"/>
+    <corners android:radius="3dp"/>
+</shape>

institution/src/main/res/drawable/shape_ff9a60_to_ff4e2b_6dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#FF9A60"
+        android:endColor="#FF4E2B"/>
+    <corners android:topLeftRadius="6dp"
+        android:bottomRightRadius="6dp"/>
+</shape>

institution/src/main/res/layout/fg_home_music_layout.xml

@@ -74,6 +74,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLines="1"
+            android:text="竖笛"
             android:textColor="@color/color_131415"
             android:textSize="@dimen/sp_14"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -115,7 +116,7 @@
 
     <TextView
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="28dp"
         android:layout_marginEnd="3dp"
         android:background="@drawable/shape_ff76a6_to_ff3c81_14dp"
         android:gravity="center"

institution/src/main/res/layout/jg_view_hot_music_sheet_child_layout.xml

@@ -4,98 +4,153 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="79dp"
-    android:paddingStart="11dp"
-    android:paddingEnd="11dp">
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp">
 
 
+    <com.cooleshow.base.widgets.QMUIRadiusImageView
+        android:id="@+id/iv_cover"
+        android:layout_width="51dp"
+        android:layout_height="51dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:qmui_corner_radius="6dp" />
+
+    <TextView
+        android:visibility="gone"
+        android:paddingEnd="4dp"
+        android:paddingStart="4dp"
+        android:id="@+id/tv_vip_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_ff9a60_to_ff4e2b_6dp"
+        android:text="VIP"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_cover"
+        app:layout_constraintTop_toTopOf="@+id/iv_cover" />
+
     <LinearLayout
         android:id="@+id/ll_tag_container"
         android:layout_width="wrap_content"
         android:layout_height="17dp"
+        android:layout_marginStart="10dp"
         android:orientation="horizontal"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/tv_upload_author"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
-<!--    <TextView-->
-<!--       -->
-<!--        android:id="@+id/tv_tag"-->
-<!--        android:layout_width="30dp"-->
-<!--        android:layout_height="17dp"-->
-<!--        android:background="@drawable/shape_01b84f_border"-->
-<!--        android:gravity="center"-->
-<!--        android:text="免费"-->
-<!--        android:textSize="@dimen/sp_10"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent" />-->
+    <!--    <TextView-->
+    <!--       -->
+    <!--        android:id="@+id/tv_tag"-->
+    <!--        android:layout_width="30dp"-->
+    <!--        android:layout_height="17dp"-->
+    <!--        android:background="@drawable/shape_01b84f_border"-->
+    <!--        android:gravity="center"-->
+    <!--        android:text="免费"-->
+    <!--        android:textSize="@dimen/sp_10"-->
+    <!--        app:layout_constraintLeft_toLeftOf="parent"-->
+    <!--        app:layout_constraintTop_toTopOf="parent" />-->
 
     <ImageView
-        android:visibility="gone"
         android:id="@+id/iv_good_tag"
+        android:layout_width="14dp"
+        android:layout_height="17dp"
         android:layout_marginStart="5dp"
-        app:layout_constraintLeft_toRightOf="@+id/ll_tag_container"
-        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
         android:src="@drawable/icon_home_good_music_sheet_tag"
-        android:layout_width="14dp"
-        android:layout_height="17dp"/>
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
+        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_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
+        android:src="@drawable/icon_music_is_album_tag"
+        android:visibility="gone"
         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"/>
+        app:layout_constraintTop_toTopOf="@+id/ll_tag_container" />
 
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:lines="1"
-        android:layout_marginStart="6dp"
-        app:layout_goneMarginStart="0dp"
         android:textColor="@color/color_1a1a1a"
         android:textSize="@dimen/sp_16"
-        app:layout_constraintWidth_default="wrap"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/iv_collect_status"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintBottom_toBottomOf="@+id/ll_tag_container"
-        app:layout_constraintLeft_toRightOf="@+id/iv_album_tag"
+        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
         app:layout_constraintRight_toLeftOf="@+id/tv_author"
-        app:layout_constraintTop_toTopOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/iv_cover"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_goneMarginStart="0dp"
         tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦尔第" />
 
     <TextView
-        android:maxLines="1"
         android:id="@+id/tv_author"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
-        android:paddingStart="6dp"
         android:maxLength="6"
+        android:maxLines="1"
+        android:paddingStart="6dp"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintRight_toLeftOf="@+id/iv_play"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintRight_toLeftOf="@+id/iv_play"
         app:layout_constraintTop_toTopOf="@+id/tv_name"
         tools:text="-维瓦尔第…维瓦尔第维瓦尔第" />
 
     <ImageView
+        android:id="@+id/iv_collect_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:src="@drawable/icon_uncollect"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name" />
+
+    <TextView
+        android:id="@+id/tv_good_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:background="@drawable/shape_border_fe2451_3dp"
+        android:includeFontPadding="false"
+        android:paddingStart="4dp"
+        android:paddingTop="1dp"
+        android:paddingEnd="4dp"
+        android:paddingBottom="1dp"
+        android:text="精品"
+        android:textColor="@color/color_fe2451"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_collect_status"
+        app:layout_constraintLeft_toRightOf="@+id/iv_collect_status"
+        app:layout_constraintTop_toTopOf="@+id/iv_collect_status" />
+
+    <ImageView
         android:id="@+id/iv_play"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="14dp"
-        android:src="@drawable/icon_music_sheet_play"
+        android:src="@drawable/jg_icon_music_sheet_play"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -105,28 +160,29 @@
         android:id="@+id/tv_upload_author"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginStart="6dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"
-        android:textColor="@color/color_999999"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintWidth_default="wrap"
+        android:textColor="@color/color_777777"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_good_tag"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toRightOf="@+id/tv_good_tag"
         app:layout_constraintRight_toLeftOf="@+id/ll_music_subject"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="@+id/ll_tag_container"
-        app:layout_constraintTop_toBottomOf="@+id/ll_tag_container"
+        app:layout_constraintTop_toTopOf="@+id/tv_good_tag"
+        app:layout_constraintWidth_default="wrap"
         tools:text="上传者：一把剑走天涯一把剑走天涯一把剑走天涯一把剑走天涯一把剑走天涯" />
 
     <LinearLayout
-        android:layout_marginEnd="5dp"
-        android:layout_marginStart="12dp"
         android:id="@+id/ll_music_subject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="5dp"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tv_upload_author"
         app:layout_constraintLeft_toRightOf="@+id/tv_upload_author"
         app:layout_constraintRight_toLeftOf="@+id/iv_play"

institution/src/main/res/values/colors.xml

@@ -5,4 +5,6 @@
     <color name="color_121b2e">#121B2E</color>
     <color name="color_131415">#131415</color>
     <color name="color_66000000">#66000000</color>
+    <color name="color_fe2451">#FE2451</color>
+    <color name="color_777777">#777777</color>
 </resources>

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -288,6 +288,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             } else {
                 webViewUrl = (url + "?Authorization=" + authorization);
             }
+            LOG.i("webViewUrl:"+webViewUrl);
             webView.loadUrl(webViewUrl);
         } else {
             webView.loadUrl(url);