Skip to content

Commit a09577d

Browse files
raedevraedev
committed
解決线上的问题
发现页添加Banner
1 parent 9810b31 commit a09577d

File tree

27 files changed

+289
-28
lines changed

27 files changed

+289
-28
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.DialogInterface;
55
import android.content.Intent;
66
import android.content.pm.PackageManager;
7+
import android.net.Uri;
78
import android.os.Build;
89
import android.os.Bundle;
910
import android.support.annotation.NonNull;
@@ -30,6 +31,7 @@
3031
import com.rae.cnblogs.sdk.ApiDefaultObserver;
3132
import com.rae.cnblogs.sdk.CnblogsApiFactory;
3233
import com.rae.cnblogs.sdk.UserProvider;
34+
import com.rae.cnblogs.sdk.api.IUserApi;
3335
import com.rae.cnblogs.sdk.bean.UserInfoBean;
3436
import com.rae.cnblogs.sdk.bean.VersionInfo;
3537
import com.rae.cnblogs.sdk.event.PostMomentEvent;
@@ -42,6 +44,12 @@
4244
import org.greenrobot.eventbus.EventBus;
4345

4446
import butterknife.BindView;
47+
import io.reactivex.Observable;
48+
import io.reactivex.ObservableSource;
49+
import io.reactivex.android.schedulers.AndroidSchedulers;
50+
import io.reactivex.annotations.SchedulerSupport;
51+
import io.reactivex.functions.Function;
52+
import io.reactivex.schedulers.Schedulers;
4553
import skin.support.SkinCompatManager;
4654

4755
@Route(path = AppRoute.PATH_APP_HOME)
@@ -99,7 +107,10 @@ protected void debugLogin() {
99107
}
100108

101109
// 获取用户信息
102-
AndroidObservable.create(CnblogsApiFactory.getInstance(this).getUserApi().getUserInfo("393130"))
110+
final IUserApi userApi = CnblogsApiFactory.getInstance(this).getUserApi();
111+
Observable<UserInfoBean> userBlogAppInfo = userApi.getUserBlogAppInfo();
112+
Observable<UserInfoBean> observable = userBlogAppInfo.flatMap((Function<UserInfoBean, ObservableSource<UserInfoBean>>) userInfoBean -> userApi.getUserInfo(userInfoBean.getBlogApp()).subscribeOn(Schedulers.io()));
113+
AndroidObservable.create(observable)
103114
.with(this)
104115
.subscribe(new ApiDefaultObserver<UserInfoBean>() {
105116
@Override

‎dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ext {
4040
xRecyclerView : 'com.github.raee:XRecyclerView:1.3.3',
4141
roundedImage : 'com.makeramen:roundedimageview:2.3.0',
4242
multidex : 'com.android.support:multidex:1.0.2',
43-
glide : 'com.github.bumptech.glide:glide:4.0.0',
43+
glide : 'com.github.bumptech.glide:glide:4.8.0',
4444

4545
// 友盟统计-公共库
4646
umengCommon : 'com.umeng.sdk:common:1.5.3',
@@ -69,6 +69,6 @@ ext {
6969
annotationProcessors = [
7070
butterknife: 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT',
7171
arouter : 'com.alibaba:arouter-compiler:1.1.4',
72-
glide : 'com.github.bumptech.glide:compiler:4.0.0',
72+
glide : 'com.github.bumptech.glide:compiler:4.8.0',
7373
]
7474
}

‎module-basic/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ dependencies {
3636
// 友盟
3737
api rootProject.ext.dependencies.umengCommon
3838
api rootProject.ext.dependencies.umengAnalytics
39+
api('jp.wasabeef:glide-transformations:4.0.1', {
40+
exclude group: 'om.github.bumptech.glide'
41+
})
3942

4043
// api rootProject.ext.dependencies.umShareCore
4144
// api rootProject.ext.dependencies.umShareQQ

‎module-basic/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
android:name="com.umeng.socialize.media.WBShareCallBackActivity"
1111
android:configChanges="keyboardHidden|orientation"
1212
android:exported="false"
13-
android:screenOrientation="portrait"
14-
android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
13+
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
1514
<activity
1615
android:name="com.sina.weibo.sdk.web.WeiboSdkWebActivity"
1716
android:configChanges="keyboardHidden|orientation"

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,4 @@ private <T> T checkNotNull(T object) {
6666
public LifecycleProvider getLifecycleProvider() {
6767
return mLifecycleProvider;
6868
}
69-
70-
7169
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Created by dengmaohua on 2018/11/2 16:26.
1818
*/
1919
public class FeedPresenterImpl extends BasicPresenter<FeedContract.View> implements FeedContract.Presenter {
20-
private int mPage=1;
20+
private int mPage = 1;
2121
private final List<UserFeedBean> mDataList = new ArrayList<>();
2222

2323
public FeedPresenterImpl(FeedContract.View view) {
@@ -44,6 +44,7 @@ public void loadMore() {
4444

4545
private void loadData() {
4646
AndroidObservable.create(CnblogsApiFactory.getInstance(getContext()).getFriendApi().getFeeds(mPage, getView().getBlogApp()))
47+
.with(this)
4748
.subscribe(new ApiDefaultObserver<List<UserFeedBean>>() {
4849
@Override
4950
protected void onError(String message) {

‎module-blog/src/main/res/layout/item_category.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@
2020
android:paddingRight="12dp"
2121
android:paddingBottom="10dp"
2222
android:singleLine="true"
23-
android:text="@string/app_name"
23+
android:text="@string/title"
2424
android:textColor="@color/black"
2525
android:textSize="14sp" />
2626

27-
<ImageView
27+
<android.support.v7.widget.AppCompatImageView
2828
android:id="@+id/img_remove"
29-
android:layout_width="20dp"
30-
android:layout_height="20dp"
29+
android:layout_width="30dp"
30+
android:layout_height="30dp"
3131
android:contentDescription="@string/app_name"
32-
android:scaleType="center"
32+
android:scaleType="centerInside"
3333
android:src="@drawable/channel_edit_grid_item_del_icon"
34-
android:tint="@color/ph3" />
34+
android:tintMode="src_in"
35+
android:tint="@color/black" />
3536

3637
</RelativeLayout>

‎module-discover/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies {
3535
implementation rootProject.ext.dependencies.appcompat
3636
implementation rootProject.ext.dependencies.butterknife
3737
implementation rootProject.ext.dependencies.design
38+
implementation 'com.youth.banner:banner:1.4.10'
3839
implementation project(':module-basic')
3940
implementation project(':module-resource')
4041
implementation project(':module-widget')

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.rae.cnblogs.discover;
2+
3+
import android.arch.lifecycle.Lifecycle;
4+
import android.arch.lifecycle.LifecycleOwner;
5+
import android.support.annotation.NonNull;
6+
7+
import com.rae.cnblogs.basic.BasicPresenter;
8+
import com.rae.cnblogs.basic.IPresenterView;
9+
10+
public abstract class AntCodeBasicPresenter<V extends IPresenterView> extends BasicPresenter<V> implements LifecycleOwner {
11+
12+
public AntCodeBasicPresenter(V view) {
13+
super(view);
14+
}
15+
16+
@NonNull
17+
@Override
18+
public Lifecycle getLifecycle() {
19+
return getView().getLifecycle();
20+
}
21+
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.rae.cnblogs.discover;
2+
3+
import android.content.Context;
4+
import android.widget.ImageView;
5+
6+
import com.antcode.sdk.model.AntAdInfo;
7+
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
8+
import com.bumptech.glide.request.RequestOptions;
9+
import com.rae.cnblogs.basic.GlideApp;
10+
import com.youth.banner.loader.ImageLoader;
11+
12+
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
13+
14+
public class BannerImageLoader extends ImageLoader {
15+
@Override
16+
public void displayImage(Context context, Object path, ImageView imageView) {
17+
AntAdInfo adInfo = (AntAdInfo) path;
18+
String url = adInfo.getImageUrl();
19+
20+
GlideApp.with(context)
21+
.load(url)
22+
.transition(DrawableTransitionOptions.withCrossFade(300))
23+
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(45, 0)))
24+
.placeholder(R.drawable.default_placeholder_normal)
25+
.error(R.drawable.default_placeholder_error)
26+
.into(imageView);
27+
}
28+
29+
}

0 commit comments

Comments
 (0)