增加点击事件

BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -66,6 +66,8 @@ public abstract class WebConstants {
     public static final String STUDENT_MUSIC_ALBUM_DETAIL = getBaseUrlH5() + "/#/music-album-detail/";
     //学生端直播间购物车
     public static final String STUDENT_LIVE_SHOP_CAR_URL = getBaseUrlH5() + "/#/liveActiveList";
+    //热门曲目
+    public static final String HOT_MUSIC_SHEET_LIST = getBaseUrlH5() + "/#/music-list";
 
 
     //注册协议

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/WebStartHelper.java

@@ -89,4 +89,35 @@ public class WebStartHelper {
                 .withString(WebConstants.WEB_URL, WebConstants.PROMOTE_PLAN_PAGE)
                 .navigation();
     }
+
+    /**
+     * 热门专辑
+     */
+    public static void startHotAlbum(){
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.STUDENT_MUSIC_ALBUM)
+                .navigation();
+    }
+
+    /**
+     * 打开专辑详情页
+     * @param id
+     */
+    public static void startHotAlbumDetail(String id){
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.STUDENT_MUSIC_ALBUM_DETAIL + id)
+                .navigation();
+    }
+
+    /**
+     * 热门曲目
+     */
+    public static void startHotMusicSheetList(){
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.HOT_MUSIC_SHEET_LIST)
+                .navigation();
+    }
 }

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

@@ -66,7 +66,7 @@ public class HomeHotAlbumListBean {
         public boolean delFlag;
         public String favorite;
         public String hotFlag;
-        public int id;
+        public String id;
         public int musicSheetCount;
         public String musicTagNames;
         public int sortNumber;

teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragment.java

@@ -4,6 +4,8 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
@@ -12,6 +14,7 @@ import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomeHotAlbumAdapter;
 import com.cooleshow.teacher.adapter.HomeHotMusicSheetAdapter;
@@ -37,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -62,7 +66,6 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
 
     @Override
     protected void initData() {
-        initListener();
         initMenu();
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         manager.setOrientation(LinearLayoutManager.HORIZONTAL);
@@ -77,7 +80,7 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         mViewBinding.rvHotTrack.addItemDecoration(itemDecoration);
         mViewBinding.rvHotTrack.setLayoutManager(musicSheetManager);
         mViewBinding.rvHotTrack.setAdapter(mHomeHotMusicSheetAdapter);
-
+        initListener();
         presenter.getHotAlbumList();
         presenter.getHotMusicSheetList();
     }
@@ -92,7 +95,24 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     }
 
     private void initListener() {
+        mViewBinding.ivScan.setOnClickListener(this);
+        mViewBinding.imMessage.setOnClickListener(this);
         mViewBinding.flCourseEnter.setOnClickListener(this);
+        mViewBinding.ivCert.setOnClickListener(this);
+        mViewBinding.bgAnnouncement.setOnClickListener(this);
+        mViewBinding.tvHotAlbumMore.setOnClickListener(this);
+        mViewBinding.tvHotTrackMore.setOnClickListener(this);
+        mAlbumAdapter.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+                if (position < mAlbumAdapter.getData().size()) {
+                    HomeHotAlbumListBean.RowsBean rowsBean = mAlbumAdapter.getData().get(position);
+                    if (rowsBean != null) {
+                        WebStartHelper.startHotAlbumDetail(rowsBean.id);
+                    }
+                }
+            }
+        });
     }
 
     @Override
@@ -293,12 +313,15 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         //入驻状态
         if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_DOING)) {
             //入驻审核中
+            mViewBinding.ivCert.setClickable(true);
             mViewBinding.ivCert.setImageResource(R.drawable.icon_home_entry_doing);
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
+            mViewBinding.ivCert.setClickable(false);
             mViewBinding.ivCert.setImageResource(R.drawable.icon_home_cert_complete);
         } else {
             //未通过或者未申请
+            mViewBinding.ivCert.setClickable(true);
             mViewBinding.ivCert.setImageResource(R.drawable.icon_home_un_certification);
         }
     }
@@ -349,13 +372,54 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     @Override
     public void onClick(View v) {
         int id = v.getId();
+        if (UiUtils.isFastClick()) {
+            return;
+        }
         if (id == R.id.fl_course_enter) {
-            if (UiUtils.isFastClick()) {
-                return;
-            }
             if (mRecentCourses != null) {
                 gotoCourseDetail(mRecentCourses);
             }
+            return;
+        }
+
+        if (id == R.id.iv_scan) {
+            //二维码扫描
+            ARouter.getInstance()
+                    .build(RouterPath.BaseCenter.SCAN_QR_CODE)
+                    .navigation();
+            return;
+        }
+
+        if (id == R.id.im_message) {
+            //系统消息
+            ARouter.getInstance().build(RouterPath.MessageCenter.TEACHER_MESSAGE_MESSAGEBOX)
+                    .navigation();
+            return;
+        }
+        if (id == R.id.iv_cert) {
+            //达人认证
+            ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
+                    .navigation();
+            return;
+        }
+        if (id == R.id.bg_announcement) {
+            //点击单条公告
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.HELP_CENTER_DETAIL + noticeId)
+                    .navigation();
+            return;
+        }
+        if (id == R.id.tv_hot_album_more) {
+            //热门专辑更多
+            WebStartHelper.startHotAlbum();
+            return;
+        }
+        if (id == R.id.tv_hot_track_more) {
+            //热门曲目更多
+            WebStartHelper.startHotMusicSheetList();
+            return;
         }
     }
 }

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

@@ -52,6 +52,7 @@ import com.cooleshow.base.data.net.RetrofitClientNoToken;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.AppUtils;
+import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
@@ -277,6 +278,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             } else {
                 webViewUrl = (url + "?Authorization=" + authorization);
             }
+            LogUtils.i("pq","webViewUrl:"+webViewUrl);
             webView.loadUrl(webViewUrl);
         } else {
             webView.loadUrl(url);

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

@@ -197,6 +197,7 @@
                 app:layout_constraintTop_toTopOf="@+id/tv_medal_name" />
 
             <ImageView
+                android:clickable="false"
                 android:id="@+id/iv_cert"
                 android:layout_width="wrap_content"
                 android:layout_height="30dp"