Movatterモバイル変換

[0]ホーム
URL:

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.
/android-cnblogsPublic archive

Commitad35e8d

Browse files
committed
优化小细节
1 parentd0f8fe1 commitad35e8d

File tree

45 files changed

+218
-126
lines changed

Some content is hidden

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

45 files changed

+218
-126
lines changed

‎.idea/modules.xml‎

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

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
minSdkVersion rootProject.ext.android.minSdkVersion
88
targetSdkVersion rootProject.ext.android.targetSdkVersion
99
applicationId"com.rae.cnblogs"
10-
versionCode12
11-
versionName"2.0.0"
10+
versionCode13
11+
versionName"2.0.1"
1212
multiDexEnabledtrue
1313
ndk {
1414
// 兼容webView问题

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ protected void onStart() {
116116

117117
privatevoidinitTab() {
118118
mAdapter =newAppFragmentAdapter(getSupportFragmentManager());
119-
120119
// 初始化TAB
121120
addTab(mAdapter,R.string.tab_home,R.drawable.tab_home,AppRoute.newHomeFragment());
122121
addTab(mAdapter,R.string.tab_sns,R.drawable.tab_news,AppRoute.newMomentFragment());

‎module-basic/src/main/java/com/rae/cnblogs/basic/BasicActivity.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,33 @@
1515
*/
1616
publicabstractclassBasicActivityextendsRaeUIActivityimplementsIPresenterView {
1717

18+
privatebooleanmDisabeMobclickAgent;// 是否禁止统计
19+
20+
1821
@NonNull
1922
@Override
2023
publicContextgetContext() {
2124
returnthis;
2225
}
2326

27+
publicvoidsetDisabeMobclickAgent(booleandisabeMobclickAgent) {
28+
mDisabeMobclickAgent =disabeMobclickAgent;
29+
}
30+
2431
@Override
2532
protectedvoidonResume() {
2633
super.onResume();
27-
MobclickAgent.onResume(this);
34+
if (!mDisabeMobclickAgent) {
35+
MobclickAgent.onResume(this);
36+
}
2837
}
2938

3039
@Override
3140
protectedvoidonPause() {
3241
super.onPause();
33-
MobclickAgent.onPause(this);
42+
if (!mDisabeMobclickAgent) {
43+
MobclickAgent.onPause(this);
44+
}
3445
}
3546

3647
@Override

‎module-basic/src/main/java/com/rae/cnblogs/basic/BasicFragment.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ public abstract class BasicFragment extends Fragment implements IPresenterView {
1919
@Nullable
2020
privateUnbindermUnBinder;
2121

22-
privateStringmPageName ="Fragment";
23-
2422
@Override
2523
publicvoidonCreate(@NullableBundlesavedInstanceState) {
2624
super.onCreate(savedInstanceState);
27-
mPageName =getClass().getSimpleName();
2825
Bundlearguments =getArguments();
2926
if (arguments !=null) {
3027
onReceiveArguments(arguments);
@@ -80,7 +77,6 @@ protected void onLoadData() {
8077
publicvoidonActivityResult(intrequestCode,intresultCode,Intentdata) {
8178
super.onActivityResult(requestCode,resultCode,data);
8279
List<Fragment>fragments =getChildFragmentManager().getFragments();
83-
if (fragments ==null)return;
8480
for (Fragmentfragment :fragments) {
8581
fragment.onActivityResult(requestCode,resultCode,data);
8682
}

‎module-basic/src/main/java/com/rae/cnblogs/basic/rx/LifecycleProvider.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void accept(Disposable disposable) {
4848
* 释放所有，生命周期会自动释放
4949
*/
5050
publicvoiddispose() {
51+
mCompositeDisposable.dispose();
5152
mCompositeDisposable.clear();
5253
}
5354
}

‎module-blog/src/debug/java/com/rae/cnblogs/blog/BlogTestActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
1616
super.onCreate(savedInstanceState);
1717
setContentView(R.layout.activity_fragment);
1818
getSupportFragmentManager().beginTransaction()
19-
.replace(R.id.content,BlogHomeFragment.newInstance())
19+
.replace(R.id.content,newBlogHomeFragment())
2020
.commit();
2121
}
2222
}

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

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@
1818
importcom.alibaba.android.arouter.facade.annotation.Route;
1919
importcom.bumptech.glide.load.DataSource;
2020
importcom.bumptech.glide.load.engine.GlideException;
21-
importcom.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
2221
importcom.bumptech.glide.request.RequestListener;
22+
importcom.bumptech.glide.request.RequestOptions;
2323
importcom.bumptech.glide.request.target.Target;
2424
importcom.jcodecraeer.xrecyclerview.AppBarStateChangeListener;
2525
importcom.rae.cnblogs.AppRoute;
2626
importcom.rae.cnblogs.UICompat;
2727
importcom.rae.cnblogs.activity.SwipeBackBasicActivity;
28-
importcom.rae.cnblogs.basic.AppMobclickAgent;
2928
importcom.rae.cnblogs.basic.GlideApp;
30-
importcom.rae.cnblogs.basic.GlideRequest;
3129
importcom.rae.cnblogs.blog.blogger.BloggerContract;
3230
importcom.rae.cnblogs.blog.blogger.BloggerPresenterImpl;
3331
importcom.rae.cnblogs.blog.fragment.BloggerListFragment;
@@ -49,6 +47,7 @@
4947
importbutterknife.BindView;
5048
importbutterknife.ButterKnife;
5149
importbutterknife.OnClick;
50+
importjp.wasabeef.glide.transformations.ColorFilterTransformation;
5251

5352
/**
5453
* blogger info
@@ -248,43 +247,30 @@ private void showAvatar(String blogApp, final String url) {
248247
if (TextUtils.isEmpty(url) ||url.endsWith("simple_avatar.gif"))return;
249248
// 封面图
250249
finalStringcoverUrl =String.format("https://files.cnblogs.com/files/%s/app-cover.bmp",blogApp);
251-
252-
createAvatarGlide(coverUrl)
250+
intalphaColor =ContextCompat.getColor(getContext(),R.color.blogger_image_alpha_color);
251+
// 自定义头像
252+
GlideApp.with(this)
253+
.load(coverUrl)
253254
.listener(newRequestListener<Drawable>() {
254255
@Override
255-
publicbooleanonLoadFailed(@NullableGlideExceptione,Objecto,Target<Drawable>target,booleanb) {
256+
publicbooleanonLoadFailed(@NullableGlideExceptione,Objectmodel,Target<Drawable>target,booleanisFirstResource) {
256257
returntrue;
257258
}
258259

259260
@Override
260-
publicbooleanonResourceReady(Drawabledrawable,Objecto,Target<Drawable>target,DataSourcedataSource,booleanb) {
261-
// 如果有封面图，则设置进去
261+
publicbooleanonResourceReady(Drawableresource,Objectmodel,Target<Drawable>target,DataSourcedataSource,booleanisFirstResource) {
262262
mBackgroundView.setContentDescription(coverUrl);
263-
// 统计
264-
AppMobclickAgent.onClickEvent(getContext(),"BloggerCover");
265263
returnfalse;
266264
}
267265
})
268-
// 如果没有这张封面图就展示默认的
269-
// .error(createAvatarGlide(url))
266+
.error(GlideApp
267+
.with(this)
268+
.load(url)
269+
.apply(RequestOptions.bitmapTransform(newColorFilterTransformation(alphaColor)))
270+
)
271+
.apply(RequestOptions.bitmapTransform(newColorFilterTransformation(alphaColor)))
270272
.into(mBackgroundView);
271-
}
272273

273-
/**
274-
* 创建头像显示的Glide
275-
*
276-
* @param url 头像地址
277-
*/
278-
privateGlideRequest<Drawable>createAvatarGlide(Stringurl) {
279-
intalphaColor =ContextCompat.getColor(getContext(),R.color.blogger_image_alpha_color);
280-
returnGlideApp.with(this)
281-
.load(url)
282-
.centerCrop()
283-
// .apply(RequestOptions.bitmapTransform(new MultiTransformation<>(
284-
// new BlurTransformation(20), // 高斯模糊
285-
// new ColorFilterTransformation(alphaColor)) // 遮罩层
286-
// ))
287-
.transition(DrawableTransitionOptions.withCrossFade());
288274
}
289275

290276
// @Override
@@ -332,12 +318,10 @@ public void onFollowButtonClick() {
332318
publicvoidonAvatarClick(Viewview) {
333319
if (mUserInfo ==null)return;
334320
ArrayList<String>images =newArrayList<>();
335-
336321
if (view.getId() ==R.id.img_background && !TextUtils.isEmpty(view.getContentDescription())) {
337322
images.add(view.getContentDescription().toString());
338-
}else {
339-
images.add(mUserInfo.getAvatar());
340323
}
324+
images.add(mUserInfo.getAvatar());
341325
AppRoute.routeToImagePreview(this,images,0);
342326
}
343327

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
importandroid.text.TextUtils;
77
importandroid.util.Log;
88
importandroid.view.View;
9+
importandroid.widget.TextView;
910

1011
importcom.alibaba.android.arouter.facade.annotation.Route;
1112
importcom.google.gson.Gson;
@@ -35,6 +36,9 @@ public class ContentDetailActivity extends SwipeBackBasicActivity {
3536
@BindView(R2.id.pb_loading)
3637
ViewmProgressBar;
3738

39+
@BindView(R2.id.tv_loading)
40+
TextViewmLoadingTextView;
41+
3842
@Override
3943
protectedvoidonCreate(@NullableBundlesavedInstanceState) {
4044
super.onCreate(savedInstanceState);
@@ -60,6 +64,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
6064
privatevoidloadBlogDetail(finalStringurl) {
6165
IBlogApiblogApi =CnblogsApiFactory.getInstance(this).getBlogApi();
6266
mProgressBar.setVisibility(View.VISIBLE);
67+
mLoadingTextView.setText(R.string.loading_blog_url);
6368
AndroidObservable.create(blogApi.getBlogDetail(url))
6469
.with(this)
6570
.subscribe(newApiDefaultObserver<BlogBean>() {
@@ -73,7 +78,6 @@ protected void onError(String message) {
7378

7479
@Override
7580
protectedvoidaccept(BlogBeanblogBean) {
76-
mProgressBar.setVisibility(View.GONE);
7781
ContentEntityentity =ContentEntityConverter.convert(blogBean);
7882
initBlogFragment(entity);
7983
}
@@ -85,6 +89,7 @@ private void initBlogFragment(ContentEntity entity) {
8589
UICompat.failed(this,"博客实体为空");
8690
return;
8791
}
92+
mProgressBar.setVisibility(View.GONE);
8893
BlogDetailFragmentfragment =BlogDetailFragment.newInstance(entity);
8994
getSupportFragmentManager()
9095
.beginTransaction()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
@Route(path =AppRoute.PATH_FRAGMENT_HOME)
4141
publicclassBlogHomeFragmentextendsBasicFragmentimplementsBlogHomeContract.View,RaeTabLayout.OnTabSelectedListener,ITopScrollable {
4242

43-
publicstaticBlogHomeFragmentnewInstance() {
44-
returnnewBlogHomeFragment();
45-
}
43+
// public static BlogHomeFragment newInstance() {
44+
// return new BlogHomeFragment();
45+
// }
4646

4747

4848
privateBlogHomeFragmentAdaptermAdapter;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp