添加部分H5功能页面入口

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

@@ -141,6 +141,10 @@ public abstract class WebConstants {
     public static final String SEARCH_PAGE = getBaseUrlH5() + "/#/music-songbook/search";
     //优惠券
     public static final String COUPONS_PAGE = getBaseUrlH5() + "/#/coupons";
+    //联系我们
+    public static final String CONTACT_US_PAGE = getBaseUrlH5() + "/#/contactus";
+    //我的乐谱
+    public static final String MINE_MUSIC_SHEET = getBaseUrlH5() + "/#/mySheetMusic";
 
 
 }

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

@@ -151,4 +151,24 @@ public class WebStartHelper {
                 .withString(WebConstants.WEB_URL, WebConstants.COUPONS_PAGE)
                 .navigation();
     }
+
+    /**
+     * 打开联系我们
+     */
+    public  static void startContactUs(){
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.CONTACT_US_PAGE)
+                .navigation();
+    }
+
+    /**
+     * 打开我的收藏(我的乐谱)
+     */
+    public  static void startMineFavorite(){
+        ARouter.getInstance()
+                .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.MINE_MUSIC_SHEET)
+                .navigation();
+    }
 }

student/src/main/java/com/cooleshow/student/ui/main/MineFragment.java

@@ -176,6 +176,10 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 //优惠券
                 WebStartHelper.startCouponsPage();
                 break;
+            case R.id.tv_contact_us:
+                //联系我们
+                WebStartHelper.startContactUs();
+                break;
         }
     }
 
@@ -246,6 +250,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.llResidueClass.setOnClickListener(this);
         mViewBinding.ivScan.setOnClickListener(this);
         mViewBinding.tvFeedback.setOnClickListener(this);
+        mViewBinding.tvContactUs.setOnClickListener(this);
     }
 
     @Override

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

@@ -670,7 +670,6 @@
                 android:text="意见反馈"
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_16"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
 
@@ -682,6 +681,31 @@
                 app:layout_constraintBottom_toBottomOf="@+id/tv_feedback"
                 app:layout_constraintRight_toRightOf="@+id/tv_feedback"
                 app:layout_constraintTop_toTopOf="@+id/tv_feedback" />
+
+            <TextView
+                android:id="@+id/tv_contact_us"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginBottom="10dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="@dimen/dp_15"
+                android:text="联系我们"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_feedback" />
+
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_22"
+                android:background="@drawable/icon_arrow_right2"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_contact_us"
+                app:layout_constraintRight_toRightOf="@+id/tv_contact_us"
+                app:layout_constraintTop_toTopOf="@+id/tv_contact_us" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -81,7 +81,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.tvHomework.setOnClickListener(this);
         mViewBinding.tvCourseComment.setOnClickListener(this);
         mViewBinding.llBadge.setOnClickListener(this);
-
+        mViewBinding.tvContactUs.setOnClickListener(this);
     }
 
     @Override
@@ -366,6 +366,10 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 //我的优惠券
                 WebStartHelper.startCouponsPage();
                 break;
+            case R.id.tv_contact_us:
+                //联系我们
+                WebStartHelper.startContactUs();
+                break;
         }
     }
 
@@ -413,6 +417,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             WebStartHelper.startCouponsPage();
             return;
         }
+        if(TextUtils.equals(type,MineFragmentToolsHelper.TYPE_MINE_FAVORITE)){
+            //我的收藏
+            WebStartHelper.startMineFavorite();
+            return;
+        }
     }
 
     private void goStyle() {

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/MineFragmentToolsHelper.java

@@ -19,15 +19,16 @@ public class MineFragmentToolsHelper {
     public static final String TYPE_MINE_MUSIC_SHEET = "MUSIC_SHEET";//我的乐谱
     public static final String TYPE_MINE_COURSE = "COURSE";//我的课程
     public static final String TYPE_MINE_COUPON = "COUPON";//我的优惠券
+    public static final String TYPE_MINE_FAVORITE = "MY_COLLECT";//我的收藏
     public static final String[] TYPES = new String[]{TYPE_MINE_HOME_PAGE, TYPE_MINE_INCOME,
             TYPE_MINE_STYLE, TYPE_MINE_GOODS_ORDER,
-            TYPE_MINE_MUSIC_SHEET, TYPE_MINE_COURSE, TYPE_MINE_COUPON};
+            TYPE_MINE_MUSIC_SHEET, TYPE_MINE_COURSE, TYPE_MINE_COUPON,TYPE_MINE_FAVORITE};
     public static final String[] TITLES = new String[]{"我的主页", "我的收入",
             "个人风采", "商品订单",
-            "我的乐谱", "我的课程", "我的优惠券"};
+            "我的乐谱", "我的课程", "我的优惠券","我的收藏"};
     public static final int[] ICON_DRAWABLES = new int[]{R.drawable.icon_mine_page, R.drawable.icon_mine_income,
             R.drawable.icon_mine_style, R.drawable.icon_goods_order,
-            R.drawable.icon_mine_sheet_music, R.drawable.icon_mine_course, R.drawable.icon_mine_coupon};
+            R.drawable.icon_mine_sheet_music, R.drawable.icon_mine_course, R.drawable.icon_mine_coupon, R.drawable.icon_mine_coupon};
 
     public static ArrayList<MineToolMenuBean> getData(String... filterDatas) {
         ArrayList<MineToolMenuBean> list = new ArrayList<>();

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

@@ -858,6 +858,14 @@
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_help"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
+
+            <TextView
+                android:id="@+id/tv_contact_us"
+                style="@style/me_btn_style"
+                android:text="联系我们"
+                android:visibility="visible"
+                app:layout_constraintLeft_toLeftOf="@+id/tv_help"
+                app:layout_constraintTop_toBottomOf="@+id/tv_help" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>