commit

Author: raedev

.idea/modules.xml

@@ -56,9 +56,19 @@ protected void convert(BaseViewHolder helper, MultiItemEntity item) {
             case ColumnDetailCatalogEntity.TYPE_LEVEL_1:
                 bindRootLevel1View(helper, (ColumnDetailCatalogEntity) item);
                 break;
+            case ColumnDetailCatalogEntity.TYPE_LEVEL_END:
+                bindCatalogView(helper, (ColumnDetailCatalogEntity) item);
+                break;
         }
     }
 
+    /**
+     * 绑定目录视图
+     */
+    private void bindCatalogView(BaseViewHolder helper, ColumnDetailCatalogEntity item) {
+        helper.addOnClickListener(R.id.btn_catalog);
+    }
+
     /**
      * 绑定头部视图
      */
@@ -77,6 +87,8 @@ private void bindHeaderView(BaseViewHolder helper, ColumnDetailHeaderEntity item
     private void bindSectionView(BaseViewHolder helper, ColumnDetailSectionEntity item) {
         helper.setText(R.id.tv_title, item.getTitle());
         helper.setText(R.id.tv_desc, item.getContent());
+        helper.setVisible(R.id.view_divider_top, item.isEnableTopDivider());
+        helper.setVisible(R.id.view_divider_bottom, item.isEnableBottomDivider());
     }
 
     /**

module-discover/src/main/java/com/rae/cnblogs/discover/column/detail/AntColumnDetailAdapter.java

@@ -12,10 +12,28 @@ public class ColumnDetailSectionEntity implements MultiItemEntity {
 
     private String content;
 
+    private boolean enableTopDivider;
+    private boolean enableBottomDivider;
+
     public String getTitle() {
         return title;
     }
 
+    public boolean isEnableTopDivider() {
+        return enableTopDivider;
+    }
+
+    public void setEnableTopDivider(boolean enableTopDivider) {
+        this.enableTopDivider = enableTopDivider;
+    }
+
+    public boolean isEnableBottomDivider() {
+        return enableBottomDivider;
+    }
+
+    public void setEnableBottomDivider(boolean enableBottomDivider) {
+        this.enableBottomDivider = enableBottomDivider;
+    }
 
     public String getContent() {
         return content;

module-discover/src/main/java/com/rae/cnblogs/discover/column/detail/ColumnDetailSectionEntity.java

@@ -36,6 +36,22 @@ protected void accept(AntColumnInfo columnInfo) {
                 getView().onLoadColumnDetail(columnInfo);
             }
         });
+
+        // 查询是否已经订阅
+        mColumnApi.getUserColumnDetail(columnId)
+                .with(this)
+                .subscribe(new AntSdkDefaultObserver<AntColumnInfo>() {
+                    @Override
+                    protected void onError(String message) {
+                        // 不处理
+                        getView().onColumnSubscribe(false);
+                    }
+
+                    @Override
+                    protected void accept(AntColumnInfo antColumnInfo) {
+                        getView().onColumnSubscribe(true);
+                    }
+                });
     }
 
     @Override

module-discover/src/main/java/com/rae/cnblogs/discover/presenter/AntColumnDetailPresenterImpl.java

@@ -30,5 +30,8 @@ interface View extends IPresenterView {
 
         // 订阅成功
         void onSubscribeSuccess();
+
+        // 专栏是否订阅
+        void onColumnSubscribe(boolean subscribe);
     }
 }

module-discover/src/main/java/com/rae/cnblogs/discover/presenter/IAntColumnDetailContract.java

@@ -21,6 +21,7 @@
 import com.antcode.sdk.AntSessionManager;
 import com.antcode.sdk.model.AntColumnInfo;
 import com.antcode.sdk.model.AntIntroArticlesInfo;
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.UICompat;
@@ -114,6 +115,18 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 }
             }
         });
+
+        // 点击事件
+        mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                // 查看目录大纲图片
+                if (view.getId() == R.id.btn_catalog && mAdapter.getColumnInfo() != null) {
+                    AppRoute.routeToImagePreview(getContext(), mAdapter.getColumnInfo().getOutlineImgOriginal());
+                }
+            }
+        });
+
         mPresenter.start();
     }
 
@@ -149,9 +162,20 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
         // 头部数据
         data.add(new ColumnDetailHeaderEntity(columnInfo));
 
-        // 区块数据
+        // 课程简介
         data.add(new ColumnDetailSectionEntity("课程简介", columnInfo.getIntro()));
 
+        // 作者介绍
+        if (columnInfo.getAntAuthor() != null && !TextUtils.isEmpty(columnInfo.getAntAuthor().getIntro())) {
+            data.add(new ColumnDetailSectionEntity("作者简介", columnInfo.getAntAuthor().getIntro()));
+        }
+
+        // 适合人群
+        if (!TextUtils.isEmpty(columnInfo.getConsumer())) {
+            data.add(new ColumnDetailSectionEntity("适合人群", columnInfo.getConsumer()));
+        }
+
+
         // -----------------   目录解析 开始 --------------------- //
 
         // 添加目录头部
@@ -179,17 +203,23 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
             if (TextUtils.isEmpty(parentId)) continue;
 //             找到一级目录，然后添加到子列表中
             ColumnDetailCatalogEntity entity = mRootCatalogMap.get(parentId);
-//            ColumnDetailCatalogEntity entity = mRootCatalogMap.get("1");
             if (entity == null) continue;
             ColumnDetailCatalogEntity levelEntity = new ColumnDetailCatalogEntity(1, ColumnDetailCatalogEntity.TYPE_LEVEL_1, article);
             entity.addSubItem(levelEntity);
         }
-        data.add(new ColumnDetailCatalogEntity(0, ColumnDetailCatalogEntity.TYPE_LEVEL_END, null));
+        if (!TextUtils.isEmpty(columnInfo.getOutlineImgOriginal())) {
+            data.add(new ColumnDetailCatalogEntity(0, ColumnDetailCatalogEntity.TYPE_LEVEL_END, null));
+        }
 
         // -----------------   目录解析 结束 --------------------- //
 
+
         // 订阅须知
-        data.add(new ColumnDetailSectionEntity("订阅须知", columnInfo.getNotice()));
+        ColumnDetailSectionEntity subEntity = new ColumnDetailSectionEntity("订阅须知", columnInfo.getNotice());
+        subEntity.setEnableTopDivider(true);
+        data.add(subEntity);
+
+
         mAdapter.setNewData(data);
         mBottomLayout.setVisibility(View.VISIBLE);
 
@@ -237,10 +267,14 @@ public void onClick(DialogInterface dialog, int which) {
 
     }
 
+    @Override
+    public void onColumnSubscribe(boolean subscribe) {
+        UICompat.setVisibility(mBottomLayout, !subscribe);
+    }
+
     @OnClick(R2.id.btn_sub)
     public void onSubscribeClick() {
         if (!AntSessionManager.getDefault().isLogin()) {
-            UICompat.failed(this, "请登录后再订阅");
             AppRoute.routeToAntUserAuth(this);
             return;
         }

module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnDetailActivity.java

@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <Button
-        android:id="@+id/btn_send"
+        android:id="@+id/btn_catalog"
         android:layout_width="match_parent"
         android:layout_height="36dp"
         android:layout_marginStart="62dp"
@@ -23,10 +23,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/et_phone" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="12dp"
-        android:background="@color/ant_divider_color" />
 
 
 </LinearLayout>

module-discover/src/main/res/layout/item_column_category_end.xml

@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="wrap_content"
     android:background="@color/white"
     android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:paddingStart="24dp"
-    android:paddingTop="12dp"
-    android:paddingEnd="24dp"
-    android:paddingBottom="12dp">
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/view_divider_top"
+        android:layout_width="match_parent"
+        android:layout_height="12dp"
+        android:background="@color/ant_divider_color"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="12dp"
         android:text="订阅须知"
         android:textColor="@color/black"
         android:textSize="18sp"
@@ -24,8 +30,19 @@
         android:id="@+id/tv_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:lineSpacingMultiplier="1.5"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="12dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="12dp"
+        android:lineSpacingMultiplier="1.5"
         android:textColor="@color/ant_h1"
         android:textSize="16sp" />
+
+
+    <View
+        android:id="@+id/view_divider_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="12dp"
+        android:background="@color/ant_divider_color"
+        android:visibility="gone" />
 </LinearLayout>