Skip to content

Commit e5f6bb6

Browse files
author
ChenRui
committed
Merge remote-tracking branch 'origin/1.0.2' into 1.0.2
2 parents fe37768 + 9567346 commit e5f6bb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+90
-114
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_back.png

-483 Bytes
Binary file not shown.

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

-1007 Bytes
Loading

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

-5.18 KB
Binary file not shown.

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

-4.97 KB
Binary file not shown.

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

-4.6 KB
Binary file not shown.

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

-4.08 KB
Binary file not shown.

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

-4.51 KB
Binary file not shown.

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

-4.23 KB
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/tab_channel_background.9.png

7 Bytes
Loading

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

-3.85 KB
Binary file not shown.

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

-2.34 KB
Binary file not shown.

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

-5.18 KB
Binary file not shown.

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

-4.58 KB
Binary file not shown.

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

167 Bytes
Loading

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

-514 Bytes
Loading

‎app/src/main/res/drawable-xxhdpi/ic_back.png

-295 Bytes
Loading

‎app/src/main/res/drawable-xxhdpi/qq_allshare_normal.png

16.9 KB
Loading

‎app/src/main/res/drawable-xxhdpi/qq_allshare_pressed.png

16.7 KB
Loading

‎app/src/main/res/drawable-xxhdpi/qqkj_allshare_normal.png

17.2 KB
Loading

‎app/src/main/res/drawable-xxhdpi/qqkj_allshare_pressed.png

17 KB
Loading

‎app/src/main/res/drawable-xxhdpi/sina_allshare_normal.png

16.8 KB
Loading

‎app/src/main/res/drawable-xxhdpi/sina_allshare_pressed.png

16.6 KB
Loading

‎app/src/main/res/drawable-xxhdpi/weixin_allshare_normal.png

16.5 KB
Loading

‎app/src/main/res/drawable-xhdpi/ic_action_bar_more.png renamed to ‎app/src/main/res/drawable-xxhdpi/weixin_allshare_pressed.png

15.1 KB
Loading

‎app/src/main/res/drawable-xxhdpi/weixinpyq_allshare_normal.png

16.5 KB
Loading

‎app/src/main/res/drawable-xxhdpi/weixinpyq_allshare_pressed.png

16.4 KB
Loading

‎app/src/main/res/layout/activity_login.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
android:layout_alignParentRight="true"
2727
android:layout_centerVertical="true"
2828
android:background="@android:color/transparent"
29-
android:paddingBottom="18dp"
29+
android:paddingBottom="12dp"
3030
android:paddingLeft="12dp"
3131
android:paddingRight="12dp"
32-
android:paddingTop="18dp"
32+
android:paddingTop="12dp"
3333
android:scaleType="center"
3434
android:src="@drawable/login_btn_close"/>
3535

@@ -147,11 +147,11 @@
147147
android:id="@+id/tv_reg"
148148
android:layout_width="wrap_content"
149149
android:layout_height="wrap_content"
150+
android:layout_alignParentLeft="true"
151+
android:paddingBottom="12dp"
150152
android:paddingRight="12dp"
151153
android:paddingTop="12dp"
152-
android:paddingBottom="12dp"
153154
android:text="注册账号"
154-
android:layout_alignParentLeft="true"
155155
android:textColor="@color/ph4"
156156
android:textSize="12sp"/>
157157

@@ -160,9 +160,9 @@
160160
android:layout_width="wrap_content"
161161
android:layout_height="wrap_content"
162162
android:layout_alignParentRight="true"
163+
android:paddingBottom="12dp"
163164
android:paddingLeft="12dp"
164165
android:paddingTop="12dp"
165-
android:paddingBottom="12dp"
166166
android:text="@string/forget_password"
167167
android:textColor="@color/ph4"
168168
android:textSize="12sp"/>

‎app/src/main/res/layout/dialog_blog_content.xml renamed to ‎app/src/main/res/layout/dialog_share.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,42 @@
2121
<LinearLayout
2222
android:layout_width="wrap_content"
2323
android:layout_height="match_parent"
24+
android:gravity="center"
2425
android:orientation="horizontal">
2526

26-
2727
<TextView
28-
android:id="@+id/tv_share_wechat"
28+
29+
android:id="@+id/tv_share_qq"
2930
style="@style/ShareIcon"
3031
android:layout_width="wrap_content"
3132
android:layout_height="wrap_content"
32-
android:drawableTop="@drawable/ic_share_wechat"
33-
android:text="@string/wechat"/>
33+
android:drawableTop="@drawable/ic_share_qq"
34+
android:text="@string/qq"/>
3435

3536
<TextView
36-
android:id="@+id/tv_share_wechat_sns"
37+
android:id="@+id/tv_share_qzone"
3738
style="@style/ShareIcon"
3839
android:layout_width="wrap_content"
3940
android:layout_height="wrap_content"
40-
android:drawableTop="@drawable/ic_share_wechat_sns"
41-
android:text="@string/wechat_sns"/>
41+
android:drawableTop="@drawable/ic_share_qzone"
42+
android:text="@string/qzone"/>
4243

4344
<TextView
44-
45-
android:id="@+id/tv_share_qq"
45+
android:id="@+id/tv_share_wechat"
4646
style="@style/ShareIcon"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"
49-
android:drawableTop="@drawable/ic_share_qq"
50-
android:text="@string/qq"/>
49+
android:drawableTop="@drawable/ic_share_wechat"
50+
android:text="@string/wechat"/>
5151

5252
<TextView
53-
android:id="@+id/tv_share_qzone"
53+
android:id="@+id/tv_share_wechat_sns"
5454
style="@style/ShareIcon"
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content"
57-
android:drawableTop="@drawable/ic_share_qzone"
58-
android:text="@string/qzone"/>
57+
android:drawableTop="@drawable/ic_share_wechat_sns"
58+
android:text="@string/wechat_sns"/>
59+
5960

6061
<TextView
6162
android:id="@+id/tv_share_sina"

‎app/src/main/res/layout/view_title.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
android:id="@+id/tv_title"
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
15-
android:layout_marginRight="48dp"
15+
android:layout_marginRight="12dp"
1616
android:ellipsize="end"
17-
android:gravity="center"
1817
android:singleLine="true"
1918
android:text="@string/app_name"
2019
android:textColor="@color/ph1"
21-
android:textSize="@dimen/h1"
20+
android:textSize="18sp"
2221
android:textStyle="bold"/>
2322

2423
</android.support.v7.widget.Toolbar>

‎app/src/main/res/values/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<string name="edit_comment">发表伟大的言论…</string>
99
<string name="wechat_sns">微信朋友圈</string>
1010
<string name="qq">QQ</string>
11-
<string name="wechat">微信</string>
11+
<string name="wechat">微信好友</string>
1212
<string name="qzone">QQ空间</string>
1313
<string name="sina">新浪微博</string>
1414
<string name="view_source">查看原文</string>
@@ -32,7 +32,7 @@
3232
<string name="register">注册</string>
3333
<string name="login_tips">登录即表示同意</string>
3434
<string name="login_contract">博客园APP隐私说明</string>
35-
<string name="login_contract_content">博客园APP已经开源，登录过程我们会收集您遇到的错误信息以及博客名称，但我们不会收集您的帐号密码信息，请放心登录。\n您在登录过程如有任何问题请联系博客园官方团队。contact@cnblogs.com\n</string>
35+
<string name="login_contract_content">博客园APP已经开源，登录过程我们会收集您遇到的错误信息以及您的博客名称，但我们不会收集您的帐号密码信息，请放心登录。\n\n您在登录过程如有任何问题请前往设置-帮助中心查看具体说明，或者联系博客园官方团队contact@cnblogs.com。</string>
3636
<string name="login_user_name_hint">用户名</string>
3737
<string name="login_password_hint">密码</string>
3838
<string name="login">登录</string>
@@ -84,7 +84,7 @@
8484
<string name="praises">给个好评</string>
8585
<string name="praises_error">您似乎没有安装应用市场</string>
8686
<string name="share_app_url">http://www.raeblog.com/cnblogs/index.php/app/share</string>
87-
<string name="share_app_title">推荐一个好应用给你「博客园」</string>
87+
<string name="share_app_title">推荐一个好应用「博客园」给你</string>
8888
<string name="share_app_desc">听说大牛都在用的博客园APP，一个面向开发者的知识分享社区，一个纯净的技术交流社区。</string>
8989
<string name="market_url">market://details?id=com.rae.cnblogs</string>
9090
<string name="service_name">博客园离线服务</string>
@@ -107,6 +107,6 @@
107107
<string name="check_update">检查更新</string>
108108
<string name="help_center">帮助中心</string>
109109
<string name="url_help_center">http://www.raeblog.com/cnblogs/help.html</string>
110-
<string name="url_license">file:///android_asset/license.html</string>
110+
<string name="url_license">http://www.raeblog.com/cnblogs/license.html</string>
111111
<string name="system_message">系统消息</string>
112112
</resources>

‎app/src/main/res/values/styles.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,15 @@
8888
<item name="android:layout_marginBottom">22dp</item>
8989
<item name="android:drawablePadding">7dp</item>
9090
<item name="android:textColor">@color/ph1</item>
91-
<item name="android:layout_marginRight">20dp</item>
91+
<item name="android:layout_marginRight">25dp</item>
9292
<item name="android:textSize">@dimen/h3</item>
9393
<item name="android:gravity">center</item>
94+
<item name="android:textStyle">bold</item>
9495
</style>
9596

9697
<style name="AppToolBar" parent="Widget.AppCompat.Toolbar">
9798
<item name="contentInsetStart">0dp</item><!-- 设置该属性解决空白部分-->
99+
<item name="contentInsetEnd">0dp</item>
98100
<item name="contentInsetStartWithNavigation">0dp</item>
99101

100102
</style>

0 commit comments

Comments
 (0)