Skip to content

Commit f10b688

Browse files
raeeraee
committed
博文界面UI优化
解决收藏Https问题 搜索进去的博客标题去HTML化
1 parent 32f786a commit f10b688

19 files changed

+203
-941
lines changed

‎app/src/main/assets/css/blog-common.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/assets/css/rae.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
*{
33
word-wrap: break-word;
44
}
5+
h1{
6+
font-size: 24px !important;
7+
}
8+
h2{
9+
font-size: 20px;
10+
}
11+
h3{
12+
font-size: 18px;
13+
}
14+
h4{
15+
font-size: 16px;
16+
}
17+
h5{
18+
font-size: 15px;
19+
}
20+
h6{
21+
font-size: 14px;
22+
}
523
#header{
624
padding-bottom:20px;
725
}

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

Lines changed: 80 additions & 880 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.view.View;
1313
import android.widget.TextView;
1414

15+
import com.rae.cnblogs.AppStatusBar;
1516
import com.rae.cnblogs.CnblogsApplication;
1617
import com.rae.cnblogs.R;
1718
import com.rae.cnblogs.sdk.config.CnblogSdkConfig;
@@ -46,8 +47,12 @@ public void onClick(View v) {
4647

4748
@Override
4849
protected void onCreate(@Nullable Bundle savedInstanceState) {
50+
onStatusBarColorChanged();
4951
super.onCreate(savedInstanceState);
52+
}
5053

54+
protected void onStatusBarColorChanged() {
55+
AppStatusBar.setStatusbarToDark(this);
5156
}
5257

5358
@Override

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.widget.TextView;
1010

1111
import com.rae.cnblogs.AppRoute;
12-
import com.rae.cnblogs.AppStatusBar;
1312
import com.rae.cnblogs.AppUI;
1413
import com.rae.cnblogs.R;
1514
import com.rae.cnblogs.RxObservable;
@@ -28,6 +27,7 @@
2827
import com.rae.cnblogs.widget.RaeDrawerLayout;
2928

3029
import org.greenrobot.eventbus.EventBus;
30+
import org.jsoup.Jsoup;
3131

3232
import java.util.List;
3333

@@ -85,7 +85,6 @@ public class BlogContentActivity extends SwipeBackBaseActivity {
8585

8686
@Override
8787
protected void onCreate(@Nullable Bundle savedInstanceState) {
88-
AppStatusBar.setStatusbarToDark(this);
8988
super.onCreate(savedInstanceState);
9089
setContentView(R.layout.activity_blog_content);
9190
// setSupportActionBar(mToolbar);
@@ -188,6 +187,11 @@ public ObservableSource<BlogBean> apply(@NonNull Integer integer) throws Excepti
188187
private void onLoadData(BlogBean blog) {
189188
mBlog = blog;
190189

190+
// 从搜索进来的标题处理
191+
String text = Jsoup.parse(blog.getTitle()).text();
192+
mBlog.setTitle(text);
193+
194+
191195
// 评论角标
192196
if (!TextUtils.equals(mBlog.getComment(), "0")) {
193197
mCommentBadgeView.setText(mBlog.getComment());

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.rae.cnblogs.GlideApp;
2323
import com.rae.cnblogs.R;
2424
import com.rae.cnblogs.fragment.BlogListFragment;
25+
import com.rae.cnblogs.message.UserInfoEvent;
2526
import com.rae.cnblogs.model.FeedListFragment;
2627
import com.rae.cnblogs.presenter.CnblogsPresenterFactory;
2728
import com.rae.cnblogs.presenter.IBloggerPresenter;
@@ -32,6 +33,8 @@
3233
import com.rae.cnblogs.widget.BloggerLayout;
3334
import com.rae.swift.app.RaeFragmentAdapter;
3435

36+
import org.greenrobot.eventbus.EventBus;
37+
3538
import java.util.ArrayList;
3639

3740
import butterknife.BindView;
@@ -240,6 +243,9 @@ public void onFollowSuccess() {
240243
AppUI.dismiss();
241244
mFollowView.setText(mBloggerPresenter.isFollowed() ? R.string.cancel_follow : R.string.following);
242245
setResult(RESULT_OK);
246+
247+
// 发送通知
248+
EventBus.getDefault().post(new UserInfoEvent());
243249
}
244250

245251
@Override
@@ -249,6 +255,9 @@ public void onNotLogin() {
249255
finish();
250256
}
251257

258+
@Override
259+
protected void onStatusBarColorChanged() {
260+
}
252261

253262
/**
254263
* 粉丝

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.rae.cnblogs.activity;
2-
3-
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
6-
import com.rae.cnblogs.R;
7-
8-
/**
9-
* 我的收藏
10-
* Created by ChenRui on 2017/3/16 23:33.
11-
*/
12-
public class BookmarkActivity extends BaseActivity {
13-
14-
@Override
15-
protected void onCreate(@Nullable Bundle savedInstanceState) {
16-
super.onCreate(savedInstanceState);
17-
setContentView(R.layout.activity_bookmark);
18-
}
19-
}
1+
//package com.rae.cnblogs.activity;
2+
//
3+
//import android.os.Bundle;
4+
//import android.support.annotation.Nullable;
5+
//
6+
//import com.rae.cnblogs.R;
7+
//
8+
///**
9+
// * 我的收藏
10+
// * Created by ChenRui on 2017/3/16 23:33.
11+
// */
12+
//public class BookmarkActivity extends BaseActivity {
13+
//
14+
// @Override
15+
// protected void onCreate(@Nullable Bundle savedInstanceState) {
16+
// super.onCreate(savedInstanceState);
17+
// setContentView(R.layout.activity_bookmark);
18+
// }
19+
//}

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

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

3+
import android.graphics.Color;
34
import android.os.Build;
45
import android.os.Bundle;
56
import android.support.annotation.Nullable;
@@ -23,8 +24,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
2324
overridePendingTransition(com.rae.cnblogs.R.anim.slide_in_bottom, 0);
2425
super.onCreate(savedInstanceState);
2526
mToolBar.setVisibility(View.GONE);
27+
((View) mToolBar.getParent()).setBackgroundColor(Color.TRANSPARENT);
28+
2629
findViewById(android.R.id.content).setFitsSystemWindows(true);
27-
AppMobclickAgent.onClickEvent(getContext(),"Search");
30+
AppMobclickAgent.onClickEvent(getContext(), "Search");
2831
}
2932

3033
@Override

‎app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.rae.cnblogs.sdk.bean.BlogBean;
3030
import com.rae.cnblogs.sdk.bean.BlogType;
3131
import com.rae.cnblogs.sdk.db.model.UserBlogInfo;
32-
import com.rae.cnblogs.utils.ViewCaptureUtils;
3332
import com.rae.cnblogs.widget.ImageLoadingView;
3433
import com.rae.cnblogs.widget.PlaceholderView;
3534
import com.rae.cnblogs.widget.RaeWebView;
@@ -39,10 +38,7 @@
3938
import org.greenrobot.eventbus.EventBus;
4039
import org.greenrobot.eventbus.Subscribe;
4140

42-
import java.io.File;
43-
4441
import butterknife.BindView;
45-
import io.reactivex.functions.Consumer;
4642

4743

4844
/**
@@ -166,21 +162,21 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
166162
mBackView = getActivity().findViewById(R.id.back);
167163
mMoreView = getActivity().findViewById(R.id.img_action_bar_more);
168164

169-
// 测试一下
170-
final ViewCaptureUtils viewCaptureUtils = new ViewCaptureUtils(getContext());
171-
mBackView.setOnClickListener(new View.OnClickListener() {
172-
173-
@Override
174-
public void onClick(View view) {
175-
viewCaptureUtils.capture(mWebView, "/sdcard/test.jpg")
176-
.subscribe(new Consumer<File>() {
177-
@Override
178-
public void accept(File file) throws Exception {
179-
AppUI.toast(getContext(), "保存成功！");
180-
}
181-
});
182-
}
183-
});
165+
// // 测试一下
166+
// final ViewCaptureUtils viewCaptureUtils = new ViewCaptureUtils(getContext());
167+
// mBackView.setOnClickListener(new View.OnClickListener() {
168+
//
169+
// @Override
170+
// public void onClick(View view) {
171+
// viewCaptureUtils.capture(mWebView, "/sdcard/test.jpg")
172+
// .subscribe(new Consumer<File>() {
173+
// @Override
174+
// public void accept(File file) throws Exception {
175+
// AppUI.toast(getContext(), "保存成功！");
176+
// }
177+
// });
178+
// }
179+
// });
184180
}
185181

186182
@Override

‎app/src/main/java/com/rae/cnblogs/fragment/MineFragment.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.rae.cnblogs.RaeImageLoader;
2020
import com.rae.cnblogs.RxObservable;
2121
import com.rae.cnblogs.ThemeCompat;
22+
import com.rae.cnblogs.message.UserInfoEvent;
2223
import com.rae.cnblogs.sdk.ApiDefaultObserver;
2324
import com.rae.cnblogs.sdk.CnblogsApiFactory;
2425
import com.rae.cnblogs.sdk.CnblogsReportException;
@@ -28,6 +29,9 @@
2829
import com.rae.cnblogs.sdk.bean.UserInfoBean;
2930
import com.tencent.bugly.crashreport.CrashReport;
3031

32+
import org.greenrobot.eventbus.EventBus;
33+
import org.greenrobot.eventbus.Subscribe;
34+
3135
import java.util.List;
3236

3337
import butterknife.BindView;
@@ -73,6 +77,12 @@ protected int getLayoutId() {
7377
return R.layout.fm_mine;
7478
}
7579

80+
@Override
81+
public void onCreate(@Nullable Bundle savedInstanceState) {
82+
super.onCreate(savedInstanceState);
83+
EventBus.getDefault().register(this);
84+
}
85+
7686
@Override
7787
protected void onCreateView(View view) {
7888
super.onCreateView(view);
@@ -88,6 +98,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
8898
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
8999
super.onActivityCreated(savedInstanceState);
90100

101+
// 加载用户信息
102+
loadUserInfo();
103+
91104
// 意见反馈的回复
92105
checkFeedbackMessage();
93106

@@ -110,7 +123,6 @@ protected void accept(Integer integer) {
110123
@Override
111124
public void onResume() {
112125
super.onResume();
113-
loadUserInfo();
114126
// 夜间模式处理
115127
mNightModeButton.setCheckedNoEvent(ThemeCompat.isNight());
116128
}
@@ -189,6 +201,7 @@ private void onLoadUserInfo(UserInfoBean user) {
189201
@Override
190202
public void onDestroy() {
191203
super.onDestroy();
204+
EventBus.getDefault().unregister(this);
192205
RxObservable.dispose("MineFragment");
193206
}
194207

@@ -296,4 +309,9 @@ public void onCommentsFetch(List<Comment> list, AVException e) {
296309
CrashReport.postCatchedException(new CnblogsReportException("意见反馈发生异常！", e));
297310
}
298311
}
312+
313+
@Subscribe
314+
public void onEvent(UserInfoEvent event) {
315+
loadUserInfo();
316+
}
299317
}

‎app/src/main/java/com/rae/cnblogs/widget/PlaceholderView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ private void initAttr(AttributeSet attrs) {
100100
break;
101101
case R.styleable.PlaceholderView_loading_message:
102102
mLoadingText = a.getString(index);
103+
mLoadingTextView.setText(mLoadingText);
103104
break;
104105
}
105106
}

‎app/src/main/res/drawable/bg_dialog_default.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
33
<solid android:color="@color/white"/>
44
<corners android:radius="@dimen/default_radius"/>
5-
<padding android:bottom="@dimen/default_radius"/>
5+
<padding
6+
android:bottom="@dimen/default_radius"
7+
android:top="@dimen/default_radius"/>
68
</shape>

‎app/src/main/res/drawable/progress_web_view.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<item android:id="@android:id/background">
5-
<!-- <color android:color="@android:color/transparent"/>-->
6-
<shape>
7-
<gradient
8-
android:endColor="@color/colorPrimary"
9-
android:startColor="#9bd7ff"/>
10-
</shape>
5+
<color android:color="@android:color/transparent"/>
6+
<!-- <shape>
7+
<gradient
8+
android:endColor="@color/colorPrimary"
9+
android:startColor="#9bd7ff"/>
10+
</shape>-->
1111
</item>
1212

1313
<!-- 第二条进度条颜色 -->
@@ -26,8 +26,8 @@
2626
<clip>
2727
<shape>
2828
<gradient
29-
android:endColor="#FFFFFF"
30-
android:startColor="#C8FFFFFF"/>
29+
android:endColor="@color/colorPrimary"
30+
android:startColor="#9bd7ff"/>
3131
</shape>
3232
</clip>
3333
</item>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:background="@color/white"
6+
android:fitsSystemWindows="true"
67
android:orientation="vertical"
78
android:paddingTop="@dimen/default_padding_top">
89

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:background="@drawable/bg_dialog_default"
7-
android:paddingTop="@dimen/default_radius">
6+
android:background="@drawable/bg_dialog_default">
87

98
<android.support.v7.widget.RecyclerView
109
android:id="@+id/rec_dialog_menu"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:layout_marginTop="12dp"
76
android:orientation="vertical"
87
android:paddingLeft="10dp"
98
android:paddingRight="10dp">
109

1110
<android.support.v7.widget.CardView
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content"
13+
android:background="@drawable/bg_message_card"
1414
app:cardCornerRadius="4dp"
15-
app:cardElevation="4dp"
15+
app:cardElevation="10dp"
1616
app:cardPreventCornerOverlap="false"
1717
app:cardUseCompatPadding="true"
1818
app:contentPadding="5dp">

‎sdk/src/main/java/com/rae/cnblogs/sdk/api/ApiUrls.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ final class ApiUrls {
6363
static final String API_BOOK_MARKS_DELETE = "http://wz.cnblogs.com/ajax/wz/DeleteWzlink";
6464

6565
// 收藏-列表
66-
static final String API_BOOK_MARKS_LIST = "http://wz.cnblogs.com/my/{page}.html";
66+
static final String API_BOOK_MARKS_LIST = "https://wz.cnblogs.com/my/{page}.html";
6767

6868
// 知识库-内容
6969
static final String API_KB_CONTENT = "https://kb.cnblogs.com/page/{id}/";

0 commit comments

Comments
 (0)