删除无用代码

Author: Karl

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

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Window
 import android.view.WindowManager
+import com.xiasuhuei321.gank_kotlin.datasource.DataSource
 import com.xiasuhuei321.gank_kotlin.extension.shortToast
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -14,7 +15,6 @@ class MainActivity : AppCompatActivity() {
         window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_main)
-
         weatherIv.setOnClickListener {
             shortToast("weather icon be clicked")
         }

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

@@ -1,10 +1,32 @@
 package com.xiasuhuei321.gank_kotlin.datasource
 
+import com.xiasuhuei321.gank_kotlin.datasource.bean.PostType
+import com.xiasuhuei321.gank_kotlin.datasource.local.LocalDataImpl
+import com.xiasuhuei321.gank_kotlin.datasource.remote.RemoteDataImpl
+import com.xiasuhuei321.gank_kotlin.extension.LogUtil
+import com.xiasuhuei321.gank_kotlin.extension.io_main
+
 /**
- * Created by Karl on 2017/9/11 0011.
- *
+ * Created by xiasuhuei321 on 2017/8/11.
+ * author:luo
+ * e-mail:[email protected]
  */
+ object DataSource {
+    val TAG: String = "DataSource"
+//    val server = RemoteDataImpl()
+    val local = LocalDataImpl()
+
+    fun getRemoteData(){
+        RemoteDataImpl.INSTANCE
+                .getRemoteData(PostType.ANDROID,10,1)
+                .io_main()
+                .subscribe({
+                    jsonResult-> LogUtil.d(jsonResult.toString())
+                },{
+                    e-> e.printStackTrace()
+                })
+
+    }
 
-interface DataSource{
 
-}
+}

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

@@ -22,7 +22,7 @@ interface ApiStore {
                 @Path("count") count: String,
                 @Path("pageIndex") pageIndex: String): Observable<TechBean>
 
-    @GET(API.DATA+"/{type}/{count}/{pageIndex}")
+    @GET("data/{type}/{count}/{pageIndex}")
     fun getCategoricalData(
             @Path("type") type:String,
             @Path("count") count: String,

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/net/ApiStore.kt

@@ -14,31 +14,22 @@ import io.reactivex.Observable
  * author:luo
  * e-mail:[email protected]
  */
-class RemoteDataImpl : RemoteDataSource {
+class RemoteDataImpl private constructor(): RemoteDataSource {
 
     private var apiStore: ApiStore? = null
 
     init {
-        if (apiStore==null) ReHelper.getInstance().create(ApiStore::class.java)
+        if (apiStore==null) apiStore =  ReHelper.getInstance().create(ApiStore::class.java)
     }
 
     companion object {
-       val INSTANCE: RemoteDataImpl by lazy { this.INSTANCE }
+        val INSTANCE:RemoteDataImpl by lazy { this.INSTANCE }
     }
 
     override fun getRemoteData(type: String, count: Int, pageIndex: Int): Observable<JsonResult<List<GankData>>> {
-        return apiStore!!.getCategoricalData(type,count.toString(),pageIndex.toString()).io_main()
+        return apiStore!!.getCategoricalData(type,count.toString(),pageIndex.toString())
     }
 
-    override fun getRemoteTechBeanStaredList(type: String, count: Int, pageIndex: Int): Observable<TechBean> {
-//        val retrofit = Retrofit.Builder()
-//                .baseUrl("http://gank.io/api/")
-//                .addConverterFactory(GsonConverterFactory.create())
-//                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-//                .build()
-        val newCount = count.toString()
-        val newPageIndex = pageIndex.toString()
-        return apiStore!!.getData(type, newCount, newPageIndex)
-    }
+
 
 }

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/remote/RemoteDataImpl.kt

@@ -13,8 +13,6 @@ import io.reactivex.Observable
  */
 interface RemoteDataSource {
 
-    fun getRemoteTechBeanStaredList(type: String, count: Int, pageIndex: Int): Observable<TechBean>
-
     //获取分类数据
     fun getRemoteData(type:String, count: Int,pageIndex: Int):Observable<JsonResult<List<GankData>>>
 

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/remote/RemoteDataSource.kt

@@ -18,11 +18,3 @@ import java.util.function.Function
 fun <T> Observable<T>.io_main():Observable<T>{
     return subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
 }
-//
-//fun <T>Observable<T>.handleResult():ObservableTransformer<JsonResult<T>,T>{
-//    return ObservableTransformer<JsonResult<T>,T>{
-//        apply {
-//
-//        }
-//    }
-//}