Merge branch 'dev' of http://git.dayaedu.com/yonge/cooleshow_android into dev

BaseLibrary/src/main/res/drawable/bg_white_default_shape.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <solid android:color="@color/white"/>
-    <corners android:radius="5dp"/>
+    <corners android:radius="8dp"/>
 </shape>

build.gradle

@@ -38,6 +38,11 @@ allprojects {
         //微博
 //        maven { url "https://dl.bintray.com/thelasterstar/maven/" }
     }
+    configurations.all {
+        resolutionStrategy {
+            force 'org.xerial:sqlite-jdbc:3.34.0'
+        }
+    }
 }
 
 task clean(type: Delete) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Apr 06 14:48:48 CST 2022
+#Sun Jun 26 00:41:23 CST 2022
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists

teacher/src/main/java/com/cooleshow/teacher/adapter/TeachableSelectAdapter.java

@@ -24,6 +24,9 @@ public class TeachableSelectAdapter extends BaseQuickAdapter<TeachableInstrument
 
     @Override
     protected void convert(BaseViewHolder helper, TeachableInstrumentBean item) {
+        if(item == null){
+            return;
+        }
         TextView tv_name=helper.getView(R.id.tv_name);
         tv_name.setText(item.name);
     }

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

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.ui.homepage;
 
+import android.text.TextUtils;
 import android.view.View;
 
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
@@ -29,7 +30,7 @@ public class MineStyleFragment extends BaseMVPFragment<FragmentMineStyleLayoutBi
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mStyleVideoListAdapter = new MineStyleVideoListAdapter(R.layout.item_mine_style_video_layout);
         MineStyleVideoListItemDecoration itemDecoration = new MineStyleVideoListItemDecoration(SizeUtils.dp2px(11), 0, 0, 0, SizeUtils.dp2px(5));
-        GridLayoutManager gridLayoutManager =new GridLayoutManager(getContext(),2);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 2);
         mViewBinding.recyclerView.setLayoutManager(gridLayoutManager);
         mViewBinding.recyclerView.addItemDecoration(itemDecoration);
         mViewBinding.recyclerView.setAdapter(mStyleVideoListAdapter);
@@ -64,7 +65,11 @@ public class MineStyleFragment extends BaseMVPFragment<FragmentMineStyleLayoutBi
             return;
         }
         //个人介绍
-        mViewBinding.tvSelfIntroduction.setText(styleInfoBean.introduction);
+        if (TextUtils.isEmpty(styleInfoBean.introduction)) {
+
+        } else {
+            mViewBinding.tvSelfIntroduction.setText(styleInfoBean.introduction);
+        }
         //视频信息
         if (mStyleVideoListAdapter != null) {
             mStyleVideoListAdapter.setNewInstance(styleInfoBean.styleVideo);

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

@@ -205,7 +205,7 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
             //未通过或者未申请
             mViewBinding.llContent.setVisibility(View.GONE);
             mViewBinding.clEmptyFlag.setVisibility(View.VISIBLE);
-            mViewBinding.tvEmptyHint.setText("您还没有完成老师认证\n认证后才可创建直播课哦~");
+            mViewBinding.tvEmptyHint.setText("您还没有完成老师认证，认证后才可创建直播课哦~");
             mViewBinding.tvOpen.setVisibility(View.VISIBLE);
             mViewBinding.tvOpen.setText("去认证");
         }

teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -1,6 +1,9 @@
 package com.cooleshow.teacher.ui.income;
 
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -72,6 +75,29 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
         viewBinding.toolbarInclude.tvRightText.setOnClickListener(this);
         viewBinding.tvWithdrawalAll.setOnClickListener(this);
         viewBinding.tvConfirmWithdrawal.setOnClickListener(this);
+
+        viewBinding.etPrice.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String price = viewBinding.etPrice.getText().toString();
+                if (TextUtils.isEmpty(price)) {
+                    viewBinding.etPrice.setTextSize(20);
+                } else {
+                    viewBinding.etPrice.setTextSize(32);
+                }
+
+            }
+        });
     }
 
     @Override
@@ -104,8 +130,8 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     }
 
     private String getTwoDecimal(double num) {
-        DecimalFormat df=new DecimalFormat("#,##0.00");
-        String str=df.format(num);
+        DecimalFormat df = new DecimalFormat("#,##0.00");
+        String str = df.format(num);
         return str;
 
     }

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

@@ -33,22 +33,16 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         Utils.setHeadView(mViewBinding.viewStatusBar, requireContext(), 0);
         mViewBinding.ivCertificationStatus.setOnClickListener(this);
         mViewBinding.ivUnCertificationTip.setOnClickListener(this);
-        mViewBinding.ivMinePage.setOnClickListener(this);
         mViewBinding.tvMinePage.setOnClickListener(this);
         mViewBinding.tvMineStyle.setOnClickListener(this);
-        mViewBinding.ivMineStyle.setOnClickListener(this);
         mViewBinding.ivAvatar.setOnClickListener(this);
         mViewBinding.ivSetting.setOnClickListener(this);
-        mViewBinding.ivSparingCourseSet.setOnClickListener(this);
         mViewBinding.tvSparingCourseSet.setOnClickListener(this);
-        mViewBinding.ivLiveCourse.setOnClickListener(this);
         mViewBinding.tvLiveCourse.setOnClickListener(this);
-        mViewBinding.ivVideoCourse.setOnClickListener(this);
         mViewBinding.tvVideoCourse.setOnClickListener(this);
         mViewBinding.tvHelp.setOnClickListener(this);
         mViewBinding.tvFeedback.setOnClickListener(this);
         mViewBinding.tvAuthentication.setOnClickListener(this);
-        mViewBinding.ivOpenLive.setOnClickListener(this);
         mViewBinding.tvOpenLive.setOnClickListener(this);
         mViewBinding.llFans.setOnClickListener(this);
         mViewBinding.tvMyAccount.setOnClickListener(this);
@@ -57,7 +51,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.llCourseNumCompleted.setOnClickListener(this);
         mViewBinding.llCourseNumNotStart.setOnClickListener(this);
         mViewBinding.ivGoodsOrder.setOnClickListener(this);
-        mViewBinding.tvGoodsOrder.setOnClickListener(this);
     }
 
     @Override
@@ -172,13 +165,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 mViewBinding.ivUnCertificationTip.setVisibility(View.GONE);
                 break;
             case R.id.tv_mine_page:
-            case R.id.iv_mine_page:
                 //个人主页
                 ARouter.getInstance().build(RouterPath.MineCenter.HOME_PAGE)
                         .navigation();
                 break;
             case R.id.tv_mine_style:
-            case R.id.iv_mine_style:
                 //个人风采
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_STYLE_PAGE)
                         .navigation();
@@ -193,7 +184,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_SETTING)
                         .navigation();
                 break;
-            case R.id.iv_sparing_course_set:
             case R.id.tv_sparing_course_set:
                 //陪练课设置
                 ARouter.getInstance()
@@ -201,13 +191,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .withString(WebConstants.WEB_URL, WebConstants.TEACHER_PRACTICE_SETTING)
                         .navigation();
                 break;
-            case R.id.iv_live_course:
             case R.id.tv_live_course:
                 //直播课
                 ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_LIVE_COURSE)
                         .navigation();
                 break;
-            case R.id.iv_video_course:
             case R.id.tv_video_course:
                 //视频课
                 ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_VIDEO_COURSE)
@@ -234,7 +222,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_MY_BANKCARD)
                         .navigation();
                 break;
-            case R.id.iv_open_live:
             case R.id.tv_open_live:
                 if (liveFlag == 0) {
                     ARouter.getInstance()
@@ -272,7 +259,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .navigation();
                 break;
             //商品订单
-            case R.id.tv_goods_order:
             case R.id.iv_goods_order:
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)

teacher/src/main/java/com/cooleshow/teacher/ui/mine/NetworkMonitoringActivity.java

@@ -332,7 +332,7 @@ public class NetworkMonitoringActivity extends BaseMVPActivity<ActivityNetworkMo
 
                 tvTitle.setText(title);
                 if (title.equals("良好")) {
-                    tvTitle.setTextColor(getResources().getColor(com.cooleshow.base.R.color.colorPrimary));
+                    tvTitle.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
                     tvContent.setGravity(Gravity.CENTER);
                 } else {
                     tvTitle.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_f85043));

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.ui.minestyle;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -11,12 +12,15 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 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.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ActivityUtils;
@@ -118,6 +122,7 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
 
     private List<TeacherSelfStyleInfoBean.StyleVideoBean> videoBeanList = new ArrayList<>();
 
+    @SuppressLint("NotifyDataSetChanged")
     @Override
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "个人风采");
@@ -161,6 +166,10 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
         rvTopSelect.setLayoutManager(flexboxLayoutManager);
         teachableSelectAdapter = new TeachableSelectAdapter(selectTeachableInstrument);
         rvTopSelect.setAdapter(teachableSelectAdapter);
+        teachableSelectAdapter.setOnItemClickListener((adapter, view, position) -> {
+            selectTeachableInstrument.remove(position);
+            teachableSelectAdapter.notifyDataSetChanged();
+        });
         addETListener();
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/TeachableInstrumentActivity.java

@@ -83,8 +83,8 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
     private void initCarryData() {
         if (null != myBundle) {
             carryList = (List<TeachableInstrumentBean>) myBundle.getSerializable("selectTeachableInstrument");
-            if (null==carryList){
-                carryList=new ArrayList<>();
+            if (null == carryList) {
+                carryList = new ArrayList<>();
             }
         }
 
@@ -116,18 +116,16 @@ public class TeachableInstrumentActivity extends BaseMVPActivity<ActivityTeachab
     public void subjectSelectSuccess(List<TeachableInstrumentBean> data) {
         if (null != data && data.size() > 0) {
             dataList.clear();
-            if (carryList.size()>0){
-                for (TeachableInstrumentBean datum : data) {
-                    if (null!=datum.subjects&&datum.subjects.size()>0){
-                        for (TeachableInstrumentBean subject : datum.subjects) {
-                            for (TeachableInstrumentBean teachableInstrumentBean : carryList) {
-                                if (teachableInstrumentBean.id==subject.id){
-                                    subject.isSelect=true;
-                                }
+            for (TeachableInstrumentBean datum : data) {
+                if (null != datum.subjects && datum.subjects.size() > 0) {
+                    for (TeachableInstrumentBean subject : datum.subjects) {
+                        for (TeachableInstrumentBean teachableInstrumentBean : carryList) {
+                            if (teachableInstrumentBean.id == subject.id) {
+                                subject.isSelect = true;
                             }
                         }
-                        dataList.add(datum);
                     }
+                    dataList.add(datum);
                 }
             }
 

teacher/src/main/java/com/cooleshow/teacher/widgets/TeacherEmptyView.java

@@ -0,0 +1,27 @@
+package com.cooleshow.teacher.widgets;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
+import com.cooleshow.teacher.R;
+
+/**
+ * @author dengqw
+ * @time 2022/6/26 16:55
+ * @describe：
+ **/
+public class TeacherEmptyView extends FrameLayout {
+
+    public TeacherEmptyView(@NonNull Context context) {
+        super(context);
+        initView();
+    }
+
+    private void initView() {
+        View view = View.inflate(getContext(), R.layout.teacher_empty_view,this);
+//        view.findViewById()
+    }
+}

teacher/src/main/res/drawable/bg_i_konw_btn.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/dp_24"/>
+    <stroke android:color="#2DC7AA" android:width="@dimen/dp_1"/>
+</shape>

teacher/src/main/res/drawable/bg_reload_btn.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#2DC7AA"/>
+    <corners android:radius="@dimen/dp_24"/>
+</shape>

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

@@ -51,8 +51,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0.00 "
-                    android:textColor="@color/color_ff4444"
+                    android:textColor="@color/color_ff4e19"
                     android:textSize="@dimen/dp_26"
+                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="@id/tv_all_earnings_title"
                     app:layout_constraintTop_toBottomOf="@id/tv_all_earnings_title" />
                 <CheckBox

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

@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:background="@color/color_f6f8f9"
     android:layout_height="match_parent"
+    android:background="@color/color_f6f8f9"
     android:orientation="vertical">
 
     <include
@@ -26,7 +26,6 @@
         app:tabSelectedTextColor="@color/black_333"
         app:tabTextAppearance="@style/tab_layout_style"
         app:tabTextColor="@color/color_666666" />
-
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"

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

@@ -100,16 +100,17 @@
         <EditText
             android:id="@+id/et_price"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_45"
+            android:layout_marginTop="@dimen/dp_30"
             android:layout_marginLeft="30dp"
             android:background="@null"
-            android:gravity="bottom"
+            android:gravity="center_vertical"
+            android:hint="请输入金额"
+            android:textColorHint="@color/color_999999"
             android:inputType="numberDecimal"
             android:paddingLeft="14dp"
-            android:paddingBottom="10dp"
-            tool:text="11111"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_32"
+            android:textSize="@dimen/sp_20"
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/tv_content_money" />
 

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

@@ -58,6 +58,7 @@
                 android:layout_marginLeft="8dp"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_18"
+                android:textStyle="bold"
                 app:layout_constraintLeft_toRightOf="@+id/im_header"
                 app:layout_constraintTop_toTopOf="@+id/im_header"
                 tool:text="李老师" />

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

@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:overScrollMode="never"
     android:background="@color/color_f6f8f9"
+    android:overScrollMode="never"
     android:scrollbars="none">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -92,10 +92,10 @@
             style="@style/HomeRatingBar"
             android:layout_width="wrap_content"
             android:layout_height="19dp"
+            android:isIndicator="true"
             android:numStars="5"
             android:rating="0"
             android:stepSize="1"
-            android:isIndicator="true"
             app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
             app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
             app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
@@ -104,12 +104,12 @@
             android:id="@+id/tv_no_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:text="暂无评分"
             android:textSize="@dimen/sp_13"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
             app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
-            app:layout_constraintTop_toBottomOf="@+id/tv_nickname"
-            android:text="暂无评分"/>
+            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
 
         <ImageView
             android:id="@+id/iv_certification_status"
@@ -120,7 +120,8 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/iv_avatar" />
+            app:layout_constraintTop_toTopOf="@+id/iv_avatar"
+            tools:visibility="visible" />
 
 
         <View
@@ -139,20 +140,20 @@
             android:src="@drawable/icon_home_certification_tip"
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view" />
+            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view"
+            tools:visibility="visible" />
 
         <LinearLayout
             android:id="@+id/ll_fans"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/dp_22"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/ll_course_num_completed"
             app:layout_constraintTop_toBottomOf="@+id/iv_avatar">
 
-
             <TextView
                 android:id="@+id/tv_fans_title"
                 android:layout_width="wrap_content"
@@ -271,190 +272,117 @@
             android:layout_marginStart="14dp"
             android:layout_marginTop="19dp"
             android:layout_marginEnd="14dp"
-            app:layout_goneMarginTop="40dp"
             android:background="@drawable/bg_white_10dp"
             app:layout_constraintBottom_toTopOf="@+id/top_bottom_view"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ll_fans" />
-
-        <ImageView
-            android:id="@+id/iv_mine_page"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="19dp"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_mine_page"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
-            app:layout_constraintRight_toLeftOf="@+id/iv_mine_style"
-            app:layout_constraintTop_toTopOf="@+id/view_top_bg" />
+            app:layout_constraintTop_toBottomOf="@+id/ll_fans"
+            app:layout_goneMarginTop="@dimen/dp_26" />
 
         <TextView
             android:id="@+id/tv_mine_page"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="19dp"
+            android:drawableTop="@drawable/icon_mine_page"
+            android:drawablePadding="@dimen/dp_7"
             android:includeFontPadding="false"
             android:text="@string/mine_page_str"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_mine_page"
-            app:layout_constraintRight_toRightOf="@+id/iv_mine_page"
-            app:layout_constraintTop_toBottomOf="@+id/iv_mine_page" />
-
-
-        <ImageView
-            android:id="@+id/iv_mine_style"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_mine_style"
-            app:layout_constraintLeft_toRightOf="@+id/iv_mine_page"
-            app:layout_constraintRight_toLeftOf="@+id/iv_open_live"
-            app:layout_constraintTop_toTopOf="@+id/iv_mine_page" />
+            app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
+            app:layout_constraintRight_toLeftOf="@+id/tv_mine_style"
+            app:layout_constraintTop_toTopOf="@+id/view_top_bg" />
 
         <TextView
             android:id="@+id/tv_mine_style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_mine_style"
+            android:drawablePadding="@dimen/dp_7"
             android:includeFontPadding="false"
             android:text="个人风采"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_mine_style"
-            app:layout_constraintRight_toRightOf="@+id/iv_mine_style"
-            app:layout_constraintTop_toBottomOf="@+id/iv_mine_style" />
-
-
-        <ImageView
-            android:id="@+id/iv_open_live"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_open_live"
-            app:layout_constraintLeft_toRightOf="@+id/iv_mine_style"
-            app:layout_constraintRight_toLeftOf="@+id/iv_goods_order"
-            app:layout_constraintTop_toTopOf="@+id/iv_mine_page" />
+            app:layout_constraintLeft_toRightOf="@+id/tv_mine_page"
+            app:layout_constraintRight_toLeftOf="@+id/tv_open_live"
+            app:layout_constraintTop_toTopOf="@+id/tv_mine_page" />
 
         <TextView
             android:id="@+id/tv_open_live"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_open_live"
+            android:drawablePadding="@dimen/dp_7"
             android:includeFontPadding="false"
             android:text="开启直播"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_open_live"
-            app:layout_constraintRight_toRightOf="@+id/iv_open_live"
-            app:layout_constraintTop_toBottomOf="@+id/iv_open_live" />
-
-        <ImageView
-            android:id="@+id/iv_goods_order"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="25dp"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_goods_order"
-            app:layout_constraintLeft_toRightOf="@+id/iv_open_live"
-            app:layout_constraintRight_toRightOf="@+id/view_top_bg"
-            app:layout_constraintTop_toTopOf="@+id/iv_mine_page" />
+            app:layout_constraintLeft_toRightOf="@+id/tv_mine_style"
+            app:layout_constraintRight_toLeftOf="@+id/iv_goods_order"
+            app:layout_constraintTop_toTopOf="@+id/tv_mine_style" />
 
         <TextView
-            android:id="@+id/tv_goods_order"
+            android:id="@+id/iv_goods_order"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_goods_order"
+            android:drawablePadding="@dimen/dp_7"
             android:includeFontPadding="false"
             android:text="商品订单"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_goods_order"
-            app:layout_constraintRight_toRightOf="@+id/iv_goods_order"
-            app:layout_constraintTop_toBottomOf="@+id/iv_goods_order" />
-
-
-        <ImageView
-            android:id="@+id/iv_sparing_course_set"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="27dp"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_sparing_course_set"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_mine_page"
-            app:layout_constraintRight_toRightOf="@+id/iv_mine_page"
-            app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
+            app:layout_constraintLeft_toRightOf="@+id/tv_open_live"
+            app:layout_constraintRight_toRightOf="@+id/view_top_bg"
+            app:layout_constraintTop_toTopOf="@+id/tv_mine_style" />
 
         <TextView
             android:id="@+id/tv_sparing_course_set"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_27"
+            android:drawableTop="@drawable/icon_sparing_course_set"
+            android:drawablePadding="@dimen/dp_7"
             android:includeFontPadding="false"
             android:text="陪练课设置"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_sparing_course_set"
-            app:layout_constraintRight_toRightOf="@+id/iv_sparing_course_set"
-            app:layout_constraintTop_toBottomOf="@+id/iv_sparing_course_set" />
-
-
-        <ImageView
-            android:id="@+id/iv_live_course"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_live_course"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_mine_style"
-            app:layout_constraintRight_toRightOf="@+id/iv_mine_style"
-            app:layout_constraintTop_toTopOf="@+id/iv_sparing_course_set" />
+            app:layout_constraintLeft_toLeftOf="@+id/tv_mine_page"
+            app:layout_constraintRight_toRightOf="@+id/tv_mine_page"
+            app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
 
         <TextView
             android:id="@+id/tv_live_course"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_live_course"
+            android:drawablePadding="@dimen/dp_7"
+            android:gravity="center"
             android:includeFontPadding="false"
+            android:minWidth="@dimen/dp_48"
             android:text="直播课"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_live_course"
-            app:layout_constraintRight_toRightOf="@+id/iv_live_course"
-            app:layout_constraintTop_toBottomOf="@+id/iv_live_course" />
-
+            app:layout_constraintLeft_toLeftOf="@+id/tv_mine_style"
+            app:layout_constraintRight_toRightOf="@+id/tv_mine_style"
+            app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
 
-        <ImageView
-            android:id="@+id/iv_video_course"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="7dp"
-            android:paddingEnd="7dp"
-            android:paddingBottom="7dp"
-            android:src="@drawable/icon_video_course"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_open_live"
-            app:layout_constraintRight_toRightOf="@+id/iv_open_live"
-            app:layout_constraintTop_toTopOf="@+id/iv_sparing_course_set" />
 
         <TextView
             android:id="@+id/tv_video_course"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_video_course"
+            android:drawablePadding="@dimen/dp_7"
+            android:gravity="center"
             android:includeFontPadding="false"
+            android:minWidth="@dimen/dp_48"
             android:text="视频课"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/iv_video_course"
-            app:layout_constraintRight_toRightOf="@+id/iv_video_course"
-            app:layout_constraintTop_toBottomOf="@+id/iv_video_course" />
+            app:layout_constraintLeft_toLeftOf="@+id/tv_open_live"
+            app:layout_constraintRight_toRightOf="@+id/tv_open_live"
+            app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
 
 
         <View
@@ -491,9 +419,9 @@
 
             <TextView
                 android:id="@+id/tv_music_status_tip"
-                android:layout_marginEnd="25dp"
                 android:layout_width="39dp"
                 android:layout_height="18dp"
+                android:layout_marginEnd="25dp"
                 android:text="@string/un_cert_str"
                 android:textColor="@color/color_999999"
                 android:textSize="@dimen/sp_13"
@@ -542,13 +470,14 @@
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_equipment_testing"
                 app:layout_constraintTop_toBottomOf="@+id/tv_equipment_testing" />
+
             <TextView
                 android:id="@+id/tv_feedback"
                 style="@style/me_btn_style"
                 android:drawableLeft="@drawable/icon_mine_feedback"
                 android:text="意见反馈"
                 android:textSize="@dimen/sp_14"
-                android:visibility="gone"
+                android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_help"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -63,6 +63,7 @@
             app:layout_constraintTop_toBottomOf="@+id/iv_self_introduction"
             tools:text="毕业于中央音乐学员长笛专业，师从央音长笛系曾获2016年锦绣杯长笛大赛冠军自2018年起研究长笛启蒙、考级到专业考试教育总结出一套适合各个阶段需要的教学方式" />
 
+
         <View
             android:id="@+id/view_video_bg"
             android:layout_width="match_parent"

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

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:id="@+id/ll_content"
@@ -66,6 +67,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -81,16 +83,16 @@
 
         <TextView
             android:id="@+id/tv_empty_hint"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="14dp"
             android:gravity="center"
             android:lineSpacingExtra="4dp"
-            android:text="您还没有完成老师认证\n认证后才可创建直播课哦~"
+            android:text="您还没有完成老师认证，认证后才可创建直播课哦~"
             android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintLeft_toLeftOf="@+id/im_empty_logo"
+            app:layout_constraintRight_toRightOf="@+id/im_empty_logo"
             app:layout_constraintTop_toBottomOf="@+id/im_empty_logo" />
 
         <TextView
@@ -98,7 +100,7 @@
             android:layout_width="@dimen/dp_196"
             android:layout_height="@dimen/dp_44"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="25dp"
+            android:layout_marginTop="@dimen/dp_26"
             android:background="@drawable/shape_course_status_ing"
             android:gravity="center"
             android:text="去认证"

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

@@ -17,7 +17,6 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingTop="18dp"
-        android:paddingBottom="12dp"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_13"
         android:text="全部声部"

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
     <LinearLayout
@@ -67,6 +68,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -82,16 +84,16 @@
 
         <TextView
             android:id="@+id/tv_empty_hint"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="14dp"
             android:gravity="center"
             android:lineSpacingExtra="4dp"
-            android:text="您还没有完成老师认证\n认证后才可创建直播课哦~"
+            android:text="您还没有完成老师认证，认证后才可创建直播课哦~"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_16"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="@+id/im_empty_logo"
+            app:layout_constraintRight_toRightOf="@+id/im_empty_logo"
             app:layout_constraintTop_toBottomOf="@+id/im_empty_logo" />
 
         <TextView

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

@@ -21,12 +21,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="长笛"
+            android:textSize="@dimen/sp_12"
             android:textColor="@color/color_2dc7aa" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="2dp"
+            android:textSize="@dimen/sp_12"
             android:layout_toRightOf="@+id/tv_name"
             android:text="×"
             android:textColor="@color/color_2dc7aa" />

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:ignore="MissingDefaultResource">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -12,7 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_32"
         android:layout_marginEnd="@dimen/dp_32"
-        android:background="@drawable/bg_white_default_shape">
+        android:background="@drawable/bg_white_default_shape"
+        android:paddingBottom="@dimen/dp_17">
 
 
         <TextView
@@ -20,62 +21,61 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginTop="@dimen/dp_15"
-            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_8"
             android:text=""
-            android:textColor="@color/black_444"
+            android:textColor="@color/color_333333"
             android:textSize="@dimen/dp_20"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_15"
+            android:layout_marginStart="@dimen/dp_8"
             android:layout_marginTop="@dimen/dp_15"
             android:layout_marginEnd="@dimen/dp_15"
-            android:text=""
-            android:textColor="@color/black_444"
-            android:textSize="@dimen/dp_16"
+            android:textColor="@color/color_666666"
+            android:textSize="@dimen/dp_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_title"/>
+            app:layout_constraintTop_toBottomOf="@+id/tv_title" />
 
 
         <TextView
             android:id="@+id/btn_cancel"
             android:layout_width="0dp"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_15"
-            android:gravity="center_vertical|left"
-            android:paddingStart="@dimen/dp_30"
+            android:layout_height="@dimen/dp_44"
+            android:layout_marginStart="@dimen/dp_13"
+            android:layout_marginTop="@dimen/dp_23"
+            android:background="@drawable/bg_i_konw_btn"
+            android:gravity="center"
             android:text="我知道了"
             android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/dp_14"
+            android:textSize="@dimen/dp_16"
             app:layout_constraintEnd_toStartOf="@id/btn_commit"
-            app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_content"
-            app:layout_goneMarginTop="@dimen/dp_15"/>
+            app:layout_goneMarginTop="@dimen/dp_23" />
 
 
         <TextView
             android:id="@+id/btn_commit"
             android:layout_width="0dp"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_15"
-            android:gravity="center_vertical|end"
-            android:paddingEnd="@dimen/dp_30"
+            android:layout_height="@dimen/dp_44"
+            android:layout_marginStart="@dimen/dp_5"
+            android:layout_marginTop="@dimen/dp_23"
+            android:layout_marginEnd="@dimen/dp_13"
+            android:background="@drawable/bg_reload_btn"
+            android:gravity="center"
             android:text="重新检测"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/dp_14"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_16"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/btn_cancel"
             app:layout_constraintTop_toBottomOf="@+id/tv_content"
-            app:layout_goneMarginTop="@dimen/dp_15"/>
+            app:layout_goneMarginTop="@dimen/dp_23" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/empty_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/empty_icon" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -29,4 +29,5 @@
     <string name="live_msg_text_nickname">%1$s：</string>
     <string name="live_room_add_like_count_text_str">给主讲人点了%1$d个赞</string>
     <string name="reset_str">重置</string>
+    <string name="no_teacher_introduce">暂无简介内容</string>
 </resources>

usercenter/src/main/res/layout/activity_verify_code_login.xml

@@ -128,7 +128,9 @@
         android:text="@string/read_privacy_and_agree_str"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_login_by_code"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintRight_toLeftOf="@+id/tv_privacy"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_login_by_code" />
 
     <TextView
@@ -140,6 +142,7 @@
         android:textSize="@dimen/sp_12"
         app:layout_constraintBottom_toBottomOf="@+id/cb_privacy"
         app:layout_constraintLeft_toRightOf="@+id/cb_privacy"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/cb_privacy"
         tools:text="《用户注册协议》和《隐私政策》" />