添加服务器返回数据统一格式转换

Author: Karl

app/src/main/java/com/xiasuhuei321/gank_kotlin/MainActivity.kt

@@ -2,8 +2,12 @@ package com.xiasuhuei321.gank_kotlin
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.util.Log
 import android.view.Window
 import android.view.WindowManager
+import com.xiasuhuei321.gank_kotlin.datasource.DataSource
+import com.xiasuhuei321.gank_kotlin.datasource.DataSourceImpl
+import com.xiasuhuei321.gank_kotlin.datasource.bean.PostType
 import com.xiasuhuei321.gank_kotlin.extension.shortToast
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -18,10 +22,22 @@ class MainActivity : AppCompatActivity() {
         weatherIv.setOnClickListener {
             shortToast("weather icon be clicked")
         }
+
+
     }
 
     override fun onResume() {
         super.onResume()
+        DataSourceImpl
+                .getData(PostType.ANDROID)
+                .subscribe(
+                        {
+                            list->Log.e("RPG","list ---> " + list)
+                        },
+                        {
+                            e->e.printStackTrace()
+                        }
+                )
     }
 
     override fun onDestroy() {

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/DataSource.kt

@@ -15,7 +15,7 @@ interface DataSource {
     fun getData(type: String): Observable<List<GankData>>
 
     // 获取服务器数据，每页数据默认为10, 页码默认为1
-    fun getRemoteData(type: String, pageIndex: Int = 1, count: Int = 10): Observable<List<GankData>>
+    fun getRemoteData(type: String, count: Int,pageIndex: Int): Observable<List<GankData>>
 
     // 清除本地指定缓存
     fun clearData(type: String)

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/DataSourceImpl.kt

@@ -1,12 +1,18 @@
 package com.xiasuhuei321.gank_kotlin.datasource
 
+import android.util.Log
+import com.xiasuhuei321.gank_kotlin.app
 import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+import com.xiasuhuei321.gank_kotlin.datasource.bean.JsonResult
 import com.xiasuhuei321.gank_kotlin.datasource.bean.Weather
 import com.xiasuhuei321.gank_kotlin.datasource.local.LocalDataSource
 import com.xiasuhuei321.gank_kotlin.datasource.local.LocalDataSourceImpl
 import com.xiasuhuei321.gank_kotlin.datasource.remote.RemoteDataSource
 import com.xiasuhuei321.gank_kotlin.datasource.remote.RemoteDataSourceImpl
+import com.xiasuhuei321.gank_kotlin.extension.handleResult
+import com.xiasuhuei321.gank_kotlin.extension.io_main
 import io.reactivex.Observable
+import io.reactivex.functions.Function
 
 /**
  * Created by coderFan on 2017/8/11.
@@ -32,11 +38,14 @@ object DataSourceImpl : DataSource {
     }
 
     override fun getData(type: String): Observable<List<GankData>> {
-        TODO("获取数据，进行网络请求,加载失败再从本地读取缓存")
+        return getRemoteData(type,10,1)
     }
 
-    override fun getRemoteData(type: String, pageIndex: Int, count: Int): Observable<List<GankData>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun getRemoteData(type: String, count: Int, pageIndex: Int): Observable<List<GankData>> {
+        return remote
+                .getRemoteData(type,10,1)
+                .compose(handleResult())
+                .io_main()
     }
 
     /**

app/src/main/java/com/xiasuhuei321/gank_kotlin/extension/RxExtension.kt

@@ -1,7 +1,9 @@
 package com.xiasuhuei321.gank_kotlin.extension
 
+import com.xiasuhuei321.gank_kotlin.datasource.bean.JsonResult
 import io.reactivex.Flowable
 import io.reactivex.Observable
+import io.reactivex.ObservableTransformer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 
@@ -20,3 +22,16 @@ fun <T> Observable<T>.io_main(): Observable<T> {
 fun <T> Flowable<T>.io_main(): Flowable<T> {
     return subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
 }
+
+fun <T>  handleResult(): ObservableTransformer<JsonResult<T>, T> {
+    return ObservableTransformer<JsonResult<T>, T>() { observable ->
+        observable.flatMap { jsonResult ->
+            when (jsonResult.error) {
+                false -> Observable.just(jsonResult.results)
+                true -> Observable.error(Exception("数据加载失败"))
+            }
+        }
+    }
+}
+
+

app/src/main/java/com/xiasuhuei321/gank_kotlin/weather/WeatherPresenter.kt

@@ -11,7 +11,7 @@ import com.xiasuhuei321.gank_kotlin.datasource.bean.Weather
  */
 class WeatherPresenter(override var v: BaseContract.View?) : WeatherContract.Presenter{
     override fun getWeather(): Weather {
-        DataSourceImpl
+//        DataSourceImpl
         return Weather()
     }