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 6995e20

Browse files
committed
添加专题
1 parent c51672a commit 6995e20

File tree

34 files changed

+735
-122
lines changed

34 files changed

+735
-122
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 & 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-
versionCode 10
11-
versionName "1.1.5"
10+
versionCode 12
11+
versionName "2.0.0"
1212
multiDexEnabled true
1313
ndk {
1414
// 兼容webView问题

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.umeng.socialize.UMShareAPI;
2121

2222
import butterknife.BindView;
23-
import butterknife.OnClick;
2423

2524
/**
2625
* 内容详情
@@ -86,17 +85,17 @@ private void initBlogFragment(ContentEntity entity) {
8685
}
8786

8887

89-
/**
90-
* 点击更多按钮弹出分享
91-
*/
92-
@OnClick(R2.id.img_action_bar_more)
93-
public void onActionMenuMoreClick() {
94-
BlogDetailFragment fragment = (BlogDetailFragment) getSupportFragmentManager().findFragmentByTag("detail");
95-
if (fragment != null) {
96-
// 传到Fragment处理
97-
fragment.onActionMenuMoreClick();
98-
}
99-
}
88+
// /**
89+
// * 点击更多按钮弹出分享
90+
// */
91+
// @OnClick(R2.id.img_action_bar_more)
92+
// public void onActionMenuMoreClick() {
93+
//// BlogDetailFragment fragment = (BlogDetailFragment) getSupportFragmentManager().findFragmentByTag("detail");
94+
//// if (fragment != null) {
95+
//// // 传到Fragment处理
96+
//// fragment.onActionMenuMoreClick();
97+
//// }
98+
// }
10099

101100
@Override
102101
protected void onActivityResult(int requestCode, int resultCode, Intent data) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public void run() {
240240
@Override
241241
public void onLoadDataFailed(String message) {
242242
UICompat.failed(getContext(), message);
243-
Log.w("rae","load content failed");
243+
Log.w("rae","load content failed");
244244
// 通知里面的Fragment处理
245245
// mContentWebViewFragment.onLoadDataFailed(message);
246246
// 加载错误直接加载原文链接
@@ -250,7 +250,7 @@ public void onLoadDataFailed(String message) {
250250
@Override
251251
public void onLoadDataSuccess(BlogBean data, String jsonData) {
252252
// 加载网页
253-
Log.i("rae","load content success");
253+
Log.i("rae","load content success");
254254
// 发送
255255
mContentWebViewFragment.onLoadDataSuccess(jsonData);
256256
}
@@ -397,6 +397,7 @@ public void onBackClick() {
397397
/**
398398
* 点击更多按钮弹出分享
399399
*/
400+
@OnClick(R2.id.ll_content_share)
400401
public void onActionMenuMoreClick() {
401402
String url = mContentEntity.getUrl();
402403
String title = mContentEntity.getTitle();

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.rae.cnblogs.blog.adapter.BlogHomeFragmentAdapter;
2424
import com.rae.cnblogs.blog.home.BlogHomeContract;
2525
import com.rae.cnblogs.blog.home.BlogHomePresenterImpl;
26-
import com.rae.cnblogs.sdk.UserProvider;
2726
import com.rae.cnblogs.sdk.bean.CategoryBean;
2827
import com.rae.cnblogs.widget.ITopScrollable;
2928

@@ -232,10 +231,6 @@ private void clearFragments() {
232231

233232
@OnClick(R2.id.fl_search)
234233
public void onSearchClick() {
235-
if (UserProvider.getInstance().isLogin()) {
236-
AppRoute.routeToSearch(getContext());
237-
} else {
238-
AppRoute.routeToLogin(getContext());
239-
}
234+
AppRoute.routeToSearch(getContext());
240235
}
241236
}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
android:layout_width="match_parent"
1616
android:layout_height="match_parent" />
1717

18-
<RelativeLayout
19-
android:id="@+id/ll_toolbar"
20-
android:layout_width="match_parent"
21-
android:layout_height="wrap_content">
18+
<!--<RelativeLayout-->
19+
<!--android:id="@+id/ll_toolbar"-->
20+
<!--android:layout_width="match_parent"-->
21+
<!--android:layout_height="wrap_content">-->
2222

2323

24-
<com.rae.cnblogs.widget.RaeSkinImageView
25-
android:id="@+id/img_action_bar_more"
26-
android:layout_width="wrap_content"
27-
android:layout_height="wrap_content"
28-
android:layout_alignParentEnd="true"
29-
android:layout_margin="10dp"
30-
android:scaleType="center"
31-
android:src="@drawable/ic_action_bar_more" />
24+
<!--<com.rae.cnblogs.widget.RaeSkinImageView-->
25+
<!--android:id="@+id/img_action_bar_more"-->
26+
<!--android:layout_width="wrap_content"-->
27+
<!--android:layout_height="wrap_content"-->
28+
<!--android:layout_alignParentEnd="true"-->
29+
<!--android:layout_margin="10dp"-->
30+
<!--android:scaleType="center"-->
31+
<!--android:src="@drawable/ic_action_bar_more" />-->
3232

33-
</RelativeLayout>
33+
<!--</RelativeLayout>-->
3434

3535
<android.support.constraint.ConstraintLayout
3636
android:id="@+id/pb_loading"

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
android:id="@+id/tv_edit_comment"
3232
android:layout_width="160dp"
3333
android:layout_height="30dp"
34-
android:layout_marginEnd="12dp"
3534
android:layout_marginStart="12dp"
35+
android:layout_marginEnd="12dp"
3636
android:background="@drawable/bg_write_comment"
3737
android:gravity="start|center"
3838
android:paddingLeft="21dp"
@@ -116,6 +116,21 @@
116116

117117
</LinearLayout>
118118

119+
<LinearLayout
120+
android:id="@+id/ll_content_share"
121+
android:layout_width="0dp"
122+
android:layout_height="32dp"
123+
android:layout_weight="1"
124+
android:gravity="center">
125+
126+
<com.rae.cnblogs.widget.ImageLoadingView
127+
android:layout_width="32dp"
128+
android:layout_height="32dp"
129+
android:scaleType="center"
130+
android:src="@drawable/icon_share_small" />
131+
132+
</LinearLayout>
133+
119134

120135
</LinearLayout>
121136

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@
8282
android:layout_height="wrap_content"
8383
android:layout_weight="1"
8484
app:tabBackground="@android:color/transparent"
85-
app:tabIndicatorColor="@color/tabIndicatorColor"
86-
app:tabIndicatorHeight="2dp"
85+
app:tabIndicatorColor="@color/black"
86+
app:tabIndicatorHeight="4dp"
87+
app:tabIndicatorRadius="2dp"
8788
app:tabIndicatorWidth="14dp"
8889
app:tabMinWidth="52dp"
8990
app:tabMode="scrollable"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<activity android:name=".ui.BlogQuestionActivity" />
2828
<activity
2929
android:name=".ui.BlogQuestionDetailActivity"
30-
android:label="@string/label_question_detail" />
30+
android:label="@string/label_question_detail"/>
31+
<activity android:name=".ui.AntColumnActivity" />
32+
<activity android:name=".ui.AntColumnDetailActivity" />
3133
</application>
3234
</manifest>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,9 @@ public void showLoading() {
7070
mPlaceholderView.loading();
7171
}
7272

73+
public void showEmpty(String message) {
74+
if (mData != null) mData.clear();
75+
mPlaceholderView.empty(message);
76+
notifyDataSetChanged();
77+
}
7378
}

0 commit comments

Comments
(0)

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