Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/xiasuhuei321/gank_kotlin/MainActivity.kt
#	app/src/main/res/layout/activity_main.xml

Author: ForgetAll

README.md

@@ -1,7 +1,7 @@
 # GankKotlin
 A practice for kotlin, use gank.io's data.
 
-Now the app is under development, here are some pictures for preview.
+Now the app is under development, here are some pictures for preview.The native code built by CMake.
 
 ![rain](./screenshot/rain.gif)
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     package="com.xiasuhuei321.gank_kotlin">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".GankApplication"
@@ -13,6 +15,13 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
+        <activity android:name=".FileTestActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -0,0 +1,21 @@
+package com.xiasuhuei321.gank_kotlin
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+
+/**
+ * Created by Karl on 2017/9/21 0021.
+ * desc:测试用，暂时别删
+ */
+class FileTestActivity : AppCompatActivity(){
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_test)
+
+
+    }
+
+
+
+}

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

@@ -12,10 +12,13 @@ import io.reactivex.Observable
 interface DataSource {
 
     // 获取Data
-    fun getData(type: String): Observable<List<GankData>>
+    fun getRemoteData(type: String): Observable<List<GankData>>
+
+    //获取Data,默认请求数据为10
+    fun getRemoteData(type: String,pageIndex: Int):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

@@ -6,6 +6,8 @@ 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
 
 /**
@@ -17,7 +19,7 @@ object DataSourceImpl : DataSource {
 
     private val remote: RemoteDataSource
 
-    private val local: LocalDataSource
+    private val local: LocalDataSource<GankData>
 
     init {
         remote = RemoteDataSourceImpl()
@@ -31,41 +33,52 @@ object DataSourceImpl : DataSource {
 
     }
 
-    override fun getData(type: String): Observable<List<GankData>> {
-        TODO("获取数据，进行网络请求,加载失败再从本地读取缓存")
+    override fun getRemoteData(type: String): Observable<List<GankData>> {
+        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, pageIndex: Int): Observable<List<GankData>> {
+        return getRemoteData(type, 10, pageIndex)
+    }
+
+    override fun getRemoteData(type: String, count: Int, pageIndex: Int): Observable<List<GankData>> {
+        return remote
+                .getRemoteData(type, 10, 1)
+                .compose(handleResult())
+                .doOnNext({ list ->
+                            if (pageIndex == 1) refreshLocalData(type, list)//只有当加载第一页数据的时候才缓存
+                        }
+                )
+                .io_main()
     }
 
     /**
      * 清除本地指定缓存
      */
     override fun clearData(type: String) {
-        TODO("清除本地指定缓存数据")
+        local.clearLocalData(type)
     }
 
     /**
      * 清除本地所有缓存
      */
     override fun clearAllData() {
-//        TODO("清除本地所有缓存数据")
+        local.clearAllData()
     }
 
 
     /**
      * 优先从本地获取数据
      */
     private fun getLocalData(type: String): Observable<List<GankData>> {
-        TODO("获取本地的缓存数据")
+        return Observable.just(local.getLocalData(type))
     }
 
     /**
      * 刷新本地序列化存储数据
      */
-    private fun refreshLocalData(type: String) {
-//        TODO("序列化存储指定数据到本地")
+    private fun refreshLocalData(type: String, list: List<GankData>) {
+        local.refreshLocalData(type,list)
     }
 
     /**

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

@@ -76,3 +76,12 @@ object ResponseCode {
      */
     val SEVER_ERROR = 500
 }
+
+object CacheValues{
+
+    val SP_CONFIG_NAME = "GankKotlin"
+
+    val DEFAULT_FILE_NAME = "GankFile"
+
+    val DEFAULT_FILE_COUNT = "GankFileCount"//统计本地存储的文件
+}

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

@@ -5,17 +5,19 @@ package com.xiasuhuei321.gank_kotlin.datasource.bean
  * desc:数据
  */
 
-data class JsonResult<T>(var error: Boolean, var results: T)
+data class JsonResult<T>(val error: Boolean, val 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)
+data class GankData(val _id: String,
+                    val createAt: String,
+                    val desc: String,
+                    val publishedAt: String,
+                    val source: String,
+                    val type: String,
+                    val url: String,
+                    val used: Boolean,
+                    val who: String){
+    fun create() = createAt.substring(0,10)
+}
 
 
 data class City(val cityName: String,

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/code/ErrorCode.kt

@@ -8,10 +8,16 @@ import io.reactivex.Observable
  * Created by coderfan on 2017/8/11.
  * desc:
  */
-interface LocalDataSource {
+interface LocalDataSource<T> {
 
     //本地缓存
-    fun getLocalData(type: String): Observable<List<GankData>>
+    fun getLocalData(type: String): List<T>
+
+    fun refreshLocalData(type: String,list: List<T>)
+
+    fun clearLocalData(type: String)
+
+    fun clearAllData()
 
     fun json2DB(): Map<String, List<Town>>
 }

app/src/main/java/com/xiasuhuei321/gank_kotlin/datasource/code/Type.kt

@@ -2,18 +2,41 @@ package com.xiasuhuei321.gank_kotlin.datasource.local
 
 import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
 import com.xiasuhuei321.gank_kotlin.datasource.bean.Town
+import com.xiasuhuei321.gank_kotlin.extension.*
 import io.reactivex.Observable
 
 /**
  * Created by coderfan on 2017/8/11.
- * desc:
+ * desc:数据缓存管理类
  */
-class LocalDataSourceImpl : LocalDataSource {
+class LocalDataSourceImpl<T> : LocalDataSource<T> {
+
+    val map  = HashMap<String,List<T>>()
+
     override fun json2DB(): Map<String, List<Town>> {
         return null!!
     }
 
-    override fun getLocalData(type: String): Observable<List<GankData>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun getLocalData(type: String): List<T>{
+        if (map.containsKey(type)){
+            return map.get(type)!!
+        }else{
+            TODO("I don't know how to cast result to list")
+        }
+    }
+
+    override fun refreshLocalData(type: String, list: List<T>) {
+        map.put(type,list)
+        write2File(type, listToJson(list))
+    }
+
+    override fun clearLocalData(type: String) {
+        if (map.containsKey(type))map.remove(type)
+        deleteCacheFile(type)
+    }
+
+    override fun clearAllData() {
+        map.clear()
+        deleteAllCacheFile()
     }
 }