Skip to content

Commit 4d41a99

Browse files
committed
add
add
1 parent 19d7032 commit 4d41a99

File tree

233 files changed

+250
-4882
lines changed

Some content is hidden

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

233 files changed

+250
-4882
lines changed

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

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

.idea/vcs.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.

GankIO.apk

5.14 MB
Binary file not shown.

app/build.gradle

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,40 @@ def releaseTime() {
55
}
66

77
android {
8-
compileSdkVersion 23
9-
buildToolsVersion "23.0.3"
8+
compileSdkVersion 24
9+
buildToolsVersion "24.0.2"
1010

1111
defaultConfig {
1212
applicationId "com.walle.gankio"
1313
minSdkVersion 14
14-
targetSdkVersion 23
15-
versionCode 1
16-
versionName "1.0"
14+
targetSdkVersion 24
15+
versionCode 2
16+
versionName "1.01"
17+
jackOptions{
18+
enabled true
19+
}
1720

1821
}
1922

23+
compileOptions{
24+
incremental true
25+
}
2026

2127
signingConfigs {
2228
release {
23-
storeFile file("yqh.jks")
24-
storePassword "yqh19920113"
25-
keyAlias "yqh"
26-
keyPassword "yqh19920113"
29+
2730
}
2831
}
2932

3033
buildTypes {
3134
release {
3235
// 不显示Log
33-
buildConfigField "boolean", "LOG_DEBUG", "false"
36+
// buildConfigField "boolean", "LOG_DEBUG", "false"
3437

3538
minifyEnabled false
3639
zipAlignEnabled true
3740
// 移除无用的resource文件
38-
// shrinkResources true
41+
shrinkResources true
3942
proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
4043
signingConfig signingConfigs.release
4144

@@ -60,7 +63,7 @@ android {
6063
// 友盟多渠道打包
6164
productFlavors {
6265
wandoujia {}
63-
_360 {}
66+
// _360 {}
6467
/* baidu {}
6568
xiaomi {}
6669
tencent {}
@@ -94,18 +97,18 @@ dependencies {
9497

9598
compile 'org.greenrobot:greendao:3.1.0'
9699

97-
compile 'com.android.support:cardview-v7:23.4.0'
98-
compile 'com.android.support:appcompat-v7:23.4.0'
100+
compile 'com.android.support:cardview-v7:24.0.0'
101+
compile 'com.android.support:appcompat-v7:24.0.0'
99102
compile 'com.squareup.retrofit2:retrofit:2.0.2'
100103
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
101104
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
102105
compile 'io.reactivex:rxandroid:1.2.0'
103106
compile 'io.reactivex:rxjava:1.1.5'
104107
compile 'com.google.code.gson:gson:2.6.2'
105-
compile 'com.android.support:support-v4:23.4.0'
106-
compile 'com.android.support:recyclerview-v7:23.4.0'
108+
compile 'com.android.support:support-v4:24.0.0'
109+
compile 'com.android.support:recyclerview-v7:24.0.0'
107110
compile 'com.github.bumptech.glide:glide:3.5.2'
108-
compile 'com.android.support:design:23.4.0'
111+
compile 'com.android.support:design:24.0.0'
109112

110113
//umeng
111114
compile 'com.umeng.analytics:analytics:latest.integration'

app/src/main/java/com/walle/gankio/App.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,10 @@
66
import com.umeng.analytics.MobclickAgent;
77
import com.walle.gankio.data.local.Preferences;
88
import com.walle.gankio.data.remote.NetWorkManager;
9-
import com.walle.gankio.utils.LogUtil;
109

11-
import java.io.Serializable;
12-
import java.net.SocketTimeoutException;
13-
import java.net.URI;
14-
import java.nio.ByteBuffer;
15-
import java.nio.channels.AsynchronousCloseException;
16-
import java.util.ArrayList;
1710
import java.util.HashMap;
1811
import java.util.Map;
1912
import java.util.Set;
20-
import java.util.TreeMap;
21-
22-
import rx.Observable;
23-
import rx.Subscriber;
24-
import rx.Subscription;
25-
import rx.android.schedulers.AndroidSchedulers;
26-
import rx.functions.Func1;
27-
import rx.functions.Func2;
28-
import rx.schedulers.Schedulers;
2913

3014
/**
3115
* Created by yqh on 2016/8/12
@@ -44,7 +28,7 @@ public void onCreate() {
4428
}
4529

4630
private void initTitle() {
47-
Preferences sp = Preferences.build(getApplicationContext(), Config.TITLE_SP);
31+
Preferences sp = Preferences.build(getApplicationContext(), Constant.TITLE_SP);
4832
Map<String, Boolean> titleConf =new HashMap<>();
4933
titleConf.put("all",true);
5034
titleConf.put("Android",true);

app/src/main/java/com/walle/gankio/Config.java renamed to app/src/main/java/com/walle/gankio/Constant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
/**
44
* Created by void on 16/8/31.
55
*/
6-
public class Config {
6+
public class Constant {
77
public static final String TITLE_SP="title_conf";
88
}

app/src/main/java/com/walle/gankio/adapter/BaseAdapterWithLoadmore.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.walle.gankio.R;
1313
import com.walle.gankio.data.remote.model.SearchResult;
1414
import com.walle.gankio.listener.OnLoadMoreListener;
15+
import com.walle.gankio.utils.LogUtil;
1516

1617
import java.util.List;
1718

@@ -57,6 +58,7 @@ public int getItemViewType(int position) {
5758

5859
@Override
5960
public H onCreateViewHolder(ViewGroup parent, int viewType) {
61+
LogUtil.d(TAG,"onCreateViewHolder");
6062
View view = null;
6163
if (VIEW_LOADMORE == viewType || viewType==VIEW_NONE) {
6264
view = LayoutInflater.from(parent.getContext())

0 commit comments

Comments
 (0)