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

Commit 713680d

Browse files
raedevraedev
committed
update gradle
1 parent f643722 commit 713680d

File tree

14 files changed

+65
-57
lines changed

14 files changed

+65
-57
lines changed

‎.idea/modules.xml

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ protected void onCreate(Bundle savedInstanceState) {
7777

7878
// 启动服务
7979
startService(new Intent(this, CnblogsService.class));
80-
// if (BuildConfig.DEBUG) {
81-
// debugLogin();
82-
// }
80+
if (BuildConfig.DEBUG) {
81+
debugLogin();
82+
}
8383
}
8484

8585

@@ -88,8 +88,8 @@ protected void onCreate(Bundle savedInstanceState) {
8888
*/
8989
protected void debugLogin() {
9090
String url = "cnblogs.com";
91-
String cookie = "4F523B96A57E7D0C1165E5D565C89055A98E0CBF3C432EC7006BC69E47AD5CCEFD976EC972F44EB25C5AD9398A8B9D42371694EDE1C819943A1F57137A18D43E59B0184B954F96B38D4C76577E00B3B5F55ED4A8";
92-
String netCoreCookie = "CfDJ8KlpyPucjmhMuZTmH8oiYTNKRTDax9L0rk-chKipr_j1ObB5W50Fzow96wDJSdsvW23yuwUWKk6ei0xEuESYMSfIBCEnt08OIwCzmXpjfKLSo4T82c9KyIHsyaSElcTQDs2eJKiZQTcfhYpxCXZ2nHV2IM1wxvojMAN_-kt5HPYxahwdeXsAxcBIcZJWCB6ng_bbnUIPQc9FIKdJZwx1GtzflDi4L4AhsDdWgS_H-dwkj97fzkdDfo-UYJmPUtKbW6tmW8dSHyF4p1_xdPaZxaI9OBYDT9ZTiDVTrmPQM_1-";
91+
String cookie = "5FE90D097CFB91482ACE15CCFD172395D08CD682B8C8C0B525E5D4DCCC8BE15F0B0352B53E79EB268B14E8CF84F14C5217B244B7E8C8DE7C55BCC4053AFEC35EB6F0BEF467E9DD91646C4D28EBEAD3849FEBF091";
92+
String netCoreCookie = "CfDJ8KlpyPucjmhMuZTmH8oiYTPAP02sPZIJTcqQlPvrtRt3ypNxuiLoZhRKsCikysmkCgLvhs3z8gmn-xxTwC8mguAg3zMcZVsMfSAVhq1OiInLG5JT8cDGjOsA5LT4ZlOju7SWXfuivJKlxVkkudJzk1EnjxbNJiilSAi-MmRwjqLyhwcCTAgUlHPljHSTRtAODNAiuXzLKTmSo6plpbWMyHU9PojakONa8JBhI84CtOgUYEqsYjQ9F01QbfG8IBkwkvwnMtKR7wzvPQj7VaFEyUrTlur_r_-JBCe_EkGV6HmX";
9393
CookieManager cookieManager = CookieManager.getInstance();
9494
cookieManager.removeAllCookie();
9595
cookieManager.setCookie(url, ".CNBlogsCookie=" + cookie + "; domain=.cnblogs.com; path=/; HttpOnly");
@@ -127,7 +127,7 @@ private void initTab() {
127127
// 初始化TAB
128128
addTab(mAdapter, R.string.tab_home, R.drawable.tab_home, AppRoute.newHomeFragment());
129129
addTab(mAdapter, R.string.tab_sns, R.drawable.tab_news, AppRoute.newMomentFragment());
130-
// addTab(mAdapter, R.string.tab_discover, R.drawable.tab_library, AppRoute.newDiscoverFragment());
130+
addTab(mAdapter, R.string.tab_discover, R.drawable.tab_library, AppRoute.newDiscoverFragment());
131131
addTab(mAdapter, R.string.tab_mine, R.drawable.tab_mine, AppRoute.newMineFragment());
132132

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

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:3.2.1'
15+
classpath 'com.android.tools.build:gradle:3.3.0'
1616
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
1717
// 热更新插件
1818
// classpath "com.tencent.bugly:tinker-support:1.0.8"

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri May 11 09:11:18 CST 2018
1+
#Wed Jan 16 15:28:10 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public int getItemPosition(@NonNull Object object) {
4040
@Override
4141
public Fragment getItem(int position) {
4242
CategoryBean m = mDataList.get(position);
43-
if (TextUtils.equals("news", m.getType()))
44-
return NewsListFragment.newInstance(m);
45-
if (TextUtils.equals("kb", m.getType()))
46-
return KbListFragment.newInstance(m);
43+
// if (TextUtils.equals("news", m.getType()))
44+
// return NewsListFragment.newInstance(m);
45+
// if (TextUtils.equals("SiteHome", m.getType()))
46+
// return KbListFragment.newInstance(m);
4747
return MultipleTypeBlogListFragment.newInstance(m);
4848
}
4949

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.rae.cnblogs.blog.detail;
22

33
import android.support.annotation.Nullable;
4+
import android.util.Log;
45

56
import com.rae.cnblogs.basic.ContentEntity;
67
import com.rae.cnblogs.sdk.CnblogsApiFactory;
@@ -37,6 +38,7 @@ protected Observable<String> onFetchContentSource(Observable<String> local, Obse
3738
@Override
3839
public String apply(String content) {
3940
updateContent(content);
41+
Log.i("rae","读取原文地址内容！");
4042
return content;
4143
}
4244
});

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.support.annotation.NonNull;
77
import android.support.annotation.Nullable;
88
import android.text.TextUtils;
9+
import android.util.Log;
910

1011
import com.rae.cnblogs.ContentEntityConverter;
1112
import com.rae.cnblogs.basic.BasicPresenter;
@@ -342,6 +343,7 @@ public String apply(String id) {
342343
String type = getView().getContentEntity().getType();
343344
String content = DbFactory.getInstance().getBlog().getBlogContent(type, id);
344345
if (TextUtils.isEmpty(content)) return null;
346+
Log.i("rae","读取本地内容！");
345347
return content;
346348
}
347349
})
@@ -359,6 +361,7 @@ public String apply(String content) {
359361
if (TextUtils.isEmpty(content))
360362
return null;
361363
updateContent(content); // 博客内容写入本地数据库
364+
Log.i("rae","读取网络内容！");
362365
return content;
363366
}
364367

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.support.annotation.Nullable;
99
import android.support.v4.app.FragmentActivity;
1010
import android.text.TextUtils;
11+
import android.util.Log;
1112
import android.view.View;
1213
import android.widget.TextView;
1314

@@ -239,14 +240,17 @@ public void run() {
239240
@Override
240241
public void onLoadDataFailed(String message) {
241242
UICompat.failed(getContext(), message);
243+
Log.w("rae","load content failed");
242244
// 通知里面的Fragment处理
243245
mContentWebViewFragment.onLoadDataFailed(message);
244246
}
245247

246248
@Override
247249
public void onLoadDataSuccess(BlogBean data, String jsonData) {
248250
// 加载网页
249-
mContentWebViewFragment.loadWebData(jsonData);
251+
Log.i("rae","load content success");
252+
// 发送
253+
mContentWebViewFragment.onLoadDataSuccess(jsonData);
250254
}
251255

252256
@Override

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.os.Bundle;
55
import android.support.annotation.Nullable;
6+
import android.text.TextUtils;
67
import android.util.Log;
78
import android.util.TypedValue;
89
import android.view.View;
@@ -69,6 +70,7 @@ public void onCreate(Bundle savedInstanceState) {
6970
super.onCreate(savedInstanceState);
7071
// 初始化属性操作
7172
mConfig = CnblogAppConfig.getInstance(getContext());
73+
7274
}
7375

7476
@Override
@@ -89,6 +91,12 @@ public void onActivityCreated(Bundle savedInstanceState) {
8991
if (getParentFragment() instanceof IBlogDetailFragment) {
9092
mBlogDetailFragment = (IBlogDetailFragment) getParentFragment();
9193
}
94+
95+
// 加载数据
96+
Bundle arguments = getArguments();
97+
if (arguments != null && !TextUtils.isEmpty(arguments.getString("data"))) {
98+
loadWebData(arguments.getString("data"));
99+
}
92100
}
93101

94102
/**
@@ -156,6 +164,8 @@ private void initFontSize() {
156164
*/
157165
public void loadWebData(String webData) {
158166

167+
Log.i("rae", "加载网页内容拉！");
168+
159169
mPlaceholderView.dismiss();
160170

161171
try {
@@ -221,4 +231,13 @@ public void onFontSizeChanged() {
221231
initFontSize();
222232
reload();
223233
}
234+
235+
/**
236+
* 加载博文内容
237+
*
238+
* @param jsonData 数据
239+
*/
240+
public void onLoadDataSuccess(String jsonData) {
241+
this.loadWebData(jsonData);
242+
}
224243
}

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -88,34 +88,8 @@ public void reorganizeData(List<CategoryBean> data) {
8888
hasRecommented = true;
8989
item.setOrderNo(-3);
9090
}
91-
if ("新闻".equals(name)) {
92-
hasNews = true;
93-
item.setOrderNo(-2);
94-
}
95-
if ("知识库".equals(name)) {
96-
hasKb = true;
97-
item.setOrderNo(-1);
98-
}
9991
}
10092

101-
if (!hasKb) {
102-
CategoryBean kb = new CategoryBean();
103-
kb.setCategoryId("0");
104-
kb.setParentId("0");
105-
kb.setName("知识库");
106-
kb.setType("kb");
107-
kb.setOrderNo(-1);
108-
data.add(kb);
109-
}
110-
if (!hasNews) {
111-
CategoryBean news = new CategoryBean();
112-
news.setCategoryId("0");
113-
news.setParentId("0");
114-
news.setName("新闻");
115-
news.setType("news");
116-
news.setOrderNo(-2);
117-
data.add(news);
118-
}
11993
if (!hasRecommented) {
12094
CategoryBean recommend = new CategoryBean();
12195
recommend.setCategoryId("-2");

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
android:id="@+id/tv_rank"
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
13-
android:layout_marginEnd="12dp"
1413
android:layout_marginStart="14dp"
14+
android:layout_marginEnd="12dp"
1515
android:background="@drawable/bg_hot_search_flag_one"
16-
android:paddingBottom="2dp"
17-
android:paddingEnd="7dp"
1816
android:paddingStart="7dp"
1917
android:paddingTop="2dp"
18+
android:paddingEnd="7dp"
19+
android:paddingBottom="2dp"
2020
android:text="1"
2121
android:textColor="#FFFFFFFF"
2222
android:textSize="14sp" />
@@ -25,9 +25,11 @@
2525
android:id="@+id/tv_title"
2626
android:layout_width="wrap_content"
2727
android:layout_height="wrap_content"
28+
android:ellipsize="end"
2829
android:gravity="center"
29-
android:paddingBottom="10dp"
3030
android:paddingTop="10dp"
31+
android:paddingBottom="10dp"
32+
android:singleLine="true"
3133
android:text="@string/search"
3234
android:textColor="@color/search_item_color"
3335
android:textSize="14sp" />

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
android:layout_height="wrap_content"
66
android:layout_margin="4dp"
77
android:background="@drawable/bg_follow_search"
8+
android:ellipsize="end"
89
android:gravity="center"
9-
android:paddingBottom="10dp"
10-
android:paddingEnd="8dp"
1110
android:paddingStart="8dp"
1211
android:paddingTop="10dp"
12+
android:paddingEnd="8dp"
13+
android:paddingBottom="10dp"
14+
android:singleLine="true"
1315
android:textColor="#FF555555"
1416
android:textSize="14sp" />

‎module-sdk/build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,20 @@ dependencies {
3737

3838
implementation rootProject.ext.dependencies.annotations
3939
implementation rootProject.ext.dependencies.appcompat
40-
implementation rootProject.ext.dependencies.raeOkhttpExt
41-
implementation rootProject.ext.dependencies.retrofit
40+
// implementation rootProject.ext.dependencies.raeOkhttpExt
41+
// implementation rootProject.ext.dependencies.retrofit
4242
implementation rootProject.ext.dependencies.greendao
4343

44-
api rootProject.ext.dependencies.rxjava
45-
api rootProject.ext.dependencies.rxandroid
44+
45+
api 'com.antcode:sdk:1.0.0'
46+
// api rootProject.ext.dependencies.rxjava
47+
// api rootProject.ext.dependencies.rxandroid
4648
api rootProject.ext.dependencies.jsoup
47-
api rootProject.ext.dependencies.retrofitRxAdapter
48-
api rootProject.ext.dependencies.gson
49+
// api rootProject.ext.dependencies.retrofitRxAdapter
50+
// api rootProject.ext.dependencies.gson
4951
api rootProject.ext.dependencies.bugly
50-
api(rootProject.ext.dependencies.raeSession, {
51-
exclude group: 'com.android.support'
52-
})
52+
// api(rootProject.ext.dependencies.raeSession, {
53+
// exclude group: 'com.android.support'
54+
// })
5355
}
5456

‎module-sdk/src/main/java/com/rae/cnblogs/sdk/api/IBlogApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public interface IBlogApi {
147147
* @param id 知识库ID
148148
*/
149149
@PUT(ApiUrls.API_KB_LIKE)
150-
@FormUrlEncoded
150+
// @FormUrlEncoded
151151
@Headers({JsonBody.CONTENT_TYPE, JsonBody.XHR})
152152
Observable<Empty> likeKb(@Query("id") String id);
153153

0 commit comments

Comments
 (0)