Browse Source

添加kotlin拓展函数,优化了一点点代码
请求网络写法纠正,具体看issue #11

hegj 5 years ago
parent
commit
be7e1bd66c
24 changed files with 106 additions and 260 deletions
  1. 2 2
      app/build.gradle
  2. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/collect/CollectModel.kt
  3. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/collect/CollectUrlModel.kt
  4. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/integral/IntegralModel.kt
  5. 10 26
      app/src/main/java/me/hegj/wandroid/mvp/model/main/home/HomeModel.kt
  6. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/home/search/SearchModel.kt
  7. 6 15
      app/src/main/java/me/hegj/wandroid/mvp/model/main/home/search/SearchResultModel.kt
  8. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/me/MeModel.kt
  9. 8 20
      app/src/main/java/me/hegj/wandroid/mvp/model/main/project/ProjectChildModel.kt
  10. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/project/ProjectModel.kt
  11. 6 17
      app/src/main/java/me/hegj/wandroid/mvp/model/main/publicNumber/PublicChildModel.kt
  12. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/publicNumber/PublicModel.kt
  13. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/NavigationModel.kt
  14. 6 15
      app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/SquareModel.kt
  15. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/SystemModel.kt
  16. 6 15
      app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/treeinfo/TreeinfoModel.kt
  17. 2 5
      app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareAriticleModel.kt
  18. 6 15
      app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareByIdModel.kt
  19. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareListModel.kt
  20. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/start/LoginModel.kt
  21. 4 10
      app/src/main/java/me/hegj/wandroid/mvp/model/todo/AddTodoModel.kt
  22. 6 15
      app/src/main/java/me/hegj/wandroid/mvp/model/todo/TodoModel.kt
  23. 10 25
      app/src/main/java/me/hegj/wandroid/mvp/model/web/WebviewModel.kt
  24. 2 0
      app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/project/ProjectFragment.kt

+ 2 - 2
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 {

+ 4 - 10
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() {

+ 4 - 10
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() {

+ 4 - 10
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)
     }
 }

+ 10 - 26
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() {

+ 2 - 5
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()
     }
 }

+ 6 - 15
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() {

+ 2 - 5
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()
 
     }
 

+ 8 - 20
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)
     }
 
 }

+ 2 - 5
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()
     }
 
 

+ 6 - 17
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)
     }
 
 

+ 2 - 5
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()
     }
 
 }

+ 2 - 5
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

+ 6 - 15
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)
     }
 
 

+ 2 - 5
app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/SystemModel.kt

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

+ 6 - 15
app/src/main/java/me/hegj/wandroid/mvp/model/main/tree/treeinfo/TreeinfoModel.kt

@@ -37,32 +37,23 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun getTreeInfoDatas(pageNo: Int,cid:Int): Observable<ApiResponse<ApiPagerResponse<MutableList<AriticleResponse>>>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .getAritrilDataByTree(pageNo,cid))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .getAritrilDataByTree(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)
     }
 
     override fun onDestroy() {

+ 2 - 5
app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareAriticleModel.kt

@@ -39,11 +39,8 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
 
 
     override fun addAriticle(title: String, url: String): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .addAriticle(title, url))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .addAriticle(title, url)
     }
 
     override fun onDestroy() {

+ 6 - 15
app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareByIdModel.kt

@@ -33,30 +33,21 @@ class ShareByIdModel
 constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager), ShareByIdContract.Model {
 
     override fun getShareData(pageNo: Int,id:Int): Observable<ApiResponse<ShareResponse>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getShareByidData(pageNo,id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getShareByidData(pageNo,id)
     }
 
     //取消收藏
     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)
     }
 
     @Inject

+ 4 - 10
app/src/main/java/me/hegj/wandroid/mvp/model/share/ShareListModel.kt

@@ -36,19 +36,13 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun getShareData(pageNo: Int): Observable<ApiResponse<ShareResponse>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getShareData(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getShareData(pageNo)
     }
 
     override fun deleteShareData(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .deleteShareData(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .deleteShareData(id)
     }
 
     override fun onDestroy() {

+ 4 - 10
app/src/main/java/me/hegj/wandroid/mvp/model/start/LoginModel.kt

@@ -35,22 +35,16 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun register(username: String, password: String, password1: String): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .register(username, password, password1))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .register(username, password, password1)
     }
 
 
     override fun login(username: String, password: String): Observable<ApiResponse<UserInfoResponse>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .login(username, password))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .login(username, password)
     }
 
 

+ 4 - 10
app/src/main/java/me/hegj/wandroid/mvp/model/todo/AddTodoModel.kt

@@ -37,19 +37,13 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
 
 
     override fun addTodo(title: String, content: String, date: String, type: Int, priority: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .addTodo(title, content, date, type, priority))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .addTodo(title, content, date, type, priority)
     }
 
     override fun updateTodo(title: String, content: String, date: String, type: Int, priority: Int, id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .updateTodo(title, content, date, type, priority,id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .updateTodo(title, content, date, type, priority,id)
     }
 
     override fun onDestroy() {

+ 6 - 15
app/src/main/java/me/hegj/wandroid/mvp/model/todo/TodoModel.kt

@@ -38,27 +38,18 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
     lateinit var mApplication: Application
 
     override fun getTodoData(pageNo: Int): Observable<ApiResponse<ApiPagerResponse<MutableList<TodoResponse>>>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .getTodoData(pageNo))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .getTodoData(pageNo)
     }
 
     override fun updateTodoData(id: Int, status: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .doneTodo(id, status))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .doneTodo(id, status)
     }
 
     override fun deleteTodoData(id: Int): Observable<ApiResponse<Any>> {
-        return Observable.just(mRepositoryManager.obtainRetrofitService(Api::class.java)
-                .deleteTodo(id))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+        return mRepositoryManager.obtainRetrofitService(Api::class.java)
+                .deleteTodo(id)
     }
 
     override fun onDestroy() {

+ 10 - 25
app/src/main/java/me/hegj/wandroid/mvp/model/web/WebviewModel.kt

@@ -41,47 +41,32 @@ constructor(repositoryManager: IRepositoryManager) : BaseModel(repositoryManager
 
     //取消收藏
     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 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 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 collectUrl(name: String, link: String): Observable<ApiResponse<CollectUrlResponse>> {
-        return Observable.just(mRepositoryManager
+        return mRepositoryManager
                 .obtainRetrofitService(Api::class.java)
-                .collectUrl(name,link))
-                .flatMap { apiResponseObservable ->
-                    apiResponseObservable
-                }
+                .collectUrl(name,link)
     }
     //取消收藏网址
     override fun uncollectUrl(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() {

+ 2 - 0
app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/project/ProjectFragment.kt

@@ -74,6 +74,7 @@ class ProjectFragment : BaseFragment<ProjectPresenter>(), ProjectContract.View {
             loadsir.showCallback(LoadingCallback::class.java)
             mPresenter?.getProjectTitles()
         }.apply {
+
             SettingUtil.setLoadingColor(_mActivity, this)
         }
         return rootview
@@ -83,6 +84,7 @@ class ProjectFragment : BaseFragment<ProjectPresenter>(), ProjectContract.View {
         super.initData(savedInstanceState)
         viewpager_linear.setBackgroundColor(SettingUtil.getColor(_mActivity))
         mPresenter?.getProjectTitles()//初始化的时候就请求数据,就是说一进入主页Activity这个就会请求
+
         // 不然 用户进来这个Fragment的时候再请求的话,界面头部啥都没有,这就不好看了
     }