Ver Fonte

修改网络教室部分样式问题

Pq há 1 ano atrás
pai
commit
c3e52fd5e7

+ 1 - 1
classRoom/src/main/java/com/dayayuemeng/classroom/adapter/CoursewareAdapter.java

@@ -21,7 +21,7 @@ public class CoursewareAdapter extends BaseQuickAdapter<CoursewareListBean.RowsB
     private int currentSelectPos = -1;
 
     public CoursewareAdapter() {
-        super(R.layout.item_teaching_courseware_list_layout);
+        super(R.layout.tc_item_teaching_courseware_list_layout);
     }
 
     @Override

+ 2 - 1
classRoom/src/main/java/com/dayayuemeng/classroom/ui/fragment/NewTopOperateControlFragment.java

@@ -584,7 +584,8 @@ public class NewTopOperateControlFragment extends BaseMVPFragment<FgTopOperateCo
         int id = v.getId();
         if (id == R.id.tv_exit) {
             if (BaseApplication.Companion.isTeacherClient()) {
-                showExitTipDialog();
+//                showExitTipDialog();
+                showExitDialog();
             } else {
                 showExitDialog();
             }

+ 1 - 1
classRoom/src/main/java/com/dayayuemeng/classroom/widget/dialog/CourseWareSelectDialog.java

@@ -44,7 +44,7 @@ public class CourseWareSelectDialog extends Dialog implements View.OnClickListen
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_course_ware_layout);
+        setContentView(R.layout.tc_dialog_course_ware_layout);
         mRecyclerView = findViewById(R.id.recyclerView);
         mTvSearch = findViewById(R.id.tv_search);
         mEdSearchContent = findViewById(R.id.ed_search_content);

+ 5 - 0
classRoom/src/main/res/drawable/shape_border_dbdbdb_19dp.xml

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

+ 5 - 0
classRoom/src/main/res/drawable/shape_f2f2f2_18dp.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_f2f2f2"/>
+    <corners android:radius="18dp"/>
+</shape>

+ 8 - 10
classRoom/src/main/res/layout/dialog_course_ware_layout.xml → classRoom/src/main/res/layout/tc_dialog_course_ware_layout.xml

@@ -2,6 +2,7 @@
 <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="375dp"
+    android:background="@drawable/shape_12dp_white"
     android:layout_height="wrap_content"
     android:minHeight="278dp">
 
@@ -9,7 +10,6 @@
         android:id="@+id/view_top_bg"
         android:layout_width="match_parent"
         android:layout_height="47dp"
-        android:background="@drawable/shape_514f5f_top_10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -21,7 +21,7 @@
         android:includeFontPadding="false"
         android:paddingStart="12dp"
         android:text="我的课件"
-        android:textColor="@color/white"
+        android:textColor="@color/color_131415"
         android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/view_top_bg"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -32,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="18dp"
-        android:src="@drawable/icon_close_white"
+        android:src="@drawable/tc_icon_close_page"
         app:layout_constraintBottom_toBottomOf="@+id/tv_title"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_title" />
@@ -41,7 +41,6 @@
         android:id="@+id/view_content_bg"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="#34333D"
         app:layout_constraintBottom_toBottomOf="@+id/recyclerView"
         app:layout_constraintTop_toBottomOf="@+id/view_top_bg" />
 
@@ -52,7 +51,7 @@
         android:layout_marginStart="14dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="14dp"
-        android:background="@drawable/shape_514f5f_18dp"
+        android:background="@drawable/shape_f2f2f2_18dp"
         app:layout_constraintLeft_toLeftOf="@+id/view_content_bg"
         app:layout_constraintRight_toRightOf="@+id/view_content_bg"
         app:layout_constraintTop_toTopOf="@+id/view_content_bg" />
@@ -101,7 +100,7 @@
         android:layout_width="wrap_content"
         android:layout_height="24dp"
         android:layout_marginEnd="5dp"
-        android:background="@drawable/shape_35343e_18dp"
+        android:background="@drawable/shape_01c1b5_19dp"
         android:gravity="center"
         android:paddingStart="11dp"
         android:paddingEnd="11dp"
@@ -127,7 +126,6 @@
         android:id="@+id/view_bottom_bg"
         android:layout_width="match_parent"
         android:layout_height="58dp"
-        android:background="@drawable/shape_35343e_18dp_bottom"
         app:layout_constraintTop_toBottomOf="@+id/view_content_bg" />
 
     <TextView
@@ -135,11 +133,11 @@
         android:layout_width="0dp"
         android:layout_height="34dp"
         android:layout_marginEnd="6dp"
-        android:background="@drawable/shape_border_white_1dp_radius_4dp"
+        android:background="@drawable/shape_border_dbdbdb_19dp"
         android:gravity="center"
         android:layout_marginStart="12dp"
         android:text="@string/cancel"
-        android:textColor="@color/white"
+        android:textColor="@color/color_333333"
         app:layout_constraintBottom_toBottomOf="@+id/view_bottom_bg"
         app:layout_constraintLeft_toLeftOf="@+id/view_bottom_bg"
         app:layout_constraintRight_toLeftOf="@+id/tv_confirm"
@@ -151,7 +149,7 @@
         android:layout_height="34dp"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="12dp"
-        android:background="@drawable/shape_656376_4dp"
+        android:background="@drawable/shape_01c1b5_19dp"
         android:gravity="center"
         android:text="@string/common_confirm"
         android:textColor="@color/white"

+ 2 - 2
classRoom/src/main/res/layout/item_teaching_courseware_list_layout.xml → classRoom/src/main/res/layout/tc_item_teaching_courseware_list_layout.xml

@@ -7,7 +7,7 @@
     android:layout_marginEnd="15dp"
     android:layout_height="52dp"
     android:layout_marginBottom="10dp"
-    android:background="@drawable/shape_514f5f_10dp">
+    android:background="@drawable/shape_ecfbfa_6dp">
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_cover"
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="14dp"
-        android:textColor="@color/white"
+        android:textColor="@color/color_333333"
         android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/iv_cover"
         app:layout_constraintLeft_toRightOf="@+id/iv_cover"

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

@@ -10,9 +10,9 @@
     android:paddingTop="14dp"
     android:paddingBottom="14dp">
 
-    <com.cooleshow.base.widgets.QMUIRadiusImageView
+    <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_avatar"
-        android:layout_width="47dp"
+        android:layout_width="51dp"
         android:layout_height="51dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"