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 6970d78

Browse files
committed
修复线上BUG,解决登录后我的专栏重叠问题
1 parent 74c62df commit 6970d78

File tree

27 files changed

+156
-104
lines changed

27 files changed

+156
-104
lines changed

‎.idea/modules.xml

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

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.rae.cnblogs.basic.AppFragmentAdapter;
2323
import com.rae.cnblogs.basic.BasicActivity;
2424
import com.rae.cnblogs.basic.rx.AndroidObservable;
25-
import com.rae.cnblogs.blog.CnblogsService;
2625
import com.rae.cnblogs.dialog.DefaultDialogFragment;
2726
import com.rae.cnblogs.dialog.VersionDialogFragment;
2827
import com.rae.cnblogs.home.main.MainContract;
@@ -35,8 +34,6 @@
3534
import com.rae.cnblogs.sdk.bean.VersionInfo;
3635
import com.rae.cnblogs.sdk.event.PostMomentEvent;
3736
import com.rae.cnblogs.sdk.event.UserInfoChangedEvent;
38-
import com.rae.cnblogs.theme.AppThemeManager;
39-
import com.rae.cnblogs.theme.ThemeCompat;
4037
import com.rae.cnblogs.widget.ITopScrollable;
4138
import com.umeng.socialize.UMShareAPI;
4239

@@ -47,7 +44,6 @@
4744
import io.reactivex.ObservableSource;
4845
import io.reactivex.functions.Function;
4946
import io.reactivex.schedulers.Schedulers;
50-
import skin.support.SkinCompatManager;
5147

5248
@Route(path = AppRoute.PATH_APP_HOME)
5349
public class MainActivity extends BasicActivity implements MainContract.View, RaeTabLayout.OnTabSelectedListener {
@@ -71,18 +67,9 @@ protected void onCreate(Bundle savedInstanceState) {
7167
super.onCreate(savedInstanceState);
7268
setContentView(R.layout.activity_main);
7369
mPresenter = new MainPresenterImpl(this);
74-
7570
initTab();
76-
7771
// 请求权限
7872
requestPermissions();
79-
80-
// 启动服务
81-
startService(new Intent(this, CnblogsService.class));
82-
83-
// if (BuildConfig.DEBUG) {
84-
// debugLogin();
85-
// }
8673
}
8774

8875

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ public void onLoadData(ContentEntity entity) {
5858

5959
@Override
6060
public void onLoadDataFailed(String message) {
61-
// 失败后,自动跳转网页
62-
AppRoute.routeToWeb(getContext(), mUrl);
63-
dismiss();
61+
try {
62+
// 失败后,自动跳转网页
63+
AppRoute.routeToWeb(getContext(), mUrl);
64+
dismiss();
65+
} catch (Exception ex) {
66+
ex.printStackTrace();
67+
}
6468
}
6569

6670
@Override

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.google.gson.Gson;
1212
import com.rae.cnblogs.AppRoute;
1313
import com.rae.cnblogs.ContentEntityConverter;
14+
import com.rae.cnblogs.UICompat;
1415
import com.rae.cnblogs.activity.SwipeBackBasicActivity;
1516
import com.rae.cnblogs.basic.ContentEntity;
1617
import com.rae.cnblogs.basic.rx.AndroidObservable;
@@ -80,6 +81,10 @@ protected void accept(BlogBean blogBean) {
8081
}
8182

8283
private void initBlogFragment(ContentEntity entity) {
84+
if (entity == null) {
85+
UICompat.failed(this, "博客实体为空");
86+
return;
87+
}
8388
BlogDetailFragment fragment = BlogDetailFragment.newInstance(entity);
8489
getSupportFragmentManager()
8590
.beginTransaction()

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ private void saveLocalData(List<BlogBean> data) {
187187
public void onNext(List<BlogBean> blogBeans) {
188188
// 入库
189189
DbFactory.getInstance().getBlog().addAll(blogBeans);
190-
// 入库完成后,清除数据
191-
blogBeans.clear();
192190
}
193191

194192
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ public void loadBlogLocalStatus() {
226226
public void subscribe(ObservableEmitter<UserBlogInfo> e) {
227227
UserBlogInfo blogInfo = DbFactory.getInstance().getBlog().get(getView().getContentEntity().getId());
228228
if (blogInfo == null) {
229-
e.onError(new NullPointerException("blog is null"));
230229
return;
231230
}
232231
e.onNext(blogInfo);

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

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

3-
import android.support.annotation.NonNull;
4-
53
import com.rae.cnblogs.basic.BasicPresenter;
64
import com.rae.cnblogs.basic.rx.AndroidObservable;
7-
import com.rae.cnblogs.basic.rx.LifecycleProvider;
85
import com.rae.cnblogs.sdk.ApiDefaultObserver;
96
import com.rae.cnblogs.sdk.CnblogsApiFactory;
107
import com.rae.cnblogs.sdk.bean.UserFeedBean;
@@ -24,13 +21,6 @@ public FeedPresenterImpl(FeedContract.View view) {
2421
super(view);
2522
}
2623

27-
@NonNull
28-
@Override
29-
public LifecycleProvider getLifecycleProvider() {
30-
return null;
31-
}
32-
33-
3424
@Override
3525
protected void onStart() {
3626
mPage = 1;

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,20 @@ public void onPostComment(EditCommentDialogFragment dialog, String content, @Nul
246246
* @param comment 引用的评论,可为空
247247
*/
248248
private void showCommentDialog(@Nullable BlogCommentBean comment) {
249-
EditCommentDialogFragment.Entry<BlogCommentBean> entry = null;
250-
if (comment != null) {
251-
entry = new EditCommentDialogFragment.Entry<>();
252-
entry.setAuthorName(comment.getAuthorName());
253-
entry.setContent(comment.getBody());
254-
entry.setSource(comment);
255-
}
249+
try {
250+
EditCommentDialogFragment.Entry<BlogCommentBean> entry = null;
251+
if (comment != null) {
252+
entry = new EditCommentDialogFragment.Entry<>();
253+
entry.setAuthorName(comment.getAuthorName());
254+
entry.setContent(comment.getBody());
255+
entry.setSource(comment);
256+
}
256257

257-
mEditCommentDialogFragment = EditCommentDialogFragment.newInstance(EditCommentDialogFragment.FROM_TYPE_BLOG, entry);
258-
mEditCommentDialogFragment.show(getChildFragmentManager(), "EditCommentDialogFragment");
258+
mEditCommentDialogFragment = EditCommentDialogFragment.newInstance(EditCommentDialogFragment.FROM_TYPE_BLOG, entry);
259+
mEditCommentDialogFragment.show(getChildFragmentManager(), "EditCommentDialogFragment");
260+
} catch (Exception ex) {
261+
ex.printStackTrace();
262+
}
259263
}
260264

261265
@Override

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ public void onLoginExpired() {
210210

211211
@Override
212212
public void scrollToTop() {
213+
if (mRecyclerView == null) return;
214+
213215
if (mRecyclerView.isOnTop()) {
214216
mAppLayout.autoRefresh();
215217
} else {

‎module-discover/src/main/java/com/rae/cnblogs/discover/fragment/AntColumnFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ public void onNoMoreData() {
138138

139139
@Override
140140
public void onEmptyData(String msg) {
141+
dismissLogin();
141142
mRefreshLayout.setRefreshing(false);
142143
mAdapter.showEmpty(msg);
143144
mAdapter.loadMoreComplete();

0 commit comments

Comments
(0)

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