Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 1827d75

Browse files
raedevraedev
committed
修复一些BUG
1 parent fa2df1b commit 1827d75

File tree

19 files changed

+141
-73
lines changed

19 files changed

+141
-73
lines changed

‎module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5454
@OnClick(R2.id.img_question)
5555
public void onQuestionClick() {
5656
AppRoute.routeToAntColumnWeb(this, getString(R.string.url_antcode_about));
57-
// AppRoute.routeToAntColumnWeb(this, "http://192.168.1.7:8080/about");
57+
// AppRoute.routeToAntColumnWeb(this, "https://m.baidu.com");
5858
}
5959

6060
class AntColumnAdapter extends FragmentPagerAdapter {

‎module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntColumnDetailActivity.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.antcode.sdk.AntSessionManager;
2222
import com.antcode.sdk.model.AntColumnInfo;
2323
import com.antcode.sdk.model.AntIntroArticlesInfo;
24+
import com.antcode.sdk.model.AntShareInfo;
2425
import com.chad.library.adapter.base.BaseQuickAdapter;
2526
import com.chad.library.adapter.base.entity.MultiItemEntity;
2627
import com.rae.cnblogs.AppRoute;
@@ -317,6 +318,8 @@ public void onStudyClick() {
317318
public void onShareClick() {
318319
if (mAdapter == null || mAdapter.getColumnInfo() == null) return;
319320
AntColumnInfo columnInfo = mAdapter.getColumnInfo();
320-
ShareDialogFragment.newInstance("http://www.baidu.com", columnInfo.getTitle(), columnInfo.getRecommendation(), columnInfo.getAvatar(), false).show(getSupportFragmentManager(), "share");
321+
AntShareInfo shareInfo = columnInfo.getShareInfo();
322+
if (shareInfo == null) return;
323+
ShareDialogFragment.newInstance(shareInfo.getUrl(), shareInfo.getTitle(), shareInfo.getDesc(), shareInfo.getImageUrl(), false).show(getSupportFragmentManager(), "share");
321324
}
322325
}

‎module-discover/src/main/java/com/rae/cnblogs/discover/ui/RankingActivity.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.rae.cnblogs.discover.fragment.RankingFragment;
1818
import com.rae.cnblogs.discover.presenter.IRankingContract;
1919
import com.rae.cnblogs.widget.RaeScrollTopTabListener;
20-
import com.rae.session.SessionManager;
2120

2221
import java.util.ArrayList;
2322
import java.util.List;
@@ -42,17 +41,19 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
4241
TabFragmentAdapter adapter = new TabFragmentAdapter(getSupportFragmentManager())
4342
.Add(IRankingContract.TYPE_TOP_READ, "周阅榜")
4443
.Add(IRankingContract.TYPE_HOT_SEARCH, "热搜榜")
45-
.Add(IRankingContract.TYPE_TOP_AUTHOR, "大神榜");
44+
.Add(IRankingContract.TYPE_TOP_AUTHOR, "大神榜")
45+
.Add(IRankingContract.TYPE_TOP_FAVORITE, "收藏榜");
4646

47-
// 收藏榜要登录之后才能查看
48-
if (SessionManager.getDefault().isLogin()) {
49-
adapter.Add(IRankingContract.TYPE_TOP_FAVORITE, "收藏榜");
50-
}
47+
int position = getIntent().getIntExtra("position", -1);
5148

5249
mViewPager.setOffscreenPageLimit(4);
5350
mViewPager.setAdapter(adapter);
5451
mTabLayout.setupWithViewPager(mViewPager);
5552
mTabLayout.addOnTabSelectedListener(new RaeScrollTopTabListener(mViewPager, getSupportFragmentManager()));
53+
54+
if (position > 0) {
55+
mViewPager.setCurrentItem(position);
56+
}
5657
}
5758

5859

‎module-discover/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<string name="study_now">立即学习</string>
1313
<string name="format_article_updated">已更新%d篇文章</string>
1414
<string name="unsubscribe_success">取消订阅成功</string>
15-
<string name="url_antcode_about">http://app.mayizhuanlan.com/about</string>
15+
<string name="url_antcode_about">https://app.mayizhuanlan.com/about</string>
1616
<string name="detail_mode">展开详情</string>
1717
<string name="title_mode">显示标题</string>
1818
<string name="ant_user_contract_message">博客园并没有专栏，继续登录代表您已同意将手机号码作为账号接入作者开发的码蚁专栏平台，请注意您的个人账号和隐私安全。</string>

‎module-home/src/main/java/com/rae/cnblogs/home/fragment/HotSearchFragment.java‎

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

12+
import com.rae.cnblogs.AppRoute;
1213
import com.rae.cnblogs.basic.BaseItemAdapter;
1314
import com.rae.cnblogs.basic.BasicFragment;
1415
import com.rae.cnblogs.home.R;
@@ -135,4 +136,9 @@ public void onLoadSearchHistoryData(List<String> data) {
135136
public void onClearHistoryClick() {
136137
mPresenter.clearSearchHistory();
137138
}
139+
140+
@OnClick(R2.id.tv_more)
141+
public void onMoreClick() {
142+
AppRoute.routeToRanking(getContext(), 1);
143+
}
138144
}

‎module-home/src/main/res/layout/fm_hot_search.xml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,33 @@
4242
android:layout_width="match_parent"
4343
android:layout_height="wrap_content" />
4444

45-
<TextView
46-
android:id="@+id/tv_hot_search"
47-
android:layout_width="wrap_content"
45+
<LinearLayout
46+
android:layout_width="match_parent"
4847
android:layout_height="wrap_content"
49-
android:paddingTop="20dp"
50-
android:paddingBottom="20dp"
51-
android:text="热门搜索"
52-
android:textColor="@color/black"
53-
android:textSize="14sp" />
48+
android:orientation="horizontal">
49+
50+
<TextView
51+
android:id="@+id/tv_hot_search"
52+
android:layout_width="0dp"
53+
android:layout_height="wrap_content"
54+
android:layout_weight="1"
55+
android:text="热门搜索"
56+
android:textColor="@color/black"
57+
android:textSize="14sp" />
58+
59+
60+
<TextView
61+
android:id="@+id/tv_more"
62+
android:layout_width="wrap_content"
63+
android:layout_height="wrap_content"
64+
android:paddingStart="20dp"
65+
android:paddingTop="20dp"
66+
android:paddingEnd="12dp"
67+
android:paddingBottom="20dp"
68+
android:text="更多"
69+
android:textColor="@color/ph3"
70+
android:textSize="14sp" />
71+
</LinearLayout>
5472

5573
<android.support.v7.widget.RecyclerView
5674
android:id="@+id/recycler_view_hot_search"

‎module-middleware/src/main/java/com/rae/cnblogs/AppRoute.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public final class AppRoute {
3535

3636
// 绑定手机号码
37-
public static final String PATH_DISCOVER_USER_AUTH = "/discover/user/auth";
37+
public static final String PATH_DISCOVER_USER_AUTH = "/discover/user/token";
3838
public static final String PATH_DISCOVER_AUTH_RESULT = "/discover/user/result";
3939
// 用户协议
4040
public static final String PATH_DISCOVER_USER_CONTRACT = "/discover/user/contract";
@@ -90,7 +90,7 @@ public final class AppRoute {
9090
/**
9191
* 博主主页
9292
*/
93-
public static final String PATH_BLOGGER = "/blog/author";
93+
public static final String PATH_BLOGGER = "/blog/auth/author";
9494

9595
/**
9696
* 网页
@@ -754,6 +754,15 @@ public static void routeToAntColumnDetail(Context context, int id) {
754754
.navigation(context);
755755
}
756756

757+
/**
758+
* 排行榜
759+
*/
760+
public static void routeToRanking(Context context, int position) {
761+
ARouter.getInstance().build(PATH_DISCOVER_RANKING)
762+
.withInt("position", position)
763+
.navigation(context);
764+
}
765+
757766
/**
758767
* 用户订阅的专栏详情
759768
*/

‎module-middleware/src/main/java/com/rae/cnblogs/LoginRouteInterceptor.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
//package com.rae.cnblogs;
2-
//
3-
//import android.content.Context;
4-
//
5-
//import com.alibaba.android.arouter.facade.Postcard;
6-
//import com.alibaba.android.arouter.facade.annotation.Interceptor;
7-
//import com.alibaba.android.arouter.facade.callback.InterceptorCallback;
8-
//import com.alibaba.android.arouter.facade.template.IInterceptor;
9-
//import com.rae.cnblogs.sdk.UserProvider;
10-
//
11-
///**
12-
// * 登录路由拦截器
13-
// * Created by rae on 2018/5/14.
14-
// * Copyright (c) https://github.com/raedev All rights reserved.
15-
// */
16-
//@Interceptor(priority = 1)
17-
//public class LoginRouteInterceptor implements IInterceptor {
18-
//
19-
// private Context mContext;
20-
//
21-
// @Override
22-
// public void process(Postcard postcard, InterceptorCallback callback) {
23-
// String path = postcard.getPath();
24-
//
25-
// // 授权登录的路由，没有登录自动跳转到登录界面
26-
// if (path.contains("auth") && UserProvider.getInstance().isNotLogin()) {
27-
// AppRoute.routeToLogin(mContext);
28-
// callback.onInterrupt(new RuntimeException("登录路由拦截了,路由：" + path));
29-
// return;
30-
// }
31-
// callback.onContinue(postcard);
32-
// }
33-
//
34-
// @Override
35-
// public void init(Context context) {
36-
// mContext = context;
37-
// }
38-
//}
1+
package com.rae.cnblogs;
2+
3+
import android.content.Context;
4+
5+
import com.alibaba.android.arouter.facade.Postcard;
6+
import com.alibaba.android.arouter.facade.annotation.Interceptor;
7+
import com.alibaba.android.arouter.facade.callback.InterceptorCallback;
8+
import com.alibaba.android.arouter.facade.template.IInterceptor;
9+
import com.rae.cnblogs.sdk.UserProvider;
10+
11+
/**
12+
* 登录路由拦截器
13+
* Created by rae on 2018/5/14.
14+
* Copyright (c) https://github.com/raedev All rights reserved.
15+
*/
16+
@Interceptor(priority = 1)
17+
public class LoginRouteInterceptor implements IInterceptor {
18+
19+
private Context mContext;
20+
21+
@Override
22+
public void process(Postcard postcard, InterceptorCallback callback) {
23+
String path = postcard.getPath();
24+
25+
// 授权登录的路由，没有登录自动跳转到登录界面
26+
if (path.contains("auth") && UserProvider.getInstance().isNotLogin()) {
27+
AppRoute.routeToLogin(mContext);
28+
callback.onInterrupt(new RuntimeException("登录路由拦截了,路由：" + path));
29+
return;
30+
}
31+
callback.onContinue(postcard);
32+
}
33+
34+
@Override
35+
public void init(Context context) {
36+
mContext = context;
37+
}
38+
}

‎module-middleware/src/main/java/com/rae/cnblogs/web/WebViewFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
9595
settings.setAllowFileAccess(true);
9696

9797

98-
File cacheDir = getContext().getExternalCacheDir();
98+
File cacheDir = requireContext().getExternalCacheDir();
9999

100100
if (cacheDir != null && cacheDir.canRead() && cacheDir.canWrite()) {
101101
settings.setAppCacheEnabled(true);
@@ -211,7 +211,7 @@ protected void onLoadData() {
211211

212212
// 夜间模式
213213
if (ThemeCompat.isNight()) {
214-
mWebView.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.white_night));
214+
mWebView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white_night));
215215
}
216216

217217
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && BuildConfig.DEBUG) {

‎module-moment/src/main/java/com/rae/cnblogs/moment/fragment/MomentHomeFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void onEvent(final PostMomentEvent event) {
233233
new DefaultDialogFragment
234234
.Builder()
235235
.confirmText("立即查看")
236-
.message("发布闪存失败")
236+
.message("闪存发布失败！" + event.getMessage())
237237
.confirm(new DialogInterface.OnClickListener() {
238238
@Override
239239
public void onClick(DialogInterface dialog, int which) {

0 commit comments

Comments
 (0)