Skip to content

Commit 42cca7f

Browse files
committed
update
1 parent febe96c commit 42cca7f

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

app/src/main/java/com/hazz/kotlinmvp/mvp/contract/HomeContract.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface HomeContract {
3131

3232
}
3333

34-
interface Presenter : IPresenter<View> {
34+
interface Presenter {
3535

3636
/**
3737
* 获取首页精选数据
@@ -47,4 +47,4 @@ interface HomeContract {
4747
}
4848

4949

50-
}
50+
}

app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/HomePresenter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class HomePresenter : BasePresenter<HomeContract.View>(), HomeContract.Presenter
3232
checkViewAttached()
3333
mRootView?.showLoading()
3434
val disposable = homeModel.requestHomeData(num)
35-
.flatMap({ homeBean ->
35+
.flatMap { homeBean ->
3636

3737
//过滤掉 Banner2(包含广告,等不需要的 Type), 具体查看接口分析
3838
val bannerItemList = homeBean.issueList[0].itemList
@@ -49,7 +49,7 @@ class HomePresenter : BasePresenter<HomeContract.View>(), HomeContract.Presenter
4949

5050
//根据 nextPageUrl 请求下一页数据
5151
homeModel.loadMoreData(homeBean.nextPageUrl)
52-
})
52+
}
5353

5454
.subscribe({ homeBean->
5555
mRootView?.apply {
@@ -124,4 +124,4 @@ class HomePresenter : BasePresenter<HomeContract.View>(), HomeContract.Presenter
124124

125125

126126

127-
}
127+
}

app/src/main/java/com/hazz/kotlinmvp/ui/activity/AboutActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.Intent
55
import android.net.Uri
66
import com.hazz.kotlinmvp.MyApplication
77
import com.hazz.kotlinmvp.R
8+
import com.hazz.kotlinmvp.R.id.toolbar
89
import com.hazz.kotlinmvp.base.BaseActivity
910
import com.hazz.kotlinmvp.utils.AppUtils
1011
import com.hazz.kotlinmvp.utils.StatusBarUtil
@@ -39,4 +40,4 @@ class AboutActivity : BaseActivity() {
3940
override fun start() {
4041

4142
}
42-
}
43+
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
apply from: "config.gradle"
33
buildscript {
4-
ext.kotlin_version = '1.2.60'
4+
ext.kotlin_version = '1.3.20'
55
repositories {
66
google()
77
mavenCentral()
88
jcenter()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.1.4'
11+
classpath 'com.android.tools.build:gradle:3.3.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jun 09 19:19:22 CST 2018
1+
#Thu Mar 07 17:29:24 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

multiple-status-view/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apply plugin: 'com.android.library'
33
android {
44

55
compileSdkVersion rootProject.ext.android.compileSdkVersion
6-
buildToolsVersion rootProject.ext.android.buildToolsVersion
76

87
defaultConfig {
98
minSdkVersion rootProject.ext.android.minSdkVersion
@@ -20,4 +19,4 @@ android {
2019
}
2120
}
2221

23-
dependencies { }
22+
dependencies { }

0 commit comments

Comments
 (0)