Skip to content

Commit 1106295

Browse files
author
ergashev
committed
Merge remote-tracking branch 'origin/moduleHttp'
2 parents 06fe178 + c6b8e3a commit 1106295

File tree

34 files changed

+629
-24
lines changed

34 files changed

+629
-24
lines changed

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

.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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,15 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424

25-
compile 'com.android.support:appcompat-v7:25.0.0'
26-
compile 'com.android.support:design:25.0.0'
25+
compile 'com.android.support:appcompat-v7:25.1.0'
26+
compile 'com.android.support:design:25.1.0'
2727
testCompile 'junit:junit:4.12'
2828

29+
compile 'com.squareup.retrofit2:retrofit:2.0.2'
30+
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
31+
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
32+
compile 'com.google.code.gson:gson:2.6.2'
33+
2934
compile project(path: ':probetools')
35+
compile project(':probetools-http')
3036
}

app/src/main/java/com/ebr163/probeapp/MainActivity.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,22 @@
22

33
import android.os.Bundle;
44
import android.support.v7.app.AppCompatActivity;
5+
import android.view.View;
6+
7+
import com.ebr163.probeapp.service.http.HttpService;
58

69
public class MainActivity extends AppCompatActivity {
710

11+
private HttpService httpService;
12+
813
@Override
914
protected void onCreate(Bundle savedInstanceState) {
1015
super.onCreate(savedInstanceState);
1116
setContentView(R.layout.activity_main);
17+
httpService = new HttpService();
18+
}
19+
20+
public void onClick(View view) {
21+
httpService.getGifModels();
1222
}
1323
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.ebr163.probeapp.service.http;
2+
3+
import retrofit2.Call;
4+
import retrofit2.http.GET;
5+
import retrofit2.http.Path;
6+
import retrofit2.http.Query;
7+
8+
/**
9+
* Created by mac1 on 13.12.16.
10+
*/
11+
interface HttpApi {
12+
13+
@GET("/{section}/{page}?json=true")
14+
Call<Object> getGifModels(@Path("section") String section, @Path("page") int page,
15+
@Query("pageSize") int pageSize, @Query("types") String type);
16+
17+
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.ebr163.probeapp.service.http;
2+
3+
import android.util.Log;
4+
5+
import com.ebr163.probetools.okhttp3.ProbeHttpInterceptor;
6+
7+
import okhttp3.OkHttpClient;
8+
import retrofit2.Call;
9+
import retrofit2.Callback;
10+
import retrofit2.Response;
11+
import retrofit2.Retrofit;
12+
import retrofit2.converter.gson.GsonConverterFactory;
13+
14+
/**
15+
* Created by mac1 on 13.12.16.
16+
*/
17+
18+
public class HttpService {
19+
20+
private HttpApi httpApi;
21+
22+
public HttpService() {
23+
OkHttpClient.Builder builder = new OkHttpClient.Builder();
24+
builder.addInterceptor(new ProbeHttpInterceptor());
25+
OkHttpClient client = builder.build();
26+
27+
Retrofit retrofit = new Retrofit.Builder()
28+
.baseUrl("http://developerslife.ru")
29+
.addConverterFactory(GsonConverterFactory.create())
30+
.client(client)
31+
.build();
32+
33+
httpApi = retrofit.create(HttpApi.class);
34+
}
35+
36+
public void getGifModels() {
37+
Call<Object> result = httpApi.getGifModels("latest", 1, 10, "gif");
38+
result.enqueue(new Callback<Object>() {
39+
@Override
40+
public void onResponse(Call<Object> call, Response<Object> response) {
41+
Log.d("getGifModels", this.getClass().getSimpleName());
42+
}
43+
44+
@Override
45+
public void onFailure(Call<Object> call, Throwable t) {
46+
}
47+
});
48+
}
49+
}

app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<TextView
1212
android:id="@+id/ip"
13+
android:onClick="onClick"
1314
android:layout_width="wrap_content"
1415
android:layout_height="wrap_content"
1516
android:text="Hello World!" />

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:2.2.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

probetools-http/.gitignore

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

probetools-http/build.gradle

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.0"
6+
7+
defaultConfig {
8+
minSdkVersion 11
9+
targetSdkVersion 25
10+
versionCode 1
11+
versionName "1.0"
12+
13+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
15+
}
16+
buildTypes {
17+
release {
18+
minifyEnabled false
19+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20+
}
21+
}
22+
}
23+
24+
dependencies {
25+
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
27+
exclude group: 'com.android.support', module: 'support-annotations'
28+
})
29+
testCompile 'junit:junit:4.12'
30+
compile project(':probetools')
31+
compile 'com.squareup.okhttp3:okhttp:3.5.0'
32+
}

0 commit comments

Comments
 (0)