修改老师端首页

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

@@ -7,6 +7,8 @@ import com.cooleshow.base.BuildConfig;
  */
 public abstract class WebConstants {
     public static final String WEB_UA_PARAMS = ";COLEXIUAPPA";
+    public static final String WEB_UA_PARAMS_STUDENT = ";COLEXIUSTUDENT";
+    public static final String WEB_UA_PARAMS_TEACHER = ";COLEXIUTEACHER";
     public static final String WEB_JS_INTERFACE = "COLEXIU";
     public static final String WEB_URL = "web_url";//
     public static final String WEB_SOCKET_URL_TEST = "wss://dev.colexiu.com/audioAnalysis";

BaseLibrary/src/main/java/com/cooleshow/base/widgets/BadgeIconListView.java

@@ -2,6 +2,7 @@ package com.cooleshow.base.widgets;
 
 import android.content.Context;
 import android.media.Image;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +17,10 @@ import androidx.annotation.Nullable;
  * Author by pq, Date on 2022/7/25.
  */
 public class BadgeIconListView extends LinearLayout {
-
+    public static final String STYLE_TYPE = "STYLE";
+    public static final String VIDEON_TYPE = "VIDEON";
+    public static final String LIVE_TYPE = "LIVE";
+    public static final String MUSIC_TYPE = "MUSIC";
     private ImageView mIvVipIcon;
     private ImageView mIvStyleIcon;
     private ImageView mIvMusicSheetIcon;
@@ -77,4 +81,13 @@ public class BadgeIconListView extends LinearLayout {
         }
     }
 
+    public void setData(String tag) {
+        if (!TextUtils.isEmpty(tag)) {
+            setStyleIcon(tag.contains(STYLE_TYPE));
+            setVideoCourseIcon(tag.contains(VIDEON_TYPE));
+            setLiveIcon(tag.contains(LIVE_TYPE));
+            setMusicSheetIcon(tag.contains(MUSIC_TYPE));
+        }
+    }
+
 }

BaseLibrary/src/main/res/layout/view_badge_list_layout.xml

@@ -5,42 +5,43 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:layout_gravity="center_vertical"
         android:id="@+id/iv_vip_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:src="@drawable/icon_vip_enable" />
 
     <ImageView
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
         android:id="@+id/iv_style_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/icon_style_badge_enable" />
-
-
-    <ImageView
         android:layout_gravity="center_vertical"
         android:layout_marginStart="4dp"
-        android:id="@+id/iv_music_sheet_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/icon_music_sheet_badge_enable" />
+        android:src="@drawable/icon_style_badge_enable" />
 
     <ImageView
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
         android:id="@+id/iv_video_course_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="4dp"
         android:src="@drawable/icon_video_course_badge_enable" />
 
+
     <ImageView
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="4dp"
         android:id="@+id/iv_live_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="4dp"
         android:src="@drawable/icon_live_badge_enable" />
+
+    <ImageView
+        android:id="@+id/iv_music_sheet_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="4dp"
+        android:src="@drawable/icon_music_sheet_badge_enable" />
+
 </merge>

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

@@ -320,7 +320,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     private void initWebView() {
         //声明WebSettings子类
         WebSettings webSettings = webView.getSettings();
-        webSettings.setUserAgentString(webSettings.getUserAgentString() + WebConstants.WEB_UA_PARAMS);
+        webSettings.setUserAgentString(webSettings.getUserAgentString() + WebConstants.WEB_UA_PARAMS+ WebConstants.WEB_UA_PARAMS_STUDENT);
         webSettings.setGeolocationDatabasePath(getApplicationContext().getFilesDir().getPath());
         webSettings.setGeolocationEnabled(true);
         webSettings.setJavaScriptCanOpenWindowsAutomatically(true);

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

@@ -82,4 +82,6 @@ public class TeacherUserInfo implements Serializable {
     public String workUnit;
     public Object liveDate;
     public String createTime;
+    public String tag ;//用于显示老师徽章
+    public int isVip ;//0非会员 1会员
 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -75,7 +75,6 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
 
 
     fun getTeacherInfoSuccess(teacherUserInfo: TeacherUserInfo) {
-        Log.e("sdfafdafdad", "getTeacherInfoSuccess: ")
         if (isDetached) {
             return;
         }
@@ -101,7 +100,18 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
             mViewBinding.ratingBar.visibility = View.GONE
             mViewBinding.tvNoScore.visibility = View.VISIBLE
         }
-
+        if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
+            mViewBinding.llBadge.setVisible(true)
+            mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1)
+            mViewBinding.llBadge.setData(teacherUserInfo.tag)
+        } else {
+            if (teacherUserInfo.isVip == 1) {
+                mViewBinding.llBadge.setVipIcon(true)
+                mViewBinding.llBadge.setVisible(true)
+            } else {
+                mViewBinding.llBadge.setVisible(false)
+            }
+        }
 
         //粉丝数
         mViewBinding.tvFansNum.text = teacherUserInfo.fansNum;
@@ -116,30 +126,28 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
                 mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_entry_doing)
                 mViewBinding.ivCertificationStatus.visibility = View.VISIBLE
                 mViewBinding.ivUnCertificationTip.visibility = View.GONE
-                mViewBinding.llBadge.setVisible(false)
+                mViewBinding.groupTeacherExtra.visibility = View.INVISIBLE
             }
             TeacherInfoConstants.ENTRY_STATUS_PASS -> {
                 //入驻审核通过
                 mViewBinding.ivCertificationStatus.visibility = View.GONE
                 mViewBinding.ivUnCertificationTip.visibility = View.GONE
-                mViewBinding.llBadge.setVisible(true)
+                mViewBinding.groupTeacherExtra.visibility = View.VISIBLE
                 mViewBinding.llBadge.setStyleIcon(true)
             }
             else -> {
                 //未通过或者未申请
-                mViewBinding.llBadge.setVisible(false)
                 mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_un_certification)
                 mViewBinding.ivCertificationStatus.visibility = View.VISIBLE
                 mViewBinding.ivUnCertificationTip.visibility = View.GONE
+                mViewBinding.groupTeacherExtra.visibility = View.INVISIBLE
             }
         }
         musicianAuthStatus = teacherUserInfo.musicianAuthStatus
         when (teacherUserInfo.musicianAuthStatus) {
             TeacherInfoConstants.MUSICIAN_STATUS_PASS -> {
-                mViewBinding.llBadge.setMusicSheetIcon(true);
             }
             else -> {
-                mViewBinding.llBadge.setMusicSheetIcon(false);
             }
         }
     }

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

@@ -320,7 +320,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     private void initWebView() {
         //声明WebSettings子类
         WebSettings webSettings = webView.getSettings();
-        webSettings.setUserAgentString(webSettings.getUserAgentString() + WebConstants.WEB_UA_PARAMS);
+        webSettings.setUserAgentString(webSettings.getUserAgentString() + WebConstants.WEB_UA_PARAMS + WebConstants.WEB_UA_PARAMS_TEACHER);
         webSettings.setGeolocationDatabasePath(getApplicationContext().getFilesDir().getPath());
         webSettings.setGeolocationEnabled(true);
         webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
@@ -457,7 +457,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
                             }
                         });
                 mShareAction.open();
-            } else if ("video".equals(content.optString("type")) ){
+            } else if ("video".equals(content.optString("type"))) {
                 String videoUrl = content.optString("video");
                 /*增加自定义按钮的分享面板*/
                 mShareAction = new ShareAction(this).setDisplayList(

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

@@ -29,7 +29,6 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_11"
@@ -179,106 +178,83 @@
             android:id="@+id/iv_certification_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="9dp"
+            android:layout_marginTop="25dp"
             android:src="@drawable/icon_home_un_certification"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
-            app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
-            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
 
+        <View
+            android:id="@+id/certification_tip_help_view"
+            android:layout_width="1px"
+            android:layout_height="1px"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_certification_status"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status" />
 
         <ImageView
             android:id="@+id/iv_un_certification_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:layout_marginTop="6dp"
             android:src="@drawable/icon_home_certification_tip"
             android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status"
-            app:layout_constraintRight_toRightOf="@+id/iv_certification_status"
-            app:layout_constraintTop_toBottomOf="@+id/iv_certification_status" />
-
-        <View
-            android:id="@+id/view_bg_teacher_extra"
-            android:layout_width="0dp"
-            android:layout_height="95dp"
-            android:layout_marginStart="14dp"
-            android:layout_marginTop="27dp"
-            android:layout_marginEnd="14dp"
-            android:background="#69B4FE"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
+            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view" />
 
         <TextView
             android:id="@+id/tv_fans_title"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
-            android:layout_marginTop="7dp"
-            android:drawableRight="@drawable/icon_arrow_background"
-            android:drawablePadding="2dp"
+            android:layout_marginTop="16dp"
             android:gravity="center"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
             android:text="粉丝"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintBottom_toBottomOf="@+id/view_bg_teacher_extra"
             app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
-            app:layout_constraintRight_toLeftOf="@+id/tv_course_num_complete_title"
-            app:layout_constraintTop_toBottomOf="@+id/tv_fans_num" />
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
 
         <TextView
             android:id="@+id/tv_course_num_complete_title"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
-            android:layout_marginTop="7dp"
-            android:drawableRight="@drawable/icon_arrow_background"
-            android:drawablePadding="2dp"
             android:gravity="center"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
             android:text="已上课时"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintBottom_toBottomOf="@+id/view_bg_teacher_extra"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
             app:layout_constraintLeft_toRightOf="@+id/tv_fans_title"
-            app:layout_constraintRight_toLeftOf="@+id/tv_course_num_no_start_title"
-            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_completed" />
+            app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
 
         <TextView
             android:id="@+id/tv_course_num_no_start_title"
             android:layout_width="wrap_content"
             android:layout_height="28dp"
-            android:layout_marginTop="7dp"
-            android:drawableRight="@drawable/icon_arrow_background"
-            android:drawablePadding="2dp"
             android:gravity="center"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
             android:text="未上课时"
-            android:textColor="@color/white"
+            android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintBottom_toBottomOf="@+id/view_bg_teacher_extra"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
             app:layout_constraintLeft_toRightOf="@+id/tv_course_num_complete_title"
-            app:layout_constraintRight_toRightOf="@+id/view_bg_teacher_extra"
-            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_not_start" />
+            app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
+
 
         <TextView
             android:id="@+id/tv_fans_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:includeFontPadding="false"
             android:text="0"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_20"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/tv_fans_title"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
             app:layout_constraintLeft_toLeftOf="@+id/tv_fans_title"
             app:layout_constraintRight_toRightOf="@+id/tv_fans_title"
-            app:layout_constraintTop_toTopOf="@+id/view_bg_teacher_extra"
-            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintTop_toBottomOf="@+id/tv_fans_title"
             tools:text="1344" />
 
         <TextView
@@ -286,14 +262,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_20"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/tv_course_num_complete_title"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
             app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_complete_title"
             app:layout_constraintRight_toRightOf="@+id/tv_course_num_complete_title"
-            app:layout_constraintTop_toTopOf="@+id/view_bg_teacher_extra"
-            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_complete_title"
             tools:text="34" />
 
         <TextView
@@ -301,21 +274,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_20"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/tv_course_num_no_start_title"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
             app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_no_start_title"
             app:layout_constraintRight_toRightOf="@+id/tv_course_num_no_start_title"
-            app:layout_constraintTop_toTopOf="@+id/view_bg_teacher_extra"
-            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_no_start_title"
             tools:text="34" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/group_teacher_extra"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="visible"
+            android:visibility="invisible"
             app:constraint_referenced_ids="tv_course_num_not_start,tv_course_num_completed,tv_fans_num,tv_fans_title,tv_course_num_complete_title,tv_course_num_no_start_title" />
 
 
@@ -324,11 +294,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="20dp"
             android:layout_marginEnd="14dp"
             android:background="@drawable/bg_white_10dp"
             android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/view_bg_teacher_extra">
+            app:layout_constraintTop_toBottomOf="@+id/tv_fans_num">
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewpager_menu"
@@ -338,20 +308,20 @@
                 android:scrollbars="none" />
         </FrameLayout>
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bg_announcement"
             android:layout_width="match_parent"
             android:layout_height="44dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="@dimen/dp_10"
             android:layout_marginEnd="14dp"
             android:background="@drawable/bg_white_10dp"
             android:elevation="2dp"
             android:orientation="horizontal"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fl_top_menu">
+            app:layout_constraintTop_toBottomOf="@+id/fl_top_menu"
+            app:layout_goneMarginTop="@dimen/dp_20">
 
             <ImageView
                 android:id="@+id/iv_bell"