Browse Source

修复bug

Pq 3 years ago
parent
commit
226f41afcc

+ 6 - 0
student/src/main/java/com/cooleshow/student/ui/main/MineFragment.java

@@ -130,6 +130,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                /* ARouter.getInstance().build(RouterPath.MineCenter.MINE_PAY_TEST)
                         .navigation();*/
                 break;
+            case R.id.tv_feedback:
+                //意见反馈
+                ARouter.getInstance().build(RouterPath.MineCenter.MINE_FEEDBACK)
+                        .navigation();
+                break;
             case R.id.tv_help:
                 //帮助中心
                 ARouter.getInstance()
@@ -215,6 +220,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.llFinishedClass.setOnClickListener(this);
         mViewBinding.llResidueClass.setOnClickListener(this);
         mViewBinding.ivScan.setOnClickListener(this);
+        mViewBinding.tvFeedback.setOnClickListener(this);
     }
 
     @Override

BIN
student/src/main/res/drawable-xhdpi/icon_help_center.png


BIN
student/src/main/res/drawable-xxhdpi/icon_help_center.png


+ 1 - 0
student/src/main/res/layout/activity_setting.xml

@@ -143,6 +143,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_feedback"
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_50"
                 app:layout_constraintLeft_toLeftOf="parent"

+ 34 - 2
student/src/main/res/layout/fragment_mine_layout.xml

@@ -553,7 +553,6 @@
                 android:text="帮助中心"
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_14"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_device_detection" />
 
@@ -562,7 +561,7 @@
                 android:layout_width="@dimen/dp_22"
                 android:layout_height="@dimen/dp_22"
                 android:layout_marginLeft="@dimen/dp_24"
-                android:background="@drawable/icon_mine_help"
+                android:background="@drawable/icon_help_center"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_help"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_help"
                 app:layout_constraintTop_toTopOf="@+id/tv_help" />
@@ -576,6 +575,39 @@
                 app:layout_constraintRight_toRightOf="@+id/tv_help"
                 app:layout_constraintTop_toTopOf="@+id/tv_help" />
 
+
+            <TextView
+                android:id="@+id/tv_feedback"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginBottom="15dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="@dimen/dp_59"
+                android:text="意见反馈"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_help" />
+
+
+            <ImageView
+                android:layout_width="@dimen/dp_22"
+                android:layout_height="@dimen/dp_22"
+                android:layout_marginLeft="@dimen/dp_24"
+                android:background="@drawable/icon_mine_help"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_feedback"
+                app:layout_constraintLeft_toLeftOf="@+id/tv_feedback"
+                app:layout_constraintTop_toTopOf="@+id/tv_feedback" />
+
+            <ImageView
+                android:layout_width="@dimen/dp_14"
+                android:layout_height="@dimen/dp_14"
+                android:layout_marginRight="@dimen/dp_22"
+                android:background="@drawable/icon_next_right"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_feedback"
+                app:layout_constraintRight_toRightOf="@+id/tv_feedback"
+                app:layout_constraintTop_toTopOf="@+id/tv_feedback" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
student/src/main/res/layout/layout_empty_course_table.xml

@@ -10,7 +10,7 @@
         android:layout_width="@dimen/dp_130"
         android:layout_height="@dimen/dp_115"
         android:layout_marginTop="8dp"
-        android:background="@drawable/icon_empty_course_table"
+        android:background="@drawable/icon_empty_course"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

+ 0 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -234,8 +234,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 //意见反馈
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_FEEDBACK)
                         .navigation();
-
-//                支付测试
                 break;
             case R.id.tv_authentication:
                 //银行卡

BIN
teacher/src/main/res/drawable-xhdpi/icon_home_mine_piano_course.png


BIN
teacher/src/main/res/drawable-xhdpi/icon_scan_for_teacher.png


BIN
teacher/src/main/res/drawable-xxhdpi/icon_home_mine_piano_course.png


BIN
teacher/src/main/res/drawable-xxhdpi/icon_scan_for_teacher.png


+ 1 - 0
teacher/src/main/res/layout/activity_mine_income.xml

@@ -64,6 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_50"
             android:layout_marginLeft="14dp"
+            android:drawablePadding="5dp"
             android:drawableRight="@drawable/icon_arrow_down"
             android:gravity="center"
             android:text="2021年9月"

+ 2 - 2
teacher/src/main/res/layout/activity_setting.xml

@@ -2,8 +2,7 @@
 <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:background="@color/color_f6f8f9">
+    android:layout_height="match_parent">
 
 
     <LinearLayout
@@ -143,6 +142,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:visibility="gone"
                 android:id="@+id/cl_feedback"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_50"

+ 2 - 2
teacher/src/main/res/layout/fragment_home_layout.xml

@@ -57,7 +57,7 @@
             android:paddingTop="12dp"
             android:paddingEnd="12dp"
             android:paddingBottom="12dp"
-            android:src="@drawable/icon_scan"
+            android:src="@drawable/icon_scan_for_teacher"
             app:layout_constraintBottom_toBottomOf="@+id/iv_chat"
             app:layout_constraintRight_toLeftOf="@+id/iv_chat"
             app:layout_constraintTop_toTopOf="@+id/iv_chat" />
@@ -665,7 +665,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|end"
-                android:src="@drawable/icon_home_mine_income" />
+                android:src="@drawable/icon_home_mine_piano_course" />
 
             <LinearLayout
                 android:layout_width="wrap_content"

+ 1 - 2
teacher/src/main/res/layout/fragment_mine_layout.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
     android:overScrollMode="never"
     android:scrollbars="none">
 
@@ -503,7 +502,7 @@
                 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>

+ 1 - 1
teacher/src/main/res/layout/layout_empty_course_table.xml

@@ -10,7 +10,7 @@
         android:layout_width="@dimen/dp_130"
         android:layout_height="@dimen/dp_115"
         android:layout_marginTop="8dp"
-        android:background="@drawable/icon_empty_course_table"
+        android:background="@drawable/icon_empty_course"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />