添加kotlin拓展函数，优化了一点点代码

请求网络写法纠正，具体看issue #11

Author: hegj

app/build.gradle

@@ -27,7 +27,7 @@ android {
         }
     }
 
-    /*signingConfigs {
+    signingConfigs {
         def alias = "wandroid"
         def password = "password"
         def filePath = "wandroid.jks"
@@ -44,7 +44,7 @@ android {
             storeFile file(filePath)
             storePassword(password)
         }
-    }*/
+    }
 
     buildTypes {
         debug {

app/src/main/java/me/hegj/wandroid/mvp/model/collect/CollectModel.kt

@@ -39,21 +39,15 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun getCollectDatas(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<CollectResponse>>>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getCollectData(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getCollectData(pageNo)
     }
 
 
     override fun uncollectList(id: Int, originId: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollectList(id, originId))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollectList(id, originId)
     }
 
     override fun onDestroy() {

app/src/main/java/me/hegj/wandroid/mvp/model/collect/CollectUrlModel.kt

@@ -37,20 +37,14 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun getCollectUrlDatas(): Observable<ApiResponse<MutableList<CollectUrlResponse>>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getCollectUrlData())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getCollectUrlData()
     }
 
     override fun uncollectList(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .deletetool(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .deletetool(id)
     }
 
     override fun onDestroy() {

app/src/main/java/me/hegj/wandroid/mvp/model/integral/IntegralModel.kt

@@ -42,17 +42,11 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     }
 
     override fun getIntegralData(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<IntegralResponse>>>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getIntegralRank(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getIntegralRank(pageNo)
     }
     override fun getIntegralHistoryData(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<IntegralHistoryResponse>>>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getIntegralHistory(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getIntegralHistory(pageNo)
     }
 }

app/src/main/java/me/hegj/wandroid/mvp/model/main/home/HomeModel.kt

@@ -40,49 +40,33 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     @Inject
     lateinit var mApplication: Application
     override fun getArilist(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
-                .obtainRetrofitService(Api::class.java)
-                .getAritrilList(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+       return  mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getAritrilList(pageNo)
     }
 
     override fun getBannList(): Observable<ApiResponse<MutableList<BannerResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getBanner())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getBanner()
     }
 
     override fun getTopArilist(): Observable<ApiResponse<MutableList<AriticleResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getTopAritrilList())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getTopAritrilList()
     }
 
     //取消收藏
     override fun uncollect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollect(id)
     }
     //收藏
     override fun collect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collect(id)
     }
 
     override fun onDestroy() {

app/src/main/java/me/hegj/wandroid/mvp/model/main/home/search/SearchModel.kt

@@ -41,11 +41,8 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     }
 
     override fun getHotData(): Observable<ApiResponse<MutableList<SearchResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getSearchData())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getSearchData()
     }
 }

app/src/main/java/me/hegj/wandroid/mvp/model/main/home/search/SearchResultModel.kt

@@ -39,31 +39,22 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
 
 
     override fun getArilist(pageNo: Int,searchKey:String): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getSearchDataByKey(pageNo,searchKey))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getSearchDataByKey(pageNo,searchKey)
     }
 
     //取消收藏
     override fun uncollect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollect(id)
     }
     //收藏
     override fun collect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collect(id)
     }
 
     override fun onDestroy() {

app/src/main/java/me/hegj/wandroid/mvp/model/main/me/MeModel.kt

@@ -30,12 +30,9 @@ class MeModel
 @Inject
 constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager), MeContract.Model {
     override fun getIntegral(): Observable<ApiResponse<IntegralResponse>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getIntegral())
-                .flatMap { apiResponseObservable->
-                    apiResponseObservable
-                }
+                .getIntegral()
 
     }
 

app/src/main/java/me/hegj/wandroid/mvp/model/main/project/ProjectChildModel.kt

@@ -30,40 +30,28 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     }
 
     override fun getProjects(pageNo: Int,cid:Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getProjecDataByType(pageNo,cid))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getProjecDataByType(pageNo,cid)
     }
 
     override fun getNewProjects(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getProjecNewData(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getProjecNewData(pageNo)
     }
 
     //取消收藏
     override fun uncollect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollect(id)
     }
     //收藏
     override fun collect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collect(id)
     }
 
 }

app/src/main/java/me/hegj/wandroid/mvp/model/main/project/ProjectModel.kt

@@ -51,12 +51,9 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     }*/
 
     override fun getTitles(): Observable<ApiResponse<MutableList<ClassifyResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getProjecTypes())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getProjecTypes()
     }
 
 

app/src/main/java/me/hegj/wandroid/mvp/model/main/publicNumber/PublicChildModel.kt

@@ -41,32 +41,21 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
         super.onDestroy()
     }
     override fun getPublicDatas(pageNo: Int,cid:Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getPublicNewData(pageNo,cid))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getPublicNewData(pageNo,cid)
     }
-
-
     //取消收藏
     override fun uncollect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollect(id)
     }
     //收藏
     override fun collect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collect(id)
     }
 
 

app/src/main/java/me/hegj/wandroid/mvp/model/main/publicNumber/PublicModel.kt

@@ -42,12 +42,9 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     }
 
     override fun getTitles(): Observable<ApiResponse<MutableList<ClassifyResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getPublicTypes())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getPublicTypes()
     }
 
 }

app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/NavigationModel.kt

@@ -32,12 +32,9 @@ class NavigationModel
 @Inject
 constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager), NavigationContract.Model {
     override fun getNavigationData(): Observable<ApiResponse<MutableList<NavigationResponse>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getNavigationData())
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getNavigationData()
     }
 
     @Inject

app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/SquareModel.kt

@@ -39,31 +39,22 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
 
     //获取广场数据
     override fun getSquareData(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getSquareData(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getSquareData(pageNo)
     }
 
     //取消收藏
     override fun uncollect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .uncollect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .uncollect(id)
     }
     //收藏
     override fun collect(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collect(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collect(id)
     }