修改老师端个人风采页面

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_e8fffb"/>
+    <corners android:radius="8dp"/>
+</shape>

BaseLibrary/src/main/res/values/colors.xml

@@ -130,6 +130,7 @@
     <color name="color_effbf9">#EFFBF9</color>
     <color name="color_f0f0f0">#f0f0f0</color>
     <color name="color_ff7938">#ff7938</color>
+    <color name="color_e8fffb">#e8fffb</color>
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

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

@@ -30,6 +30,7 @@ import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.MyFileUtils;
 import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.widgets.CommonItemDecoration;
@@ -156,6 +157,14 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_CHECK_MODIFY_PHONENUM)
                         .navigation(this);
                 break;
+            case R.id.tv_edit_introduce:
+                //编辑个人介绍
+                SoftKeyboardUtils.showSoftKeyboard(viewBinding.etSelfIntroduction);
+                if (!TextUtils.isEmpty(viewBinding.etSelfIntroduction.getText())) {
+                    int length = viewBinding.etSelfIntroduction.getText().length();
+                    viewBinding.etSelfIntroduction.setSelection(length);
+                }
+                break;
         }
     }
 
@@ -199,6 +208,7 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
         viewBinding.viewNickClick.setOnClickListener(this);
         viewBinding.viewRealNameClick.setOnClickListener(this);
         viewBinding.viewPhoneClick.setOnClickListener(this);
+        viewBinding.tvEditIntroduce.setOnClickListener(this);
         GridLayoutManager manager = new GridLayoutManager(this, 2);
         videoList.setLayoutManager(manager);
 //        addEmptyVideoBean();

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

@@ -343,13 +343,12 @@
                     android:layout_marginLeft="8dp"
                     android:layout_marginTop="4dp"
                     android:layout_marginRight="8dp"
-                    android:layout_marginBottom="30dp"
                     android:overScrollMode="never"
                     android:scrollbars="none"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tv_select_musical_title" />
 
                 <TextView
+                    android:layout_marginTop="20dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="14dp"
@@ -358,6 +357,7 @@
                     android:text="最多可选5种声部"
                     android:textColor="@color/color_cccccc"
                     android:textSize="@dimen/sp_12"
+                    app:layout_constraintTop_toBottomOf="@+id/rv_top_select"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent" />
 

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

@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_marginTop="10dp"
+    android:paddingEnd="15dp"
     android:layout_height="wrap_content">
 
-    <RelativeLayout
+    <TextView
+        android:layout_marginTop="7dp"
+        android:id="@+id/tv_name"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bg_select_2dc7aa_radius"
-        android:paddingLeft="8dp"
-        android:paddingTop="4dp"
-        android:layout_marginLeft="3dp"
-        android:layout_marginRight="3dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="3dp"
-        android:paddingRight="8dp"
-        android:paddingBottom="4dp">
+        android:layout_height="34dp"
+        android:background="@drawable/shape_e8fffb_8dp"
+        android:gravity="center"
+        android:paddingStart="17dp"
+        android:paddingEnd="17dp"
+        android:text="长笛"
+        android:textColor="@color/color_2dc7aa"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="长笛"
-            android:textSize="@dimen/sp_12"
-            android:textColor="@color/color_2dc7aa" />
+    <View
+        android:id="@+id/help_point"
+        android:layout_width="1px"
+        android:layout_height="1px"
+        app:layout_constraintRight_toRightOf="@+id/tv_name"
+        app:layout_constraintTop_toTopOf="@+id/tv_name" />
 
-        <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" />
-
-    </RelativeLayout>
-</RelativeLayout>
+    <ImageView
+        android:layout_width="14dp"
+        android:layout_height="14dp"
+        android:src="@drawable/icon_del_music_tool"
+        app:layout_constraintBottom_toBottomOf="@+id/help_point"
+        app:layout_constraintLeft_toLeftOf="@+id/help_point"
+        app:layout_constraintRight_toRightOf="@+id/help_point"
+        app:layout_constraintTop_toTopOf="@+id/help_point" />
+</androidx.constraintlayout.widget.ConstraintLayout>