Movatterモバイル変換

[0]ホーム
URL:

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.
/android-cnblogsPublic archive

Commit84b72f9

Browse files
committed
专栏微调
1 parent92e87e4 commit84b72f9

File tree

33 files changed

+391
-295
lines changed

33 files changed

+391
-295
lines changed

‎app/channel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
xiaomi
22
official
33
meizu
4-
m360
54
huawei
65
yinyongbao
7-
baidu
86
pp
97
DEV
108
fir

‎app/src/main/java/com/rae/cnblogs/MainActivity.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ protected void onCreate(Bundle savedInstanceState) {
7171
super.onCreate(savedInstanceState);
7272
setContentView(R.layout.activity_main);
7373
mPresenter =newMainPresenterImpl(this);
74-
SkinCompatManager.getInstance().addObserver((observable,o) -> {
75-
EventBus.getDefault().post(newAppThemeManager.ThemeEvent(ThemeCompat.isNight()));
76-
});
7774

7875
initTab();
7976

@@ -82,9 +79,10 @@ protected void onCreate(Bundle savedInstanceState) {
8279

8380
// 启动服务
8481
startService(newIntent(this,CnblogsService.class));
85-
if (BuildConfig.DEBUG) {
86-
debugLogin();
87-
}
82+
83+
// if (BuildConfig.DEBUG) {
84+
// debugLogin();
85+
// }
8886
}
8987

9088

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath'com.android.tools.build:gradle:3.3.1'
15+
classpath'com.android.tools.build:gradle:3.3.2'
1616
classpath'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
1717
// 热更新插件
1818
// classpath "com.tencent.bugly:tinker-support:1.0.8"

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

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
importandroid.support.v4.content.ContextCompat;
44
importandroid.text.TextUtils;
55
importandroid.view.LayoutInflater;
6-
importandroid.view.View;
76
importandroid.view.ViewGroup;
87

9-
importcom.rae.cnblogs.UICompat;
108
importcom.rae.cnblogs.basic.AppImageLoader;
119
importcom.rae.cnblogs.basic.BaseItemAdapter;
1210
importcom.rae.cnblogs.basic.ContentEntity;
@@ -27,7 +25,7 @@
2725
publicclassContentItemAdapterextendsBaseItemAdapter<ContentEntity,SimpleViewHolder> {
2826

2927
/* 正常类型 */
30-
publicstaticfinalintVIEW_TYPE_NORMAL =0;
28+
privatestaticfinalintVIEW_TYPE_NORMAL =0;
3129

3230
/*新闻类型*/
3331
publicstaticfinalintVIEW_TYPE_NEWS =1;
@@ -88,28 +86,31 @@ public void onBindViewHolder(SimpleViewHolder holder, int position, ContentEntit
8886
* 绑定内容项目
8987
*/
9088
privatevoidonBindContentItemViewHolder(ContentItemViewHolderholder,ContentEntitym) {
91-
holder.authorView.setText(m.getAuthor());
92-
holder.titleView.setText(m.getTitle());
93-
holder.summaryView.setText(m.getSummary());
94-
holder.dateView.setText(m.getDate());
95-
holder.readerView.setText(m.getViewCount());
96-
holder.likeView.setText(m.getLikeCount());
97-
holder.commentView.setText(m.getCommentCount());
98-
UICompat.setVisibility(holder.countLayout,mEnableCountLayout);
99-
100-
// 显示头像
101-
AppImageLoader.displayAvatar(m.getAvatar(),holder.avatarView);
102-
// 隐藏没有头像地址
103-
UICompat.setVisibility(holder.authorLayout, !TextUtils.isEmpty(m.getAvatar()));
89+
holder.setText(holder.authorView,m.getAuthor());
90+
holder.setText(holder.titleView,m.getTitle());
91+
holder.setText(holder.summaryView,m.getSummary());
92+
holder.setText(holder.dateView,m.getDate());
93+
holder.setText(holder.readerView,m.getViewCount());
94+
holder.setText(holder.likeView,m.getLikeCount());
95+
holder.setText(holder.commentView,m.getCommentCount());
96+
holder.setVisibility(holder.countLayout,mEnableCountLayout);
97+
98+
if (mViewType ==VIEW_TYPE_NEWS) {
99+
AppImageLoader.display(m.getAvatar(),holder.avatarView);
100+
holder.setVisibility(holder.authorLayout, !TextUtils.isEmpty(m.getAvatar()));
101+
}else {
102+
// 显示头像
103+
AppImageLoader.displayAvatar(m.getAvatar(),holder.avatarView);
104+
}
104105

105106
// 显示预览图
106107
showThumbImages(m.getThumbs(),holder);
107108

109+
// 设置已读颜色
108110
inttitleColor =m.isRead() ?getColor("ph4") :getColor("ph1");
109111
intsummaryColor =m.isRead() ?getColor("ph4") :getColor("ph2");
110-
111-
holder.titleView.setTextColor(ContextCompat.getColor(holder.itemView.getContext(),titleColor));
112-
holder.summaryView.setTextColor(ContextCompat.getColor(holder.itemView.getContext(),summaryColor));
112+
holder.setTextColor(holder.titleView,ContextCompat.getColor(holder.itemView.getContext(),titleColor));
113+
holder.setTextColor(holder.summaryView,ContextCompat.getColor(holder.itemView.getContext(),summaryColor));
113114
holder.itemView.setTag(m);
114115

115116
}
@@ -124,23 +125,23 @@ private int getColor(String name) {
124125
privatevoidshowThumbImages(List<String>thumbs,ContentItemViewHolderholder) {
125126
if (Rx.isEmpty(thumbs)) {
126127
// 没有预览图
127-
holder.largeThumbView.setVisibility(View.GONE);
128-
holder.thumbLayout.setVisibility(View.GONE);
128+
holder.setVisibility(holder.largeThumbView,false);
129+
holder.setVisibility(holder.thumbLayout,false);
129130
}elseif (thumbs.size() <3 &&thumbs.size() >0) {
130131
// 一张预览图
131-
holder.largeThumbView.setVisibility(View.VISIBLE);
132-
holder.thumbLayout.setVisibility(View.GONE);
132+
holder.setVisibility(holder.largeThumbView,true);
133+
holder.setVisibility(holder.thumbLayout,false);
133134
AppImageLoader.display(thumbs.get(0),holder.largeThumbView);
134135
}elseif (thumbs.size() >=3) {
135-
holder.largeThumbView.setVisibility(View.GONE);
136-
holder.thumbLayout.setVisibility(View.VISIBLE);
136+
holder.setVisibility(holder.largeThumbView,false);
137+
holder.setVisibility(holder.thumbLayout,true);
137138
// 取三张预览图
138139
AppImageLoader.display(thumbs.get(0),holder.thumbOneView);
139140
AppImageLoader.display(thumbs.get(1),holder.thumbTwoView);
140141
AppImageLoader.display(thumbs.get(2),holder.thumbThreeView);
141142
}else {
142-
holder.largeThumbView.setVisibility(View.GONE);
143-
holder.thumbLayout.setVisibility(View.GONE);
143+
holder.setVisibility(holder.largeThumbView,false);
144+
holder.setVisibility(holder.thumbLayout,false);
144145
}
145146
}
146147
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,60 @@
1919
publicclassContentItemViewHolderextendsSimpleViewHolder {
2020

2121
@BindView(R2.id.ll_blog_author_layout)
22+
@Nullable
2223
publicViewauthorLayout;
2324

2425
@BindView(R2.id.img_blog_avatar)
26+
@Nullable
2527
publicImageViewavatarView;
2628

2729
@BindView(R2.id.tv_blog_author)
30+
@Nullable
2831
publicTextViewauthorView;
2932

3033
@BindView(R2.id.tv_blog_title)
34+
@Nullable
3135
publicTextViewtitleView;
3236

3337
@BindView(R2.id.tv_blog_summary)
38+
@Nullable
3439
publicTextViewsummaryView;
3540

3641
@BindView(R2.id.tv_blog_date)
42+
@Nullable
3743
publicTextViewdateView;
3844

3945
@BindView(R2.id.tv_blog_view)
46+
@Nullable
4047
publicTextViewreaderView;
4148

4249
@BindView(R2.id.tv_blog_like)
50+
@Nullable
4351
publicTextViewlikeView;
4452

4553
@BindView(R2.id.tv_blog_comment)
54+
@Nullable
4655
publicTextViewcommentView;
4756

4857

4958
@BindView(R2.id.img_blog_list_large_thumb)
59+
@Nullable
5060
publicImageViewlargeThumbView;
5161

5262
@BindView(R2.id.layout_blog_list_thumb)
63+
@Nullable
5364
publicViewthumbLayout;
5465

5566
@BindView(R2.id.img_blog_list_thumb_one)
67+
@Nullable
5668
publicImageViewthumbOneView;
5769

5870
@BindView(R2.id.img_blog_list_thumb_two)
71+
@Nullable
5972
publicImageViewthumbTwoView;
6073

6174
@BindView(R2.id.img_blog_list_thumb_three)
75+
@Nullable
6276
publicImageViewthumbThreeView;
6377

6478
@BindView(R2.id.ll_count_layout)
@@ -69,4 +83,20 @@ public ContentItemViewHolder(View itemView) {
6983
super(itemView);
7084
ButterKnife.bind(this,itemView);
7185
}
86+
87+
publicvoidsetText(@NullableTextViewview,Stringtext) {
88+
if (view !=null)view.setText(text);
89+
}
90+
91+
publicvoidsetTextColor(@NullableTextViewview,intcolor) {
92+
if (view !=null)view.setTextColor(color);
93+
}
94+
95+
publicvoidsetVisibility(@NullableViewview,intvisibility) {
96+
if (view !=null)view.setVisibility(visibility);
97+
}
98+
99+
publicvoidsetVisibility(@NullableViewview,booleanvisibility) {
100+
if (view !=null)view.setVisibility(visibility ?View.VISIBLE :View.GONE);
101+
}
72102
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp