修改VIP过期提示

gradle.properties

@@ -31,19 +31,19 @@ android.useDeprecatedNdk=true
 
 
 
-TEST_BASE_URL ="https://dev.colexiu.com/"
+TEST_BASE_URL ="https://test.colexiu.com/"
 RELEASE_BASE_URL ="https://online.colexiu.com/"
-DEV_BASE_URL ="https://test.colexiu.com/"
+DEV_BASE_URL ="https://dev.colexiu.com/"
 
-TEST_BASE_URL_H5 ="https://dev.colexiu.com/teacher"
+TEST_BASE_URL_H5 ="https://test.colexiu.com/teacher"
 RELEASE_BASE_URL_H5 ="https://online.colexiu.com/teacher"
-DEV_BASE_URL_H5 ="https://test.colexiu.com/teacher"
+DEV_BASE_URL_H5 ="https://dev.colexiu.com/teacher"
 
-TEST_BASE_URL_H5_STUDENT ="https://dev.colexiu.com/student"
+TEST_BASE_URL_H5_STUDENT ="https://test.colexiu.com/student"
 RELEASE_BASE_URL_H5_STUDENT ="https://online.colexiu.com/student"
-DEV_BASE_URL_H5_STUDENT ="https://test.colexiu.com/student"
+DEV_BASE_URL_H5_STUDENT ="https://dev.colexiu.com/student"
 
-TEST_BASE_URL_H5_JG ="https://dev.colexiu.com/tenant"
+TEST_BASE_URL_H5_JG ="https://test.colexiu.com/tenant"
 RELEASE_BASE_URL_H5_JG ="https://online.colexiu.com/tenant"
-DEV_BASE_URL_H5_JG ="https://test.colexiu.com/tenant"
+DEV_BASE_URL_H5_JG ="https://dev.colexiu.com/tenant"
 

institution/src/main/java/com/cooleshow/institution/stu/ui/main/MineFragment.java

@@ -86,9 +86,13 @@ public class MineFragment extends BaseMVPFragment<FgMineLayoutBinding, MinePrese
         mViewBinding.tvSubjectName.setText(data.subjectName);
 
         String vipTip = "暂未开通";
-        if (!TextUtils.isEmpty(data.membershipEndTime)) {
+        if(data.isVip == 1){
             String s = DateUtil.date2Str(DateUtil.str2Date(data.membershipEndTime), "yyyy-MM-dd");
             vipTip = "至" + s;
+        }else{
+            if (!TextUtils.isEmpty(data.membershipEndTime)) {
+               vipTip = "会员已过期";
+            }
         }
         mViewBinding.tvVipStatus.setText(vipTip);
 

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

@@ -285,7 +285,19 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.tvNickname.setText(data.username);
         mViewBinding.ivVip.setImageResource(data.isVip == 1 ? com.cooleshow.base.R.drawable.icon_vip_able : com.cooleshow.base.R.drawable.icon_vip_enable);
         mViewBinding.tvCardId.setText("学号：" + data.userId);
-        mViewBinding.tvValidity.setText(data.membershipDays + "");
+        if(data.isVip == 1){
+            mViewBinding.tvVipTip.setVisibility(View.GONE);
+            mViewBinding.groupVip.setVisibility(View.VISIBLE);
+            mViewBinding.tvValidity.setText(String.format("%d", data.membershipDays));
+        }else{
+            mViewBinding.tvVipTip.setVisibility(View.VISIBLE);
+            mViewBinding.groupVip.setVisibility(View.GONE);
+            if(!TextUtils.isEmpty(data.membershipEndTime)){
+                mViewBinding.tvVipTip.setText("会员已过期");
+            }else{
+                mViewBinding.tvVipTip.setText("暂未开通");
+            }
+        }
         mViewBinding.tvFinishedClass.setText(data.finshClassHours + "");
         mViewBinding.tvResidueClass.setText(data.unfinshClassHours + "");
         mViewBinding.tvFocusTeacher.setText(data.starTeacherNum + "");

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

@@ -207,6 +207,7 @@
             tools:text="321" />
 
         <TextView
+            android:id="@+id/tv_validity_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="天"
@@ -216,6 +217,28 @@
             app:layout_constraintLeft_toRightOf="@+id/tv_validity"
             app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
 
+        <androidx.constraintlayout.widget.Group
+            android:visibility="gone"
+            android:id="@+id/group_vip"
+            tools:visibility="gone"
+            app:constraint_referenced_ids="tv_validity_end,tv_validity,tv_validity_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            tools:visibility="visible"
+            android:visibility="gone"
+            android:id="@+id/tv_vip_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:text="会员已过期"
+            android:textColor="@color/color_7f6b3f"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
+            app:layout_constraintLeft_toRightOf="@+id/view_vip_star"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
+
         <ImageView
             android:id="@+id/im_vip"
             android:layout_width="wrap_content"