Pq 11 місяців тому
батько
коміт
b3eacaf8cf

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

@@ -350,7 +350,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                     timeTip = EVipType.PERMANENT_SVIP.getDes();
                     timeTip = EVipType.PERMANENT_SVIP.getDes();
                 } else {
                 } else {
                     String t = eVipType == EVipType.VIP ? userVip.getVipEndDate() : userVip.getSvipEndDate();
                     String t = eVipType == EVipType.VIP ? userVip.getVipEndDate() : userVip.getSvipEndDate();
-                    timeTip = DateUtil.dateFormat(t, "yyyy-MM-dd");
+                    timeTip = " "+DateUtil.dateFormat(t, "yyyy-MM-dd");
                 }
                 }
                 mViewBinding.tvValidity.setText(timeTip);
                 mViewBinding.tvValidity.setText(timeTip);
             }
             }

+ 5 - 0
student/src/main/res/drawable/shape_1a30c7ab_5dp.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="#1a30c7ab"/>
+    <corners android:radius="5dp"/>
+</shape>

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

@@ -26,6 +26,16 @@
             android:layout_height="1px"
             android:layout_height="1px"
             app:layout_constraintTop_toTopOf="parent" />
             app:layout_constraintTop_toTopOf="parent" />
 
 
+        <View
+            app:layout_constraintRight_toRightOf="@+id/tv_title_tag"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_mine_title"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_mine_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_mine_title"
+            android:background="@drawable/shape_1a30c7ab_5dp"
+            android:layout_width="85dp"
+            android:layout_height="10dp"/>
+
+
         <TextView
         <TextView
             android:id="@+id/tv_mine_title"
             android:id="@+id/tv_mine_title"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
@@ -41,6 +51,7 @@
 
 
 
 
         <TextView
         <TextView
+            android:id="@+id/tv_title_tag"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="4dp"
             android:paddingStart="4dp"
@@ -189,7 +200,6 @@
             android:text="VIP有效期剩余"
             android:text="VIP有效期剩余"
             android:textColor="@color/color_502c0c"
             android:textColor="@color/color_502c0c"
             android:textSize="@dimen/sp_14"
             android:textSize="@dimen/sp_14"
-            android:textStyle="bold"
             app:layout_constraintWidth_default="wrap"
             app:layout_constraintWidth_default="wrap"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintHorizontal_chainStyle="packed"
@@ -228,7 +238,7 @@
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="18dp"
             android:paddingStart="18dp"
             android:text="会员已过期"
             android:text="会员已过期"
-            android:textColor="@color/color_7f6b3f"
+            android:textColor="@color/color_502c0c"
             android:textSize="@dimen/sp_14"
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="@+id/im_vip"
             app:layout_constraintBottom_toBottomOf="@+id/im_vip"
             app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"
             app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"

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

@@ -503,7 +503,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         ARouter.getInstance().build(RouterPath.MineCenter.MINE_EQUIPMENT_TEST)
                         ARouter.getInstance().build(RouterPath.MineCenter.MINE_EQUIPMENT_TEST)
                                 .navigation();
                                 .navigation();
                     } else {
                     } else {
-                        UiUtils.showPermissionTipDialog(getChildFragmentManager(),getContext(),"提示",getString(com.cooleshow.base.R.string.equipment_testing_hint));
+                        UiUtils.showPermissionTipDialog(getChildFragmentManager(), getContext(), "提示", getString(com.cooleshow.base.R.string.equipment_testing_hint));
                     }
                     }
                 });
                 });
     }
     }
@@ -556,7 +556,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                     timeTip = EVipType.PERMANENT_SVIP.getDes();
                     timeTip = EVipType.PERMANENT_SVIP.getDes();
                 } else {
                 } else {
                     String t = eVipType == EVipType.VIP ? userVip.getVipEndDate() : userVip.getSvipEndDate();
                     String t = eVipType == EVipType.VIP ? userVip.getVipEndDate() : userVip.getSvipEndDate();
-                    timeTip = DateUtil.dateFormat(t, "yyyy-MM-dd");
+                    timeTip = " " + DateUtil.dateFormat(t, "yyyy-MM-dd");
                 }
                 }
                 mViewBinding.tvValidity.setText(timeTip);
                 mViewBinding.tvValidity.setText(timeTip);
             }
             }

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

@@ -437,7 +437,6 @@
             android:text="VIP有效期剩余"
             android:text="VIP有效期剩余"
             android:textColor="@color/color_502c0c"
             android:textColor="@color/color_502c0c"
             android:textSize="@dimen/sp_14"
             android:textSize="@dimen/sp_14"
-            android:textStyle="bold"
             app:layout_constraintWidth_default="wrap"
             app:layout_constraintWidth_default="wrap"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintHorizontal_chainStyle="packed"
@@ -475,7 +474,7 @@
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="18dp"
             android:paddingStart="18dp"
             android:text="会员已过期"
             android:text="会员已过期"
-            android:textColor="@color/color_7f6b3f"
+            android:textColor="@color/color_502c0c"
             android:textSize="@dimen/sp_14"
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="@+id/im_vip"
             app:layout_constraintBottom_toBottomOf="@+id/im_vip"
             app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"
             app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"