Merge remote-tracking branch 'origin/master'

Author: ForgetAll

License2

@@ -5,7 +5,7 @@ Version 1.0, September 2017
 
 https://github.com/unbug/snts
 
-Copyright (C) [2017] [xiasuhuei321]
+Copyright (C) 2017 xiasuhuei321
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document.

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

@@ -4,10 +4,12 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Window
 import android.view.WindowManager
+import com.xiasuhuei321.gank_kotlin.datasource.DataSourceImpl
 import com.xiasuhuei321.gank_kotlin.extension.shortToast
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
+    val data = DataSourceImpl()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
@@ -20,6 +22,10 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         weatherWv.onDestroy()

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

@@ -0,0 +1,24 @@
+package com.xiasuhuei321.gank_kotlin.datasource
+
+import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+import io.reactivex.Observable
+
+
+/**
+ * Created by CoderFan on 2017/9/12.
+ * desc:
+ */
+interface DataSource{
+
+    //获取Data
+    fun getData(type:String): Observable<List<GankData>>
+
+    //获取服务器数据，每页数据默认为10, 页码默认为1
+    fun getRemoteData(type: String,pageIndex:Int = 1,count:Int = 10):Observable<List<GankData>>
+
+    //清除本地指定缓存
+    fun clearData(type: String)
+
+    //清除本地所有缓存
+    fun clearAllData()
+}

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

@@ -0,0 +1,64 @@
+package com.xiasuhuei321.gank_kotlin.datasource
+
+import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+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 io.reactivex.Observable
+
+/**
+ * Created by coderFan on 2017/8/11.
+ * author:karl
+ * e-mail:[email protected]
+ */
+ class DataSourceImpl :DataSource {
+
+    private val remote :RemoteDataSource
+
+    private val local : LocalDataSource
+
+    init {
+        remote = RemoteDataSourceImpl()
+        local = LocalDataSourceImpl()
+    }
+
+    override fun getData(type: String):Observable<List<GankData>>{
+        TODO("获取数据，进行网络请求,加载失败再从本地读取缓存")
+    }
+
+    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 clearData(type: String){
+        TODO("清除本地指定缓存数据")
+    }
+
+    /**
+     * 清除本地所有缓存
+     */
+    override fun clearAllData(){
+        TODO("清除本地所有缓存数据")
+    }
+
+
+    /**
+     * 优先从本地获取数据
+     */
+    private fun getLocalData(type: String) : Observable<List<GankData>>{
+        TODO("获取本地的缓存数据")
+
+    }
+
+    /**
+     * 刷新本地序列化存储数据
+     */
+    private fun refreshLocalData(type: String){
+        TODO("序列化存储指定数据到本地")
+    }
+
+}

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/bean/Code.kt

@@ -0,0 +1,78 @@
+package com.xiasuhuei321.gank_kotlin.datasource.bean
+
+/**
+ * Created by Karl on 2017/9/11 0011.
+ * desc: 一些code集合
+ */
+
+
+/**
+ * 请求API
+ */
+object API{
+
+    const val BASE_PATH = "http://gank.io/api/"
+    //搜索API
+    const val SEARCH = "search/query/listview/category/"
+
+    //获取历史数据
+    const val HISTORY = "history/content/"
+
+    //获取分类
+    const val DATA = "data/"
+
+    //每日数据
+    const val DAY_DATA = "day/"
+
+    //随机数据
+    const val RANDOM_DATA = "random/data/"
+
+
+}
+
+/**
+ * 请求类型
+ */
+object PostType{
+
+    // 福利 | Android | iOS | 休息视频 | 拓展资源 | 前端 | all
+
+    val WELFARE = "福利"
+    val ANDROID = "Android"
+    val IOS = "iOS"
+    val FRONT = "前端"
+    val ALL = "all"
+
+    val VIDEO = "休息视频"
+    val MORE = "拓展资源"
+}
+
+/**
+ * 请求响应代码
+ */
+object ResponseCode{
+    /**
+     * 加载成功
+     */
+    val SUCCESS = 100
+
+    /**
+     * 连接超时
+     */
+    val CONNECT_TIME_OUT = 200
+
+    /**
+     * 网络异常
+     */
+    val NET_ERROR = 300
+
+    /**
+     * 本地缓存数据
+     */
+    val LOCAL_CACHE = 400
+
+    /**
+     * 服务器异常
+     */
+    val SEVER_ERROR = 500
+}

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/bean/Data.kt

@@ -0,0 +1,20 @@
+package com.xiasuhuei321.gank_kotlin.datasource.bean
+
+/**
+ * Created by Karl on 2017/9/7 0007.
+ * desc:数据
+ */
+
+data class JsonResult<T>(var error:Boolean, var results:T)
+
+data class GankData(var _id:String,
+                    var createAt:String,
+                    var desc:String,
+                    var publishedAt:String,
+                    var source:String,
+                    var type:String,
+                    var url:String,
+                    var used:Boolean,
+                    var who:String)
+
+

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/bean/data.kt

@@ -0,0 +1,14 @@
+package com.xiasuhuei321.gank_kotlin.datasource.local
+
+import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+import io.reactivex.Observable
+
+/**
+ * Created by coderfan on 2017/8/11.
+ * desc:
+ */
+interface LocalDataSource {
+
+    //本地缓存
+    fun getRemoteData(type:String):Observable<List<GankData>>
+}

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/local/LocalData.kt

@@ -0,0 +1,15 @@
+package com.xiasuhuei321.gank_kotlin.datasource.local
+
+import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+import io.reactivex.Observable
+
+/**
+ * Created by coderfan on 2017/8/11.
+ * desc:
+ */
+class LocalDataSourceImpl : LocalDataSource {
+
+    override fun getRemoteData(type: String): Observable<List<GankData>> {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+}

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/local/LocalDataImpl.kt

@@ -1,5 +1,8 @@
-package com.xiasuhuei321.gank_kotlin.datasource
+package com.xiasuhuei321.gank_kotlin.datasource.net
 
+import com.xiasuhuei321.gank_kotlin.datasource.bean.API
+import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+import com.xiasuhuei321.gank_kotlin.datasource.bean.JsonResult
 import com.xiasuhuei321.gank_kotlin.datasource.bean.TechBean
 import io.reactivex.Observable
 import retrofit2.http.GET
@@ -10,12 +13,19 @@ import retrofit2.http.Path
  * author:luo
  * e-mail:[email protected]
  */
-interface ApiStore {
+interface ApiService {
     /**
      * http://gank.io/api/data/数据类型/请求个数/第几页
      */
     @GET("data/{type}/{count}/{pageIndex}")
     fun getData(@Path("type") type: String,
                 @Path("count") count: String,
                 @Path("pageIndex") pageIndex: String): Observable<TechBean>
+
+    @GET("data/{type}/{count}/{pageIndex}")
+    fun getCategoricalData(
+            @Path("type") type:String,
+            @Path("count") count: String,
+            @Path("pageIndex") pageIndex: String
+    ): Observable<JsonResult<List<GankData>>>
 }

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/local/LocalDataSource.kt

@@ -0,0 +1,46 @@
+package com.xiasuhuei321.gank_kotlin.datasource.net
+
+import android.util.Log
+import com.xiasuhuei321.gank_kotlin.datasource.bean.API
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.converter.gson.GsonConverterFactory
+
+/**
+ * Created by Karl on 2017/9/7 0007.
+ * Retrofit Client
+ */
+
+object Network {
+
+    private val retrofit:Retrofit
+    private val okHttpClient:OkHttpClient
+
+    init {
+        val logging = Interceptor{chain ->
+            val request = chain.request()
+            Log.w("okhttp","okhttp--->"+request.url().toString())
+            chain.proceed(request)
+        }
+
+        okHttpClient =
+                OkHttpClient.Builder().addInterceptor(logging).build()
+
+        retrofit =
+                Retrofit.Builder()
+                        .baseUrl(API.BASE_PATH)
+                        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                        .addConverterFactory(GsonConverterFactory.create())
+                        .client(okHttpClient)
+                        .build()
+
+
+    }
+
+    val service:ApiService by lazy { retrofit.create(ApiService::class.java) }
+
+}
+