专栏微调1

Author: raedev

module-blog/src/main/java/com/rae/cnblogs/blog/ContentDetailActivity.java

@@ -4,9 +4,11 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.google.gson.Gson;
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.ContentEntityConverter;
 import com.rae.cnblogs.activity.SwipeBackBasicActivity;
@@ -38,6 +40,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_blog_detail);
         // 加载内容区域
         ContentEntity entity = getIntent().getParcelableExtra("entity");
+        Log.i("rae", new Gson().toJson(entity));
         // 支持路径跳转
         String url = getIntent().getStringExtra("url");
         if (entity == null && !TextUtils.isEmpty(url)) {

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

@@ -88,7 +88,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
                 LinearLayoutManager lm = (LinearLayoutManager) recyclerView.getLayoutManager();
-                if (lm == null) return;
+                if (lm == null || mAdapter.getColumnInfo() == null) return;
                 int firstCompletelyVisibleItemPosition = lm.findFirstCompletelyVisibleItemPosition();
 
                 if (firstCompletelyVisibleItemPosition == 0) {
@@ -159,6 +159,7 @@ public String getColumnId() {
 
     @Override
     public void onLoadColumnDetail(AntColumnInfo columnInfo) {
+        onNavigateExpand();
         mBottomLayout.setVisibility(View.VISIBLE);
         // 拆分以及组装数据
         mTitleView.setText(columnInfo.getTitle());
@@ -240,7 +241,9 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
 
     @Override
     public void onLoadDataError(String message) {
+        onNavigateCollapse();
         mAdapter.showEmpty(message);
+        mShareView.setVisibility(View.GONE);
         mBottomLayout.setVisibility(View.GONE);
     }
 

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

@@ -83,7 +83,7 @@ public void onLoadMoreRequested() {
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
                 LinearLayoutManager lm = (LinearLayoutManager) recyclerView.getLayoutManager();
-                if (lm == null) return;
+                if (lm == null || mColumnInfo == null) return;
                 int firstCompletelyVisibleItemPosition = lm.findFirstCompletelyVisibleItemPosition();
                 if (firstCompletelyVisibleItemPosition == 0) {
                     mHeaderView = lm.getChildAt(0);
@@ -135,8 +135,13 @@ public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
             }
         });
 
-        mPresenter.start();
-        mPresenter.loadData();
+
+        mHeaderView = View.inflate(this, R.layout.item_user_column_detail_header, null);
+        mAdapter.addHeaderView(mHeaderView);
+        mAdapter.setHeaderAndEmpty(true);
+
+        mPresenter.start(); // 获取专栏详情
+        mPresenter.loadData(); // 获取文章数据
     }
 
     // 状态栏收起状态
@@ -159,9 +164,9 @@ public String getColumnId() {
 
     @Override
     public void onLoadColumnDetail(AntColumnInfo columnInfo) {
+        onNavigateExpand();
         mColumnInfo = columnInfo;
         // 初始化头部视图
-        mHeaderView = View.inflate(this, R.layout.item_user_column_detail_header, null);
         ImageView coverImageView = mHeaderView.findViewById(R.id.img_cover);
         ImageView blurImageView = mHeaderView.findViewById(R.id.img_logo);
         TextView titleView = mHeaderView.findViewById(R.id.tv_title);
@@ -185,8 +190,6 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
         articleCountView.setText(ApiUtils.formatNumber(columnInfo.getArticleCount()));
         subNumView.setText(ApiUtils.formatNumber(columnInfo.getSubnum()));
 
-        mAdapter.addHeaderView(mHeaderView);
-        mAdapter.setHeaderAndEmpty(true);
         mAdapter.notifyDataSetChanged();
     }
 

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

@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            android:src="@drawable/bg_blogger_blur"
+            android:src="@color/background_divider"
             app:layout_collapseMode="parallax"
             app:layout_collapseParallaxMultiplier="0.7"
             app:layout_constraintEnd_toEndOf="parent"
@@ -48,10 +48,10 @@
                 android:layout_width="100dp"
                 android:layout_height="120dp"
                 android:layout_marginEnd="10dp"
-                android:background="@drawable/default_placeholder_normal"
+                android:background="@color/background_divider"
                 android:scaleType="centerCrop"
-                android:src="@drawable/bg_blogger_blur"
-                app:riv_corner_radius="4dp" />
+                android:src="@color/background_divider"
+                app:riv_corner_radius="8dp" />
 
 
             <!--标题-->

module-middleware/src/main/java/com/rae/cnblogs/CnblogsApplication.java

@@ -45,7 +45,9 @@ protected void onFirstCreate() {
         DbCnblogs.init(this);
         // 用户管理
         UserProvider.init(this);
-        AntCodeSDK.init(this, "183dce1755ae94be8bd0ff7ec719e3b0");
+        // 码蚁专栏SDK
+//        AntCodeSDK.init(this, "91f8cc0325f8d228d37bd1c9c4ef7e84");
+        AntCodeSDK.init(new AntCodeSDK.Builder(this).clientId("91f8cc0325f8d228d37bd1c9c4ef7e84").url("http://192.168.1.7:8081/antcode/index.php/"));
         // LeanCloud用户反馈初始化，要在主线程
         AVOSCloud.initialize(this,
                 BuildConfig.LEAN_CLOUD_APP_ID,