Skip to content

Commit 464066a

Browse files
raeeraee
committed
UI调整
解决评论数量以及点赞数量没有传递到内容页问题 博主界面支持封面图，需在博客园后台上传固定的文件名称为[app-cover.bmp]
1 parent ff1c26b commit 464066a

33 files changed

+76
-238
lines changed

‎app/src/main/assets/license.html

Lines changed: 0 additions & 58 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ public static void jumpToBlogContent(Context context, String blogId, BlogType ty
8181
* @param type 博客类型
8282
*/
8383
public static void jumpToBlogContent(Context context, BlogBean blog, BlogType type) {
84+
if (blog == null) return;
8485
Intent intent = new Intent(context, BlogContentActivity.class);
85-
// 不传递摘要和正文这些过大的数据。进去博文正文之后再从数据库拉取。
86+
// 不传递摘要和正文这些过大的数据。进去博文正文之后再从数据库拉取。已经在BlogBean里面处理大数据问题
8687
intent.putExtra("blog", blog);
8788
intent.putExtra("blogId", blog.getBlogId());
8889
intent.putExtra("type", type.getTypeName());

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.rae.cnblogs;
22

33
import android.app.Application;
4+
import android.content.Context;
45
import android.content.pm.PackageManager;
6+
import android.support.multidex.MultiDex;
57

68
import com.avos.avoscloud.AVOSCloud;
79
import com.avos.avoscloud.feedback.FeedbackThread;
@@ -106,6 +108,11 @@ public String getChannel() {
106108
return "official";
107109
}
108110

111+
@Override
112+
protected void attachBaseContext(Context base) {
113+
MultiDex.install(base); // 解决Tinker存在的BUG，一定要在这之前初始化
114+
super.attachBaseContext(base);
115+
}
109116

110117
public int getVersionCode() {
111118
try {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public void onTrimMemory(int level) {
3939
@Override
4040
public void onBaseContextAttached(Context base) {
4141
super.onBaseContextAttached(base);
42-
// you must install multiDex whatever tinker is installed!
43-
MultiDex.install(base);
42+
4443
// 安装tinker
4544
// TinkerManager.installTinker(this); 替换成下面Bugly提供的方法
4645
Beta.installTinker(this);

‎app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ protected void onViewSourceClick() {
111111
}
112112
};
113113

114-
// 根据blogId 获取博客信息
115-
if (!TextUtils.isEmpty(blogId)) {
116-
loadBlogFromDatabase(blogId);
117-
} else if (mBlog != null) {
114+
if (mBlog != null) {
118115
mPlaceholderView.dismiss();
119116
onLoadData(mBlog);
120117
// 加载博客摘要
@@ -130,6 +127,10 @@ protected void accept(BlogBean blogBean) {
130127
mBlog.setSummary(blogBean.getSummary());
131128
}
132129
});
130+
}
131+
// 根据blogId 获取博客信息
132+
else if (!TextUtils.isEmpty(blogId)) {
133+
loadBlogFromDatabase(blogId);
133134
} else {
134135
mPlaceholderView.empty("博客不存在");
135136
}

‎app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.rae.cnblogs.activity;
22

3+
import android.graphics.drawable.Drawable;
34
import android.os.Bundle;
45
import android.support.annotation.Nullable;
56
import android.support.design.widget.TabLayout;
@@ -12,11 +13,14 @@
1213
import android.widget.ImageView;
1314
import android.widget.TextView;
1415

16+
import com.bumptech.glide.load.DataSource;
17+
import com.bumptech.glide.load.engine.GlideException;
18+
import com.bumptech.glide.request.RequestListener;
19+
import com.bumptech.glide.request.target.Target;
1520
import com.rae.cnblogs.AppRoute;
1621
import com.rae.cnblogs.AppUI;
1722
import com.rae.cnblogs.GlideApp;
1823
import com.rae.cnblogs.R;
19-
import com.rae.cnblogs.RaeImageLoader;
2024
import com.rae.cnblogs.fragment.BlogListFragment;
2125
import com.rae.cnblogs.model.FeedListFragment;
2226
import com.rae.cnblogs.presenter.CnblogsPresenterFactory;
@@ -161,7 +165,7 @@ protected void onDestroy() {
161165
}
162166

163167
@Override
164-
public void onLoadBloggerInfo(FriendsInfoBean userInfo) {
168+
public void onLoadBloggerInfo(final FriendsInfoBean userInfo) {
165169
mUserInfo = userInfo;
166170
mFansLayout.setClickable(true);
167171
mFollowLayout.setClickable(true);
@@ -182,12 +186,30 @@ public void onLoadBloggerInfo(FriendsInfoBean userInfo) {
182186

183187
if (!TextUtils.isEmpty(userInfo.getAvatar())) {
184188

189+
// 封面图
190+
String coverUrl = String.format("https://files.cnblogs.com/files/%s/app-cover.bmp", userInfo.getBlogApp());
191+
mBackgroundView.setContentDescription(coverUrl);
185192
GlideApp.with(this)
186-
.load(userInfo.getAvatar())
193+
.load(coverUrl)
194+
.listener(new RequestListener<Drawable>() {
195+
@Override
196+
public boolean onLoadFailed(@Nullable GlideException e, Object o, Target<Drawable> target, boolean b) {
197+
// 如果没有这张封面图就展示默认的
198+
GlideApp.with(getContext())
199+
.load(userInfo.getAvatar())
200+
.into(mBackgroundView);
201+
return true;
202+
}
203+
204+
@Override
205+
public boolean onResourceReady(Drawable drawable, Object o, Target<Drawable> target, DataSource dataSource, boolean b) {
206+
return false;
207+
}
208+
})
187209
.placeholder(R.drawable.account_top_bg)
188210
.into(mBackgroundView);
189211

190-
RaeImageLoader.displayImage(userInfo.getAvatar(), mBackgroundView);
212+
// RaeImageLoader.displayImage(userInfo.getAvatar(), mBackgroundView);
191213
}
192214

193215
mBloggerNameView.setText(userInfo.getDisplayName());
@@ -260,10 +282,15 @@ public void onFollowButtonClick() {
260282
* 头像点击
261283
*/
262284
@OnClick({R.id.img_background, R.id.img_blog_avatar})
263-
public void onAvatarClick() {
285+
public void onAvatarClick(View view) {
264286
if (mUserInfo == null) return;
265287
ArrayList<String> images = new ArrayList<>();
266-
images.add(mUserInfo.getAvatar());
288+
289+
if (view.getId() == R.id.img_background && !TextUtils.isEmpty(view.getContentDescription())) {
290+
images.add(view.getContentDescription().toString());
291+
} else {
292+
images.add(mUserInfo.getAvatar());
293+
}
267294
AppRoute.jumpToImagePreview(this, images, 0);
268295
}
269296

‎app/src/main/java/com/rae/cnblogs/activity/WebActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void setTitle(CharSequence title) {
100100

101101
@Override
102102
protected int getHomeAsUpIndicator() {
103-
return R.drawable.ic_close;
103+
return R.drawable.ic_search_del;
104104
}
105105

106106
@OnClick(R.id.img_action_bar_more)

‎app/src/main/java/com/rae/cnblogs/dialog/impl/ShareDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public interface OnShareClickListener {
9292

9393
public ShareDialog(Context context) {
9494
super(context);
95-
setContentView(R.layout.dialog_blog_content);
95+
setContentView(R.layout.dialog_share);
9696
ButterKnife.bind(this, this);
9797
mShareAction = new ShareAction((Activity) context);
9898
setShareIcon(R.drawable.ic_share_app);

‎app/src/main/res/drawable-xhdpi/channel_manager_icon.png

-113 Bytes
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/ic_action_bar_more.png

-15.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)