Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 7815356

Browse files
committed
专栏微调1
1 parent 84b72f9 commit 7815356

File tree

5 files changed

+23
-12
lines changed

5 files changed

+23
-12
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import android.os.Bundle;
55
import android.support.annotation.Nullable;
66
import android.text.TextUtils;
7+
import android.util.Log;
78
import android.view.View;
89

910
import com.alibaba.android.arouter.facade.annotation.Route;
11+
import com.google.gson.Gson;
1012
import com.rae.cnblogs.AppRoute;
1113
import com.rae.cnblogs.ContentEntityConverter;
1214
import com.rae.cnblogs.activity.SwipeBackBasicActivity;
@@ -38,6 +40,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
3840
setContentView(R.layout.activity_blog_detail);
3941
// 加载内容区域
4042
ContentEntity entity = getIntent().getParcelableExtra("entity");
43+
Log.i("rae", new Gson().toJson(entity));
4144
// 支持路径跳转
4245
String url = getIntent().getStringExtra("url");
4346
if (entity == null && !TextUtils.isEmpty(url)) {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
8888
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
8989
super.onScrolled(recyclerView, dx, dy);
9090
LinearLayoutManager lm = (LinearLayoutManager) recyclerView.getLayoutManager();
91-
if (lm == null) return;
91+
if (lm == null || mAdapter.getColumnInfo() == null) return;
9292
int firstCompletelyVisibleItemPosition = lm.findFirstCompletelyVisibleItemPosition();
9393

9494
if (firstCompletelyVisibleItemPosition == 0) {
@@ -159,6 +159,7 @@ public String getColumnId() {
159159

160160
@Override
161161
public void onLoadColumnDetail(AntColumnInfo columnInfo) {
162+
onNavigateExpand();
162163
mBottomLayout.setVisibility(View.VISIBLE);
163164
// 拆分以及组装数据
164165
mTitleView.setText(columnInfo.getTitle());
@@ -240,7 +241,9 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
240241

241242
@Override
242243
public void onLoadDataError(String message) {
244+
onNavigateCollapse();
243245
mAdapter.showEmpty(message);
246+
mShareView.setVisibility(View.GONE);
244247
mBottomLayout.setVisibility(View.GONE);
245248
}
246249

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void onLoadMoreRequested() {
8383
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
8484
super.onScrolled(recyclerView, dx, dy);
8585
LinearLayoutManager lm = (LinearLayoutManager) recyclerView.getLayoutManager();
86-
if (lm == null) return;
86+
if (lm == null || mColumnInfo == null) return;
8787
int firstCompletelyVisibleItemPosition = lm.findFirstCompletelyVisibleItemPosition();
8888
if (firstCompletelyVisibleItemPosition == 0) {
8989
mHeaderView = lm.getChildAt(0);
@@ -135,8 +135,13 @@ public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
135135
}
136136
});
137137

138-
mPresenter.start();
139-
mPresenter.loadData();
138+
139+
mHeaderView = View.inflate(this, R.layout.item_user_column_detail_header, null);
140+
mAdapter.addHeaderView(mHeaderView);
141+
mAdapter.setHeaderAndEmpty(true);
142+
143+
mPresenter.start(); // 获取专栏详情
144+
mPresenter.loadData(); // 获取文章数据
140145
}
141146

142147
// 状态栏收起状态
@@ -159,9 +164,9 @@ public String getColumnId() {
159164

160165
@Override
161166
public void onLoadColumnDetail(AntColumnInfo columnInfo) {
167+
onNavigateExpand();
162168
mColumnInfo = columnInfo;
163169
// 初始化头部视图
164-
mHeaderView = View.inflate(this, R.layout.item_user_column_detail_header, null);
165170
ImageView coverImageView = mHeaderView.findViewById(R.id.img_cover);
166171
ImageView blurImageView = mHeaderView.findViewById(R.id.img_logo);
167172
TextView titleView = mHeaderView.findViewById(R.id.tv_title);
@@ -185,8 +190,6 @@ public void onLoadColumnDetail(AntColumnInfo columnInfo) {
185190
articleCountView.setText(ApiUtils.formatNumber(columnInfo.getArticleCount()));
186191
subNumView.setText(ApiUtils.formatNumber(columnInfo.getSubnum()));
187192

188-
mAdapter.addHeaderView(mHeaderView);
189-
mAdapter.setHeaderAndEmpty(true);
190193
mAdapter.notifyDataSetChanged();
191194
}
192195

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_width="match_parent"
1919
android:layout_height="match_parent"
2020
android:scaleType="centerCrop"
21-
android:src="@drawable/bg_blogger_blur"
21+
android:src="@color/background_divider"
2222
app:layout_collapseMode="parallax"
2323
app:layout_collapseParallaxMultiplier="0.7"
2424
app:layout_constraintEnd_toEndOf="parent"
@@ -48,10 +48,10 @@
4848
android:layout_width="100dp"
4949
android:layout_height="120dp"
5050
android:layout_marginEnd="10dp"
51-
android:background="@drawable/default_placeholder_normal"
51+
android:background="@color/background_divider"
5252
android:scaleType="centerCrop"
53-
android:src="@drawable/bg_blogger_blur"
54-
app:riv_corner_radius="4dp" />
53+
android:src="@color/background_divider"
54+
app:riv_corner_radius="8dp" />
5555

5656

5757
<!--标题-->

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ protected void onFirstCreate() {
4545
DbCnblogs.init(this);
4646
// 用户管理
4747
UserProvider.init(this);
48-
AntCodeSDK.init(this, "183dce1755ae94be8bd0ff7ec719e3b0");
48+
// 码蚁专栏SDK
49+
// AntCodeSDK.init(this, "91f8cc0325f8d228d37bd1c9c4ef7e84");
50+
AntCodeSDK.init(new AntCodeSDK.Builder(this).clientId("91f8cc0325f8d228d37bd1c9c4ef7e84").url("http://192.168.1.7:8081/antcode/index.php/"));
4951
// LeanCloud用户反馈初始化,要在主线程
5052
AVOSCloud.initialize(this,
5153
BuildConfig.LEAN_CLOUD_APP_ID,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /