Browse Source

修改部分问题

Pq 4 months ago
parent
commit
d504a0dc09

+ 5 - 0
BaseLibrary/src/main/res/drawable/shape_fef9f4_10dp.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="#fef9f4"/>
+    <corners android:radius="10dp"/>
+</shape>

+ 3 - 0
student/src/main/java/com/cooleshow/student/adapter/VIPCourseCourseListAdapter.java

@@ -32,10 +32,13 @@ public class VIPCourseCourseListAdapter extends BaseQuickAdapter<AppointCourseTe
         holder.setText(R.id.tv_time, String.format("/%s分钟", bean.getCourseMinutes()));
 
         RatingBar rating_bar = holder.getView(R.id.rating_bar);
+
         try {
             String starGrade = bean.getStarGrade();
             double i = Double.parseDouble(starGrade);
             rating_bar.setRating((float) i);
+            holder.setGone(R.id.tv_no_score, i > 0);
+            holder.setGone(R.id.rating_bar, i < 0);
         } catch (Exception e) {
             e.printStackTrace();
             rating_bar.setRating(0);

+ 2 - 6
student/src/main/java/com/cooleshow/student/ui/main/NewHomeFragmentV2.java

@@ -91,7 +91,6 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
     public static int MAX_NUM_FOR_TOP_MENU = 10;//金刚位一页个数
     private Banner banner;
     private SmartRefreshLayout refreshLayout;
-    private ArrayList<AppHomeBean.ItemBean> itemBeans = new ArrayList<>();
     private BannerImageAdapter mBannerImageAdapter;
     private HomeLiveAndVideoBean.RecentCoursesBean mRecentCourses;
     private List<Fragment> fragments = new ArrayList<>();
@@ -171,7 +170,7 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
 
         mMenuPagerAdapter = new HomeMenuPagerAdapter(getChildFragmentManager(), fragments);
         mViewBinding.viewpagerMenu.setAdapter(mMenuPagerAdapter);
-        mBannerImageAdapter = new BannerImageAdapter<AppHomeBean.ItemBean>(itemBeans) {
+        mBannerImageAdapter = new BannerImageAdapter<AppHomeBean.ItemBean>(null) {
             @Override
             public void onBindView(BannerImageHolder holder, AppHomeBean.ItemBean data, int position, int size) {
                 Glide.with(holder.imageView)
@@ -400,11 +399,8 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
         }
         if (bannerList != null && bannerList.size() > 0) {
             banner.setVisibility(View.VISIBLE);
-            itemBeans.clear();
-            itemBeans.addAll(bannerList);
-            mBannerImageAdapter.notifyDataSetChanged();
+            mBannerImageAdapter.setDatas(bannerList);
         } else {
-            itemBeans.clear();
             banner.setVisibility(View.GONE);
         }
     }

+ 17 - 3
student/src/main/res/layout/item_vip_course_list_layout.xml

@@ -50,6 +50,19 @@
         app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
     <TextView
+        android:id="@+id/tv_no_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="暂无评分"
+        android:textSize="@dimen/sp_12"
+        android:visibility="gone"
+        android:includeFontPadding="false"
+        android:textColor="@color/color_999999"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
+        app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
+
+    <TextView
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginTop="6dp"
         app:layout_constraintBottom_toTopOf="@+id/tv_course_num"
@@ -82,12 +95,14 @@
         android:id="@+id/tv_course_num"
         app:layout_constraintTop_toBottomOf="@+id/tv_des"
         android:includeFontPadding="false"
-        tools:text="已上课时34节"
+        tools:text="已上课时34节已上课时34节已上课时34节已上课时34节已上课时34节"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
         android:layout_width="0dp"
+        android:layout_marginEnd="5dp"
+        app:layout_constraintRight_toLeftOf="@+id/tv_price_unit"
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_height="wrap_content"/>
@@ -112,7 +127,7 @@
         app:layout_constraintBaseline_toBaselineOf="@+id/tv_time"
         tools:text="280"
         android:textColor="@color/color_f44541"
-        android:textSize="@dimen/sp_18"
+        android:textSize="@dimen/sp_16"
         android:textStyle="bold"
         android:includeFontPadding="false"
         android:layout_width="wrap_content"
@@ -122,7 +137,6 @@
 
     <TextView
         android:paddingStart="2dp"
-        android:layout_marginTop="6dp"
         android:id="@+id/tv_time"
         app:layout_constraintBottom_toBottomOf="@+id/tv_course_num"
         app:layout_constraintTop_toTopOf="@+id/tv_course_num"

+ 12 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/LiveCoursePageFragment.java

@@ -218,10 +218,18 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
             mViewBinding.tvOpen.setVisibility(View.GONE);
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
-            mViewBinding.llContent.setVisibility(View.VISIBLE);
-            mViewBinding.clEmptyFlag.setVisibility(View.GONE);
-            currentPage = 1;
-            queryCourse();
+            if (teacherUserInfo.liveFlag == 0) {
+                mViewBinding.refreshLayout.setVisibility(View.GONE);
+                mViewBinding.clEmptyFlag.setVisibility(View.VISIBLE);
+                mViewBinding.tvEmptyHint.setText("您尚未开通直播服务\n开通后即可创建直播课程");
+                mViewBinding.tvOpen.setVisibility(View.VISIBLE);
+                mViewBinding.tvOpen.setText("立即开通");
+            }else{
+                mViewBinding.llContent.setVisibility(View.VISIBLE);
+                mViewBinding.clEmptyFlag.setVisibility(View.GONE);
+                currentPage = 1;
+                queryCourse();
+            }
         } else {
             //未通过或者未申请
             mViewBinding.llContent.setVisibility(View.GONE);

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

@@ -88,7 +88,6 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
     private HomeMenuPageAdapter menuAdapter;
     private HomeHotAlbumAdapter mAlbumAdapter;
     private HomeHotMusicSheetAdapter mHomeHotMusicSheetAdapter;
-    private ArrayList<HomeMenuBean.BannerBean> mBannerList = new ArrayList<>();
     private BannerImageAdapter mBannerImageAdapter;
     private int teacherFlag = 0;//教资认证
     private int degreeFlag = 0;//老师学历认证
@@ -152,7 +151,7 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
         mViewBinding.rvHotTrack.setAdapter(mHomeHotMusicSheetAdapter);
         mViewBinding.rvHotTrack.setNestedScrollingEnabled(false);
         mViewBinding.rvHotAlbum.setNestedScrollingEnabled(false);
-        mBannerImageAdapter = new BannerImageAdapter<HomeMenuBean.BannerBean>(mBannerList) {
+        mBannerImageAdapter = new BannerImageAdapter<HomeMenuBean.BannerBean>(null) {
             @Override
             public void onBindView(BannerImageHolder holder, HomeMenuBean.BannerBean data, int position, int size) {
                 Glide.with(holder.imageView)
@@ -273,11 +272,8 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
         }
         if (bannerList != null && bannerList.size() > 0) {
             mViewBinding.banner.setVisibility(View.VISIBLE);
-            mBannerList.clear();
-            mBannerList.addAll(bannerList);
-            mBannerImageAdapter.notifyDataSetChanged();
+            mBannerImageAdapter.setDatas(bannerList);
         } else {
-            mBannerList.clear();
             mViewBinding.banner.setVisibility(View.GONE);
         }
     }

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

@@ -321,7 +321,7 @@
                     android:layout_marginTop="@dimen/dp_12"
                     android:layout_marginEnd="14dp"
                     android:visibility="gone"
-                    app:cardBackgroundColor="@color/white"
+                    app:cardBackgroundColor="@color/color_fef9f4"
                     app:cardCornerRadius="10dp"
                     app:cardElevation="0dp"
                     tools:visibility="visible"