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

Commit 37a6703

Browse files
raedevraedev
committed
提交代码
1 parent 7eae2a4 commit 37a6703

File tree

15 files changed

+165
-8
lines changed

15 files changed

+165
-8
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/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
debug {
4242
minifyEnabled false
4343
debuggable true
44-
// applicationIdSuffix '.debug'
44+
applicationIdSuffix '.debug'
4545
signingConfig signingConfigs.release
4646
}
4747
release {
@@ -73,5 +73,6 @@ dependencies {
7373
implementation project(':module-home')
7474
implementation project(':module-moment')
7575
implementation project(':module-blog')
76+
implementation project(':module-discover')
7677
}
7778
}

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@
2020
import com.alibaba.android.arouter.facade.annotation.Route;
2121
import com.rae.cnblogs.basic.AppFragmentAdapter;
2222
import com.rae.cnblogs.basic.BasicActivity;
23+
import com.rae.cnblogs.basic.rx.AndroidObservable;
2324
import com.rae.cnblogs.blog.CnblogsService;
2425
import com.rae.cnblogs.dialog.DefaultDialogFragment;
2526
import com.rae.cnblogs.dialog.VersionDialogFragment;
2627
import com.rae.cnblogs.home.main.MainContract;
2728
import com.rae.cnblogs.home.main.MainPresenterImpl;
29+
import com.rae.cnblogs.sdk.ApiDefaultObserver;
30+
import com.rae.cnblogs.sdk.CnblogsApiFactory;
31+
import com.rae.cnblogs.sdk.UserProvider;
32+
import com.rae.cnblogs.sdk.bean.UserInfoBean;
2833
import com.rae.cnblogs.sdk.bean.VersionInfo;
2934
import com.rae.cnblogs.sdk.event.PostMomentEvent;
3035
import com.rae.cnblogs.widget.ITopScrollable;
@@ -68,6 +73,21 @@ protected void debugLogin() {
6873
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
6974
cookieManager.flush();
7075
}
76+
77+
// 获取用户信息
78+
AndroidObservable.create(CnblogsApiFactory.getInstance(this).getUserApi().getUserInfo("chenrui7"))
79+
.with(this)
80+
.subscribe(new ApiDefaultObserver<UserInfoBean>() {
81+
@Override
82+
protected void onError(String message) {
83+
84+
}
85+
86+
@Override
87+
protected void accept(UserInfoBean userInfo) {
88+
UserProvider.getInstance().setLoginUserInfo(userInfo);
89+
}
90+
});
7191
}
7292

7393
@Override
@@ -82,7 +102,7 @@ private void initTab() {
82102
// 初始化TAB
83103
addTab(mAdapter, R.string.tab_home, R.drawable.tab_home, AppRoute.newHomeFragment());
84104
addTab(mAdapter, R.string.tab_sns, R.drawable.tab_news, AppRoute.newMomentFragment());
85-
addTab(mAdapter, R.string.tab_discover, R.drawable.tab_library, AppRoute.newMomentFragment());
105+
addTab(mAdapter, R.string.tab_discover, R.drawable.tab_library, AppRoute.newDiscoverFragment());
86106
addTab(mAdapter, R.string.tab_mine, R.drawable.tab_mine, AppRoute.newMineFragment());
87107

88108
mViewPager.setOffscreenPageLimit(mAdapter.getCount());

‎module-discover/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎module-discover/build.gradle

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
if (IsModule.toBoolean()) {
2+
apply plugin: 'com.android.application'
3+
} else {
4+
apply plugin: 'com.android.library'
5+
}
6+
apply plugin: 'com.jakewharton.butterknife'
7+
8+
android {
9+
compileSdkVersion rootProject.ext.android.compileSdkVersion
10+
11+
defaultConfig {
12+
minSdkVersion rootProject.ext.android.minSdkVersion
13+
targetSdkVersion rootProject.ext.android.targetSdkVersion
14+
versionCode 1
15+
versionName "1.0"
16+
multiDexEnabled true
17+
javaCompileOptions {
18+
annotationProcessorOptions {
19+
arguments = [moduleName: project.getName()]
20+
}
21+
}
22+
}
23+
24+
buildTypes {
25+
release {
26+
minifyEnabled false
27+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
28+
}
29+
}
30+
31+
}
32+
33+
dependencies {
34+
annotationProcessor rootProject.ext.annotationProcessors.butterknife
35+
annotationProcessor rootProject.ext.annotationProcessors.arouter
36+
implementation rootProject.ext.dependencies.appcompat
37+
implementation rootProject.ext.dependencies.butterknife
38+
implementation rootProject.ext.dependencies.design
39+
implementation project(':module-basic')
40+
implementation project(':module-resource')
41+
implementation project(':module-widget')
42+
implementation project(':module-sdk')
43+
implementation project(':module-middleware')
44+
implementation project(':module-user')
45+
}

‎module-discover/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.rae.cnblogs.discover" />

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.rae.cnblogs.discover;
2+
3+
import com.alibaba.android.arouter.facade.annotation.Route;
4+
import com.rae.cnblogs.AppRoute;
5+
import com.rae.cnblogs.basic.BasicFragment;
6+
7+
/**
8+
* 发现
9+
* Created by ChenRui on 2018/6/13 10:22.
10+
*/
11+
@Route(path = AppRoute.PATH_FRAGMENT_DISCOVER)
12+
public class DiscoverFragment extends BasicFragment {
13+
14+
@Override
15+
protected int getLayoutId() {
16+
return R.layout.fm_discover;
17+
}
18+
19+
}

‎module-discover/src/main/res/layout/fm_discover.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical" android:layout_width="match_parent"
4+
android:layout_height="match_parent">
5+
6+
</LinearLayout>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<string name="app_name">发现模块</string>
3+
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public void onLoadFansCount(String fans, String follows) {
103103
*/
104104
@Override
105105
public void onLoadUserInfo(@NonNull UserInfoBean user) {
106-
mDisplayNameView.setVisibility(View.VISIBLE);
107106
mFansAndFollowLayout.setVisibility(View.VISIBLE);
108107
AppImageLoader.displayAvatar(user.getAvatar(), mAvatarView);
109108
mDisplayNameView.setText(user.getDisplayName());
@@ -118,6 +117,7 @@ public void onLoginExpired() {
118117
@Override
119118
public void onNotLogin() {
120119
// 没有登录的UI
120+
mDisplayNameView.setText(R.string.please_login);
121121
mAvatarView.setImageResource(R.drawable.boy);
122122
mFansAndFollowLayout.setVisibility(View.GONE);
123123
mFansCountView.setText("0");

‎module-home/src/main/java/com/rae/cnblogs/home/mine/MinePresenterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void loadUserInfo() {
9797
.subscribe(new ApiDefaultObserver<FriendsInfoBean>() {
9898
@Override
9999
protected void onError(String message) {
100-
getView().onLoadFansCount("--", "--");
100+
getView().onLoadFansCount("0", "0");
101101
}
102102

103103
@Override

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
android:layout_width="match_parent"
7373
android:layout_height="wrap_content"
7474
android:background="@color/white"
75-
android:paddingBottom="28dp"
75+
android:paddingBottom="12dp"
7676
android:paddingEnd="24dp"
7777
android:paddingStart="24dp"
78-
android:paddingTop="8dp"
79-
android:visibility="gone">
78+
android:paddingTop="12dp"
79+
android:visibility="visible">
8080

8181
<LinearLayout
8282
android:id="@+id/layout_account_follow"
@@ -133,6 +133,32 @@
133133

134134
</LinearLayout>
135135

136+
<LinearLayout
137+
android:layout_width="0dp"
138+
android:layout_height="wrap_content"
139+
android:layout_weight="1"
140+
android:gravity="center"
141+
android:orientation="vertical">
142+
143+
<TextView
144+
android:layout_width="wrap_content"
145+
android:layout_height="wrap_content"
146+
android:text="0"
147+
android:textColor="@color/black"
148+
android:textSize="@dimen/h1"
149+
android:textStyle="bold"/>
150+
151+
<TextView
152+
android:layout_width="wrap_content"
153+
android:layout_height="wrap_content"
154+
android:layout_marginTop="6dp"
155+
android:text="我的博客"
156+
android:textColor="@color/black"
157+
android:textSize="@dimen/h3"/>
158+
159+
160+
</LinearLayout>
161+
136162
</LinearLayout>
137163

138164

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ public final class AppRoute {
163163
*/
164164
public static final String PATH_FRAGMENT_MOMENT = "/moment/home/fragment";
165165

166+
/**
167+
* 发现
168+
*/
169+
public static final String PATH_FRAGMENT_DISCOVER = "/discover/fragment";
170+
166171

167172
/*朋友界面 - 来自关注*/
168173
private static final int ACTIVITY_FRIENDS_TYPE_FOLLOW = 2;
@@ -557,6 +562,13 @@ public static Fragment newMomentFragment() {
557562
return (Fragment) ARouter.getInstance().build(PATH_FRAGMENT_MOMENT).navigation();
558563
}
559564

565+
/**
566+
* 发现页
567+
*/
568+
public static Fragment newDiscoverFragment() {
569+
return (Fragment) ARouter.getInstance().build(PATH_FRAGMENT_DISCOVER).navigation();
570+
}
571+
560572
public static Fragment newHomeFragment() {
561573
return (Fragment) ARouter.getInstance().build(PATH_FRAGMENT_HOME).navigation();
562574
}

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ':module-sdk', ':module-resource', ':module-basic', ':module-widget', ':module-middleware', ':module-user'
1+
include ':module-sdk', ':module-resource', ':module-basic', ':module-widget', ':module-middleware', ':module-user', ':module-discover'
22
include ':module-home'
33
include ':module-moment'
44
include ':module-blog'

0 commit comments

Comments
 (0)