style:change code style

Author: ForgetAll

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

@@ -4,12 +4,10 @@ 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)

app/src/main/java/com/xiasuhuei321/gank_kotlin/Test.java

@@ -52,7 +52,7 @@ class WeatherShapePool {
         }
     }
 
-    private fun initSnow(){
+    private fun initSnow() {
         val space = context.getScreenWidth() / 20
         var currentSpace = 0f
         // 将其均匀的分布在屏幕x方向上
@@ -72,12 +72,12 @@ class WeatherShapePool {
         }
     }
 
-    fun drawSnow(canvas: Canvas){
-        for(r in constantSnow){
+    fun drawSnow(canvas: Canvas) {
+        for (r in constantSnow) {
             r.draw(canvas)
         }
 
-        for (r in randomSnow){
+        for (r in randomSnow) {
             r.draw(canvas)
         }
     }

app/src/main/java/com/xiasuhuei321/gank_kotlin/customview/weather/WeatherShapePool.kt

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

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

@@ -1,6 +1,7 @@
 package com.xiasuhuei321.gank_kotlin.datasource
 
 import com.xiasuhuei321.gank_kotlin.datasource.bean.GankData
+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
@@ -12,11 +13,11 @@ import io.reactivex.Observable
  * author:karl
  * e-mail:[email protected]
  */
- object DataSourceImpl :DataSource {
+object DataSourceImpl : DataSource {
 
-    private val remote :RemoteDataSource
+    private val remote: RemoteDataSource
 
-    private val local : LocalDataSource
+    private val local: LocalDataSource
 
     init {
         remote = RemoteDataSourceImpl()
@@ -26,11 +27,11 @@ import io.reactivex.Observable
     /**
      * 初次打开app需要进行一些初始化操作
      */
-    public fun firstInit(){
+    public fun firstInit() {
 
     }
 
-    override fun getData(type: String):Observable<List<GankData>>{
+    override fun getData(type: String): Observable<List<GankData>> {
         TODO("获取数据，进行网络请求,加载失败再从本地读取缓存")
     }
 
@@ -41,30 +42,37 @@ import io.reactivex.Observable
     /**
      * 清除本地指定缓存
      */
-    override fun clearData(type: String){
+    override fun clearData(type: String) {
         TODO("清除本地指定缓存数据")
     }
 
     /**
      * 清除本地所有缓存
      */
-    override fun clearAllData(){
+    override fun clearAllData() {
 //        TODO("清除本地所有缓存数据")
     }
 
 
     /**
      * 优先从本地获取数据
      */
-    private fun getLocalData(type: String) : Observable<List<GankData>>{
+    private fun getLocalData(type: String): Observable<List<GankData>> {
         TODO("获取本地的缓存数据")
     }
 
     /**
      * 刷新本地序列化存储数据
      */
-    private fun refreshLocalData(type: String){
+    private fun refreshLocalData(type: String) {
 //        TODO("序列化存储指定数据到本地")
     }
 
+    /**
+     * 获取天气，如果网络有问题，就从本地获取，本地也没有那就GG
+     */
+    override fun getWeatherData(): Weather {
+        return Weather()
+    }
+
 }

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

@@ -9,7 +9,7 @@ package com.xiasuhuei321.gank_kotlin.datasource.bean
 /**
  * 请求API
  */
-object API{
+object API {
 
     const val BASE_PATH = "http://gank.io/api/"
     //搜索API
@@ -33,7 +33,7 @@ object API{
 /**
  * 请求类型
  */
-object PostType{
+object PostType {
 
     // 福利 | Android | iOS | 休息视频 | 拓展资源 | 前端 | all
 
@@ -50,7 +50,7 @@ object PostType{
 /**
  * 请求响应代码
  */
-object ResponseCode{
+object ResponseCode {
     /**
      * 加载成功
      */

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

@@ -165,7 +165,7 @@ public String toString() {
         public boolean equals(Object obj) {
             if (!(obj instanceof ResultsBean))
                 return false;
-            if(((ResultsBean)obj).get_id().equals(this.get_id()))
+            if (((ResultsBean) obj).get_id().equals(this.get_id()))
                 return true;
             return false;
         }