去掉音乐人认证

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

@@ -18,6 +18,15 @@ public class WebStartHelper {
     }
 
     /**
+     * 开启达人认证页面
+     */
+    public static void startCertPage(){
+        ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
+                .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
+                .navigation();
+    }
+
+    /**
      * 开启上传乐谱页面
      */
     public static void startUploadSheetMusicPage(){

teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -6,6 +6,7 @@ import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.HomeMenuBean;
 import com.cooleshow.teacher.bean.LiveListBean;
 import com.cooleshow.teacher.bean.LivePlayBackDataBean;
+import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
 import com.cooleshow.teacher.bean.request.AssignHomeWorkEntry;
 import com.cooleshow.teacher.bean.request.CommentHomeWorkEntry;
 import com.cooleshow.teacher.bean.request.LiveCourseEntry;
@@ -273,6 +274,15 @@ public interface APIService {
     @GET(TEACHER_GROUP + "teacher/queryUserInfo")
     Observable<BaseResponse<TeacherUserInfo>> getTeacherUserInfo();
 
+     /**
+     * 查询老师个人信息
+     *
+     * @param
+     * @return
+     */
+    @GET(TEACHER_GROUP + "userAccount/detail")
+    Observable<BaseResponse<TeacherPromoteIncomeBean>> getTeacherPromoteIncome();
+
     /**
      * 查询老师个人风采
      *

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

@@ -0,0 +1,30 @@
+package com.cooleshow.teacher.bean;
+
+/**
+ * Author by pq, Date on 2022/7/27.
+ */
+public class TeacherPromoteIncomeBean {
+    /**
+     * amountFrozen : 0
+     * amountRecorded : 0
+     * amountShare : 0
+     * amountTotal : 0
+     * amountUnrecorded : 0
+     * amountUsable : 0
+     * createTime :
+     * status : 0
+     * updateTime :
+     * userId : 0
+     */
+
+    public String amountFrozen;
+    public String amountRecorded;
+    public String amountShare;
+    public String amountTotal;
+    public String amountUnrecorded;
+    public String amountUsable;
+    public String createTime;
+    public int status;
+    public String updateTime;
+    public String userId;
+}

teacher/src/main/java/com/cooleshow/teacher/contract/MainContract.java

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
@@ -13,6 +14,8 @@ public interface MainContract {
         void getUserInfoSuccess(UserInfo userInfo);
 
         void getTeacherInfoSuccess(TeacherUserInfo teacherUserInfo);
+
+        void getTeacherPromoteInfoSuccess(TeacherPromoteIncomeBean teacherPromoteIncomeBean);
     }
 
     interface Presenter {

teacher/src/main/java/com/cooleshow/teacher/presenter/main/MainPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.main;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
+import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomeContract;
 import com.cooleshow.teacher.contract.MainContract;
@@ -41,4 +42,18 @@ public class MainPresenter extends BasePresenter<MainContract.MainView> implemen
             }
         });
     }
+
+    /**
+     * 获取老师推广计划收益
+     */
+    public void getTeacherPromoteInfo() {
+        addSubscribe(create(APIService.class).getTeacherPromoteIncome(), new BaseObserver<TeacherPromoteIncomeBean>(getView()) {
+            @Override
+            protected void onSuccess(TeacherPromoteIncomeBean data) {
+                if (getView() != null) {
+                    getView().getTeacherPromoteInfoSuccess(data);
+                }
+            }
+        });
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/HomePageActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.HomePageContract;
 import com.cooleshow.teacher.databinding.ActivityHomePageLayoutBinding;
 import com.cooleshow.teacher.presenter.homePage.HomePagePresenter;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 
@@ -144,8 +145,11 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
         if (isFinishing() || isDestroyed()) {
             return;
         }
+        //save达人认证状态和开通直播状态
+        UserHelper.saveTeacherCertificationStatus(info.entryStatus);
+        UserHelper.saveTeacherOpenLiveFlag(info.liveFlag);
         if (mMusicPageFragment != null) {
-            mMusicPageFragment.setMusicPersonCertStatus(info.musicianAuthStatus);
+            mMusicPageFragment.setMusicPersonCertStatus(info.entryStatus);
         }
         //星级
         if (info.starGrade > 0) {

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SheetMusicPageFragment.java

@@ -23,6 +23,7 @@ import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.SheetMusicPageContract;
 import com.cooleshow.teacher.databinding.FragmentSheetMusicPageLayoutBinding;
 import com.cooleshow.teacher.presenter.homePage.SheetMusicPagePresenter;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
@@ -43,10 +44,10 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
     private boolean hasNext = true;
     private EmptyViewLayout mEmptyView;
     private View mCertTipView;
-    private String musicPersonCertStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
     private List<QuerySubjectBean> subjectBeanList = new ArrayList<>();
     private int currentSubjectId = 0;
     private String mIdNames;
+    private String teacherCertStatus = TeacherInfoConstants.ENTRY_STATUS_UNPAALY;
 
     @Override
     protected void initView(View rootView) {
@@ -100,7 +101,8 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
         if (mViewBinding == null) {
             return;
         }
-        if (TextUtils.equals(musicPersonCertStatus, TeacherInfoConstants.MUSICIAN_STATUS_PASS)) {
+        String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
+        if (TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             mViewBinding.groupContent.setVisibility(View.VISIBLE);
             mViewBinding.searchView.setOnLeftClickListener(v -> {
                 selectVocalPart();
@@ -259,22 +261,21 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
     /**
      * 设置音乐人认证状态
      *
-     * @param musicianAuthStatus
+     * @param
      */
-    public void setMusicPersonCertStatus(String musicianAuthStatus) {
-        if (!TextUtils.equals(this.musicPersonCertStatus, musicianAuthStatus)) {
-            this.musicPersonCertStatus = musicianAuthStatus;
+    public void setMusicPersonCertStatus(String entryStatus) {
+        if (!TextUtils.equals(this.teacherCertStatus, entryStatus)) {
+            this.teacherCertStatus = entryStatus;
             checkCertStatus();
             return;
         }
-//        this.musicPersonCertStatus = musicianAuthStatus;
     }
 
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.tv_go_cert) {
             //去认证音乐人
-            WebStartHelper.startMusicPersonCertPage();
+            WebStartHelper.startCertPage();
             return;
         }
         if (v.getId() == R.id.view_upload_bg) {

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

@@ -191,7 +191,6 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
                     return;
                 }
                 ARouter.getInstance().build(RouterPath.ScoreCenter.TEACHER_MINE_SCORE)
-                    .withString("musicianAuthStatus", musicianAuthStatus)
                     .navigation()
             }
             R.id.card_after_class_homework -> {

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

@@ -30,6 +30,7 @@ import com.cooleshow.base.utils.helper.UpdateAppHelper;
 import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
+import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.MainContract;
 import com.cooleshow.teacher.databinding.ActivityMainBinding;
@@ -293,6 +294,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         super.onResume();
         presenter.getUserInfo();
         presenter.getTeacherUserInfo();
+        presenter.getTeacherPromoteInfo();
     }
 
     @Override
@@ -344,6 +346,16 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     }
 
     @Override
+    public void getTeacherPromoteInfoSuccess(TeacherPromoteIncomeBean teacherPromoteIncomeBean) {
+        if (isFinishing() || isDestroyed()) {
+            return;
+        }
+        if (mMineFragment != null) {
+            mMineFragment.getTeacherPromoteInfoSuccess(teacherPromoteIncomeBean);
+        }
+    }
+
+    @Override
     protected MainPresenter createPresenter() {
         return new MainPresenter();
     }

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

@@ -16,6 +16,7 @@ import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.teacher.R;
+import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.MineContract;
@@ -119,16 +120,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             hintCertificationOtherView();
         }
 
-        //音乐人认证状态
-        if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_PASS)) {
-            mViewBinding.tvMusicStatusTip.setText(getString(R.string.cert_completed_str));
-        } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_DOING)) {
-            mViewBinding.tvMusicStatusTip.setText("审核中");
-        } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY)) {
-            mViewBinding.tvMusicStatusTip.setText("未认证");
-        } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPASS)) {
-            mViewBinding.tvMusicStatusTip.setText("审核未通过");
-        }
         //银行卡绑定状态
         if (teacherUserInfo.isBank == 0) {
             mViewBinding.tvBankCardBindTip.setText("未绑定");
@@ -339,4 +330,9 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
     }
 
 
+    public void getTeacherPromoteInfoSuccess(TeacherPromoteIncomeBean incomeBean) {
+        if (incomeBean != null && mViewBinding.tvPromoteIncomeTip != null) {
+            mViewBinding.tvPromoteIncomeTip.setText(String.format("累计收益%s元", incomeBean.amountShare));
+        }
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -29,6 +29,7 @@ import com.cooleshow.teacher.presenter.score.MineScoreActPresenter;
 import com.cooleshow.teacher.ui.web.HtmlActivity;
 import com.cooleshow.teacher.widgets.DialogUtils;
 import com.cooleshow.teacher.widgets.FileUtils;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.tabs.TabLayout;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareAPI;
@@ -55,7 +56,6 @@ import io.rong.imkit.utils.StatusBarUtil;
  */
 @Route(path = RouterPath.ScoreCenter.TEACHER_MINE_SCORE)
 public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding, MineScoreActPresenter> implements MineScoreActContract.MineScoreActView, View.OnClickListener {
-    private String musicianAuthStatus;
     private String currentSubjectId = "";
     private String currentSearchStr = "";
     private TabLayout tabLayout;
@@ -69,8 +69,9 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.tv_right:
-                if (!TextUtils.equals(musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_PASS)) {
-                    ToastUtil.getInstance().show(this, "您还未通过音乐人认证");
+                String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
+                if (!TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
+                    ToastUtil.getInstance().show(this, "您还未通过达人认证");
                     return;
                 }
                 presenter.musicSheetShare();
@@ -112,7 +113,6 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     @Override
     public void initData() {
         super.initData();
-        musicianAuthStatus = getIntent().getStringExtra("musicianAuthStatus");
         initTabLayoutAndViewPager();
         presenter.querySubjectItem();
     }
@@ -177,7 +177,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
         fragments.clear();
         for (int i = 0; i < titles.size(); i++) {
             tabLayout.addTab(tabLayout.newTab().setText(titles.get(i)));
-            Fragment adFragment = MineScoreFragment.newInstance(auditStatusList.get(i), musicianAuthStatus);
+            Fragment adFragment = MineScoreFragment.newInstance(auditStatusList.get(i));
             fragments.add(adFragment);
         }
         viewPager.setAdapter(new MineLiveCoursePagerAdapter(getSupportFragmentManager(), fragments, titles));

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -28,6 +28,7 @@ import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.MineScoreContract;
 import com.cooleshow.teacher.databinding.FragmentMineScoreBinding;
 import com.cooleshow.teacher.presenter.score.MineScorePresenter;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
@@ -44,7 +45,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     private String auditStatus = "";
     private String currentSubjectId = "";
     private String currentSearchStr = "";
-    private String musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
+//    private String musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
     private MineScoreAdapter mineScoreAdapter;
 
     @Override
@@ -56,11 +57,10 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
         }
     }
 
-    public static MineScoreFragment newInstance(String auditStatus, String musicianAuthStatus) {
+    public static MineScoreFragment newInstance(String auditStatus) {
         Bundle args = new Bundle();
         MineScoreFragment fragment = new MineScoreFragment();
         args.putString("auditStatus", auditStatus);
-        args.putString("musicianAuthStatus", musicianAuthStatus);
         fragment.setArguments(args);
         return fragment;
     }
@@ -84,13 +84,9 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     @Override
     protected void initView(View rootView) {
         auditStatus = getArguments().getString("auditStatus");
-        musicianAuthStatus = getArguments().getString("musicianAuthStatus");
         if (TextUtils.isEmpty(auditStatus)) {
             auditStatus = "PASS";
         }
-        if (TextUtils.isEmpty(musicianAuthStatus)) {
-            musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_PASS;
-        }
         RecyclerView rvAddress = mViewBinding.recyclerView;
         mViewBinding.llUploadScore.setOnClickListener(this);
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
@@ -104,24 +100,26 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
         tv_empty_hint.setText("暂无曲谱~");
         mineScoreAdapter.setEmptyView(emptyLayout);
         rvAddress.setAdapter(mineScoreAdapter);
-        switch (musicianAuthStatus) {
-            case TeacherInfoConstants.MUSICIAN_STATUS_PASS:
+        String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
+        switch (teacherCertificationStatus) {
+            case TeacherInfoConstants.ENTRY_STATUS_PASS:
+                //达人认证通过
                 mViewBinding.llContent.setVisibility(View.VISIBLE);
                 mViewBinding.clEmpty.setVisibility(View.GONE);
                 break;
-            case TeacherInfoConstants.MUSICIAN_STATUS_DOING:
+            case TeacherInfoConstants.ENTRY_STATUS_DOING:
                 mViewBinding.llContent.setVisibility(View.GONE);
                 mViewBinding.clEmpty.setVisibility(View.VISIBLE);
                 mViewBinding.tvEmptyHint.setText("您已提交认证申请\n请耐心等待审核结果~");
                 mViewBinding.gotoVerifyBtn.setVisibility(View.GONE);
                 break;
-            case TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY:
+            case TeacherInfoConstants.ENTRY_STATUS_UNPAALY:
                 mViewBinding.llContent.setVisibility(View.GONE);
                 mViewBinding.clEmpty.setVisibility(View.VISIBLE);
                 mViewBinding.tvEmptyHint.setText(getString(R.string.go_cert_music_person_tip));
                 mViewBinding.gotoVerifyBtn.setVisibility(View.VISIBLE);
                 break;
-            case TeacherInfoConstants.MUSICIAN_STATUS_UNPASS:
+            case TeacherInfoConstants.ENTRY_STATUS_UNPASS:
                 mViewBinding.llContent.setVisibility(View.GONE);
                 mViewBinding.clEmpty.setVisibility(View.VISIBLE);
                 mViewBinding.tvEmptyHint.setText("您已提交认证申请未通过\n请重新提交~");
@@ -129,7 +127,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
                 break;
         }
         mViewBinding.gotoVerifyBtn.setOnClickListener(v -> {
-            WebStartHelper.startMusicPersonCertPage();
+            WebStartHelper.startCertPage();
         });
         mineScoreAdapter.setOnItemClickListener((adapter, view, position) -> {
             List<MusicSheetListBean.RowsBean> data = mineScoreAdapter.getData();

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

@@ -88,27 +88,27 @@
             app:layout_constraintRight_toLeftOf="@+id/iv_scan"
             app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_teacher_entry_tag"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="6dp"-->
-<!--            android:src="@drawable/icon_teahcer_entry_tag"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
-
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_teacher_music_person_tag"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="3dp"-->
-<!--            android:src="@drawable/icon_teacher_music_person_tag"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
+        <!--        <ImageView-->
+        <!--            android:id="@+id/iv_teacher_entry_tag"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginStart="6dp"-->
+        <!--            android:src="@drawable/icon_teahcer_entry_tag"-->
+        <!--            android:visibility="gone"-->
+        <!--            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
+        <!--            app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
+        <!--            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
+
+        <!--        <ImageView-->
+        <!--            android:id="@+id/iv_teacher_music_person_tag"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginStart="3dp"-->
+        <!--            android:src="@drawable/icon_teacher_music_person_tag"-->
+        <!--            android:visibility="gone"-->
+        <!--            app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
+        <!--            app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
+        <!--            app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
 
         <RatingBar
             android:id="@+id/rating_bar"
@@ -296,10 +296,10 @@
             android:layout_marginLeft="21dp"
             android:layout_marginTop="20dp"
             android:layout_marginRight="21dp"
-            app:layout_goneMarginTop="30dp"
             android:background="@drawable/icon_mine_vip_bg"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ll_fans" />
+            app:layout_constraintTop_toBottomOf="@+id/ll_fans"
+            app:layout_goneMarginTop="30dp" />
 
 
         <View
@@ -329,10 +329,10 @@
             android:id="@+id/tv_validity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="0"
             android:textColor="@color/color_fed271"
             android:textSize="@dimen/sp_14"
             android:textStyle="bold"
-            android:text="0"
             app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
             app:layout_constraintLeft_toRightOf="@+id/tv_validity_start"
             app:layout_constraintTop_toTopOf="@+id/view_vip_star"
@@ -353,8 +353,8 @@
             android:layout_width="@dimen/dp_75"
             android:layout_height="@dimen/dp_20"
             android:layout_marginRight="16dp"
-            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
             android:background="@drawable/icon_mine_vip_center"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
             app:layout_constraintRight_toRightOf="@+id/view_vip_bg"
             app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
 
@@ -504,19 +504,19 @@
                 android:id="@+id/tv_my_account"
                 style="@style/me_btn_style"
                 android:layout_marginTop="@dimen/dp_12"
-                android:drawableLeft="@drawable/icon_music_person_cert"
-                android:text="音乐人认证"
+                android:drawableLeft="@drawable/icon_invite_plan"
+                android:text="酷乐秀推广计划"
                 android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:id="@+id/tv_music_status_tip"
+                android:id="@+id/tv_promote_income_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="18dp"
                 android:layout_marginEnd="25dp"
-                android:text="@string/un_cert_str"
+                android:text="累计收益0元"
                 android:textColor="@color/color_999999"
                 android:textSize="@dimen/sp_13"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_my_account"

teacher/src/main/res/values/strings.xml

@@ -20,7 +20,7 @@
     <string name="un_cert_str">未认证</string>
     <string name="cert_completed_str">已认证</string>
     <string name="self_introduction_str">个人介绍</string>
-    <string name="go_cert_music_person_tip">您还没有完成音乐人认证，认证后\n才可上传乐谱哦～</string>
+    <string name="go_cert_music_person_tip">您还没有完成达人认证，认证后\n才可上传乐谱哦～</string>
     <string name="go_cert">去认证</string>
     <string name="close_str">关闭</string>
     <string name="reverse_camera_str">翻转</string>