Skip to content

Commit 220344f

Browse files
lulululbjlulululbj
committedJun 17, 2019
update to retrofit 2.6.0
1 parent 399e23d commit 220344f

File tree

10 files changed

+51
-53
lines changed

10 files changed

+51
-53
lines changed
 

‎app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ android {
3030
dependencies {
3131
implementation fileTree(include: ['*.jar'], dir: 'libs')
3232
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
33-
implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
33+
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
3434
testImplementation 'junit:junit:4.12'
3535
androidTestImplementation 'androidx.test:runner:1.2.0'
3636
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
37-
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
38-
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
37+
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
38+
implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
3939
implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
4040
implementation 'com.google.android.material:material:1.1.0-alpha07'
4141
implementation 'de.hdodenhof:circleimageview:2.2.0'
42-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
43-
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
42+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
43+
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
4444
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.40'
4545
implementation 'com.youth.banner:banner:1.4.10'
4646
implementation 'com.github.bumptech.glide:glide:4.8.0'
@@ -51,7 +51,7 @@ dependencies {
5151
implementation 'com.hyman:flowlayout-lib:1.1.2'
5252
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
5353
// implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.0'
54-
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
54+
// implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
5555

5656
implementation 'de.psdev.licensesdialog:licensesdialog:1.9.0'
5757

‎app/src/main/java/luyao/wanandroid/model/api/BaseRetrofitClient.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package luyao.wanandroid.model.api
22

3-
import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
43
import luyao.wanandroid.BuildConfig
54
import okhttp3.OkHttpClient
65
import okhttp3.logging.HttpLoggingInterceptor
@@ -43,7 +42,7 @@ abstract class BaseRetrofitClient {
4342
.client(client)
4443
.addConverterFactory(GsonConverterFactory.create())
4544
// .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
46-
.addCallAdapterFactory(CoroutineCallAdapterFactory.invoke())
45+
// .addCallAdapterFactory(CoroutineCallAdapterFactory.invoke())
4746
.baseUrl(baseUrl)
4847
.build().create(serviceClass)
4948
}

‎app/src/main/java/luyao/wanandroid/model/api/WanService.kt

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package luyao.wanandroid.model.api
22

3-
import kotlinx.coroutines.Deferred
43
import luyao.base.WanResponse
54
import luyao.wanandroid.model.bean.*
65
import retrofit2.http.*
@@ -17,61 +16,61 @@ interface WanService {
1716
}
1817

1918
@GET("/article/list/{page}/json")
20-
fun getHomeArticles(@Path("page") page: Int): Deferred<WanResponse<ArticleList>>
19+
suspend fun getHomeArticles(@Path("page") page: Int): WanResponse<ArticleList>
2120

2221
@GET("/banner/json")
23-
fun getBanner(): Deferred<WanResponse<List<Banner>>>
22+
suspend fun getBanner(): WanResponse<List<Banner>>
2423

2524
@GET("/tree/json")
26-
fun getSystemType(): Deferred<WanResponse<List<SystemParent>>>
25+
suspend fun getSystemType(): WanResponse<List<SystemParent>>
2726

2827
@GET("/article/list/{page}/json")
29-
fun getSystemTypeDetail(@Path("page") page: Int, @Query("cid") cid: Int): Deferred<WanResponse<ArticleList>>
28+
suspend fun getSystemTypeDetail(@Path("page") page: Int, @Query("cid") cid: Int): WanResponse<ArticleList>
3029

3130
@GET("/navi/json")
32-
fun getNavigation(): Deferred<WanResponse<List<Navigation>>>
31+
suspend fun getNavigation(): WanResponse<List<Navigation>>
3332

3433
@GET("/project/tree/json")
35-
fun getProjectType(): Deferred<WanResponse<List<SystemParent>>>
34+
suspend fun getProjectType(): WanResponse<List<SystemParent>>
3635

3736
@GET("/wxarticle/chapters/json")
38-
fun getBlogType(): Deferred<WanResponse<List<SystemParent>>>
37+
suspend fun getBlogType(): WanResponse<List<SystemParent>>
3938

4039
@GET("/wxarticle/list/{id}/{page}/json")
41-
fun getBlogArticle(@Path("id") id: Int, @Path("page") page: Int): Deferred<WanResponse<ArticleList>>
40+
fun getBlogArticle(@Path("id") id: Int, @Path("page") page: Int): WanResponse<ArticleList>
4241

4342
@GET("/project/list/{page}/json")
44-
fun getProjectTypeDetail(@Path("page") page: Int, @Query("cid") cid: Int): Deferred<WanResponse<ArticleList>>
43+
suspend fun getProjectTypeDetail(@Path("page") page: Int, @Query("cid") cid: Int): WanResponse<ArticleList>
4544

4645
@GET("/article/listproject/{page}/json")
47-
fun getLastedProject(@Path("page") page: Int): Deferred<WanResponse<ArticleList>>
46+
suspend fun getLastedProject(@Path("page") page: Int): WanResponse<ArticleList>
4847

4948
@GET("/friend/json")
50-
fun getWebsites(): Deferred<WanResponse<List<Hot>>>
49+
suspend fun getWebsites(): WanResponse<List<Hot>>
5150

5251
@GET("/hotkey/json")
53-
fun getHot(): Deferred<WanResponse<List<Hot>>>
52+
suspend fun getHot(): WanResponse<List<Hot>>
5453

5554
@FormUrlEncoded
5655
@POST("/article/query/{page}/json")
57-
fun searchHot(@Path("page") page: Int, @Field("k") key: String): Deferred<WanResponse<ArticleList>>
56+
suspend fun searchHot(@Path("page") page: Int, @Field("k") key: String): WanResponse<ArticleList>
5857

5958
@FormUrlEncoded
6059
@POST("/user/login")
61-
fun login(@Field("username") userName: String, @Field("password") passWord: String): Deferred<WanResponse<User>>
60+
suspend fun login(@Field("username") userName: String, @Field("password") passWord: String): WanResponse<User>
6261

6362
@FormUrlEncoded
6463
@POST("/user/register")
65-
fun register(@Field("username") userName: String, @Field("password") passWord: String, @Field("repassword") rePassWord: String): Deferred<WanResponse<User>>
64+
suspend fun register(@Field("username") userName: String, @Field("password") passWord: String, @Field("repassword") rePassWord: String): WanResponse<User>
6665

6766
@GET("/lg/collect/list/{page}/json")
68-
fun getCollectArticles(@Path("page") page: Int): Deferred<WanResponse<ArticleList>>
67+
suspend fun getCollectArticles(@Path("page") page: Int): WanResponse<ArticleList>
6968

7069
@POST("/lg/collect/{id}/json")
71-
fun collectArticle(@Path("id") id: Int): Deferred<WanResponse<ArticleList>>
70+
suspend fun collectArticle(@Path("id") id: Int): WanResponse<ArticleList>
7271

7372
@POST("/lg/uncollect_originId/{id}/json")
74-
fun cancelCollectArticle(@Path("id") id: Int): Deferred<WanResponse<ArticleList>>
73+
suspend fun cancelCollectArticle(@Path("id") id: Int): WanResponse<ArticleList>
7574

7675

7776
}

‎app/src/main/java/luyao/wanandroid/model/repository/CollectRepository.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import luyao.wanandroid.model.bean.ArticleList
1212
class CollectRepository : BaseRepository(){
1313

1414
suspend fun getCollectArticles(page: Int): WanResponse<ArticleList> {
15-
return apiCall { WanRetrofitClient.service.getCollectArticles(page).await() }
15+
return apiCall { WanRetrofitClient.service.getCollectArticles(page) }
1616
}
1717

1818
suspend fun collectArticle(articleId: Int): WanResponse<ArticleList> {
19-
return apiCall { WanRetrofitClient.service.collectArticle(articleId).await() }
19+
return apiCall { WanRetrofitClient.service.collectArticle(articleId) }
2020
}
2121

2222
suspend fun unCollectArticle(articleId: Int): WanResponse<ArticleList> {
23-
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId).await() }
23+
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId) }
2424
}
2525
}

‎app/src/main/java/luyao/wanandroid/model/repository/HomeRepository.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import luyao.wanandroid.model.bean.Banner
1313
class HomeRepository : BaseRepository() {
1414

1515
suspend fun getBanners(): WanResponse<List<Banner>> {
16-
return apiCall { WanRetrofitClient.service.getBanner().await() }
16+
return apiCall { WanRetrofitClient.service.getBanner() }
1717
}
1818

1919
suspend fun getArticleList(page: Int): WanResponse<ArticleList> {
20-
return apiCall { WanRetrofitClient.service.getHomeArticles(page).await() }
20+
return apiCall { WanRetrofitClient.service.getHomeArticles(page) }
2121
}
2222

2323
suspend fun collectArticle(articleId: Int): WanResponse<ArticleList> {
24-
return apiCall { WanRetrofitClient.service.collectArticle(articleId).await() }
24+
return apiCall { WanRetrofitClient.service.collectArticle(articleId) }
2525
}
2626

2727
suspend fun unCollectArticle(articleId: Int): WanResponse<ArticleList> {
28-
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId).await() }
28+
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId) }
2929
}
3030
}

‎app/src/main/java/luyao/wanandroid/model/repository/LoginRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import luyao.wanandroid.model.bean.User
1212
class LoginRepository : BaseRepository() {
1313

1414
suspend fun login(userName: String, passWord: String): WanResponse<User> {
15-
return apiCall { WanRetrofitClient.service.login(userName, passWord).await() }
15+
return apiCall { WanRetrofitClient.service.login(userName, passWord) }
1616
}
1717

1818
suspend fun register(userName: String, passWord: String): WanResponse<User> {
19-
return apiCall { WanRetrofitClient.service.register(userName, passWord, passWord).await() }
19+
return apiCall { WanRetrofitClient.service.register(userName, passWord, passWord) }
2020
}
2121

2222
}

‎app/src/main/java/luyao/wanandroid/model/repository/NavigationRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class NavigationRepository : BaseRepository() {
1313

1414

1515
suspend fun getNavigation(): WanResponse<List<Navigation>> {
16-
return apiCall { WanRetrofitClient.service.getNavigation().await() }
16+
return apiCall { WanRetrofitClient.service.getNavigation() }
1717
}
1818
}

‎app/src/main/java/luyao/wanandroid/model/repository/ProjectRepository.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ import luyao.wanandroid.model.bean.SystemParent
1313
class ProjectRepository : BaseRepository() {
1414

1515
suspend fun getProjectTypeDetailList(page: Int, cid: Int): WanResponse<ArticleList> {
16-
return apiCall { WanRetrofitClient.service.getProjectTypeDetail(page, cid).await() }
16+
return apiCall { WanRetrofitClient.service.getProjectTypeDetail(page, cid) }
1717
}
1818

1919
suspend fun getProjectTypeList(): WanResponse<List<SystemParent>> {
20-
return apiCall { WanRetrofitClient.service.getProjectType().await() }
20+
return apiCall { WanRetrofitClient.service.getProjectType() }
2121
}
2222

2323
suspend fun collectArticle(articleId: Int): WanResponse<ArticleList> {
24-
return apiCall { WanRetrofitClient.service.collectArticle(articleId).await() }
24+
return apiCall { WanRetrofitClient.service.collectArticle(articleId) }
2525
}
2626

2727
suspend fun unCollectArticle(articleId: Int): WanResponse<ArticleList> {
28-
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId).await() }
28+
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId) }
2929
}
3030

3131
suspend fun getLastedProject(page: Int): WanResponse<ArticleList> {
32-
return apiCall { WanRetrofitClient.service.getLastedProject(page).await() }
32+
return apiCall { WanRetrofitClient.service.getLastedProject(page) }
3333
}
3434

3535
suspend fun getBlog(): WanResponse<List<SystemParent>> {
36-
return apiCall { WanRetrofitClient.service.getBlogType().await() }
36+
return apiCall { WanRetrofitClient.service.getBlogType() }
3737
}
3838

3939

‎app/src/main/java/luyao/wanandroid/model/repository/SearchRepository.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ import luyao.wanandroid.model.bean.Hot
1212
*/
1313
class SearchRepository : BaseRepository() {
1414
suspend fun searchHot(page: Int, key: String): WanResponse<ArticleList> {
15-
return apiCall { WanRetrofitClient.service.searchHot(page, key).await() }
15+
return apiCall { WanRetrofitClient.service.searchHot(page, key) }
1616
}
1717

1818
suspend fun getWebSites(): WanResponse<List<Hot>> {
19-
return apiCall { WanRetrofitClient.service.getWebsites().await() }
19+
return apiCall { WanRetrofitClient.service.getWebsites() }
2020
}
2121

2222
suspend fun getHotSearch(): WanResponse<List<Hot>> {
23-
return apiCall { WanRetrofitClient.service.getHot().await() }
23+
return apiCall { WanRetrofitClient.service.getHot() }
2424
}
2525

2626
suspend fun collectArticle(articleId: Int): WanResponse<ArticleList> {
27-
return apiCall { WanRetrofitClient.service.collectArticle(articleId).await() }
27+
return apiCall { WanRetrofitClient.service.collectArticle(articleId) }
2828
}
2929

3030
suspend fun unCollectArticle(articleId: Int): WanResponse<ArticleList> {
31-
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId).await() }
31+
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId) }
3232
}
3333
}

‎app/src/main/java/luyao/wanandroid/model/repository/SystemRepository.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ import luyao.wanandroid.model.bean.SystemParent
1313
class SystemRepository : BaseRepository() {
1414

1515
suspend fun getSystemTypeDetail(id: Int, page: Int): WanResponse<ArticleList> {
16-
return apiCall { WanRetrofitClient.service.getSystemTypeDetail(page, id).await() }
16+
return apiCall { WanRetrofitClient.service.getSystemTypeDetail(page, id) }
1717
}
1818

1919
suspend fun getSystemTypes(): WanResponse<List<SystemParent>> {
20-
return apiCall { WanRetrofitClient.service.getSystemType().await() }
20+
return apiCall { WanRetrofitClient.service.getSystemType() }
2121
}
2222

2323
suspend fun collectArticle(articleId: Int): WanResponse<ArticleList> {
24-
return apiCall { WanRetrofitClient.service.collectArticle(articleId).await() }
24+
return apiCall { WanRetrofitClient.service.collectArticle(articleId) }
2525
}
2626

2727
suspend fun unCollectArticle(articleId: Int): WanResponse<ArticleList> {
28-
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId).await() }
28+
return apiCall { WanRetrofitClient.service.cancelCollectArticle(articleId) }
2929
}
3030

3131
suspend fun getBlogArticle(id:Int,page:Int): WanResponse<ArticleList> {
32-
return apiCall { WanRetrofitClient.service.getBlogArticle(id, page).await() }
32+
return apiCall { WanRetrofitClient.service.getBlogArticle(id, page) }
3333
}
3434
}

0 commit comments

Comments
 (0)
Please sign in to comment.