Skip to content

Y
YDL-Component-Medical
Commit 136c817d by konghaorui
Options

补充 LCEActivity 获取 View 接口，升级 ydl-platform 版本号

parent 2bb31177
Showing with 137 additions and 96 deletions
app/build.gradle
......@@ -165,7 +165,7 @@ dependencies {
kapt rootProject.ext.dependencies["butterknife-compiler"]
if (rootProject.ext.dev_mode) {
if (true) {
//开发模式
api project(':m-user')
api project(':m-fm')
......@@ -174,7 +174,7 @@ dependencies {
api (project(':ydl-platform')){
transitive = true
}
// implementation project(':ydl-webview')
implementation project(':ydl-webview')
implementation project(':ydl-media')
} else {
//发布模式
......
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -31,9 +31,18 @@ import kotlinx.android.synthetic.main.activity_main.*
*/
class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(),
DemoContract.View {
private var serviceConnection: ServiceConnection? = null
protected var playService: PlayService? = null
override fun getContentViewId(): Int {
return R.id.lce_content_view
}
override fun getStateViewId(): Int {
return R.id.lce_state_view
}
override fun setData(data: String) {
tv_content.text = data
}
......@@ -48,10 +57,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
override fun initDataAndEvent() {
bindService()
loadData()
reLoadData()
requestPermission()
tv_user.setOnClickListener {
loadData()
reLoadData()
}
tv_home.setOnClickListener {
......@@ -108,7 +117,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
override fun loadData() {
override fun reLoadData() {
mPresenter?.loadUsers()
}
......
app/src/main/java/com/ydl/component/music/MusicPlayActivity.kt
......@@ -6,6 +6,14 @@ import com.ydl.component.mvp.DemoPresenter
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(), DemoContract.View {
override fun getContentViewId(): Int {
return R.id.lce_content_view
}
override fun getStateViewId(): Int {
return R.id.lce_state_view
}
private var mPlayFragment: PlayFragment? = null
override fun createPresenter(): DemoContract.Presenter {
......@@ -17,10 +25,10 @@ class MusicPlayActivity : BaseLceActivity<DemoContract.View, DemoContract.Prese
}
override fun initDataAndEvent() {
loadData()
reLoadData()
}
override fun loadData() {
override fun reLoadData() {
mPresenter.loadFmMusic()
}
......
app/src/main/java/com/ydl/component/mvp/DemoModel.kt
......@@ -18,7 +18,8 @@ import io.reactivex.Observable
class DemoModel : BaseModel(), DemoContract.Model {
override fun getFmMusic(): Observable<HomeFMBean> {
return YDLHttpUtils.obtainApi(DemoService::class.java)
.getFMData().compose(RxUtils.resultJavaData())
.getFMData()
.compose(RxUtils.resultJavaData())
}
......
app/src/main/java/com/ydl/component/mvp/DemoPresenter.kt
......@@ -24,18 +24,15 @@ class DemoPresenter : BasePresenter<DemoContract.View,DemoContract.Model>(),
}
override fun onSuccess(homeFMBean: HomeFMBean) {
// var jsonStirng = Gson().toJson(homeFMBean.list)
// val list = Gson().fromJson<ArrayList<Music>>(jsonStirng, object : TypeToken<ArrayList<Music>>() {}.type)
homeFMBean.list?.let {
AudioPlayer.get().addPlayList(stringToMusicPlayerList(it))
mView.setData("")
}
}
})
}
override fun loadHome() = mModel!!.getHome()
override fun loadHome() = mModel.getHome()
.compose(RxUtils.applySchedulers(mView))
.subscribe(object : CommonObserver<JsonObject>() {
override fun onError(errorMsg: String) {
......@@ -43,11 +40,11 @@ class DemoPresenter : BasePresenter<DemoContract.View,DemoContract.Model>(),
override fun onSuccess(users: JsonObject) {
var cateTitle = users.getAsJsonObject("data").getAsJsonArray("askCategoryData").get(0).asJsonObject.get("cateTitle").asString;
mView?.setData(cateTitle)
mView.setData(cateTitle)
}
})
override fun loadUsers() = mModel!!.getUser()
override fun loadUsers() = mModel.getUser()
.compose(RxUtils.applySchedulers(mView))//使用 Rxlifecycle,使 Disposable 和 Activity 一起销毁
.subscribe(object : CommonObserver<JsonArray>() {
override fun onError(errorMsg: String) {
......
config.gradle
......@@ -172,7 +172,7 @@ ext {
//Modular Api
"ydl-user-router" : 'com.ydl:router:1.0.0-SNAPSHOT@aar',
"ydl-platform" : 'com.ydl:ydl-platform:0.0.10@aar',
"ydl-platform" : 'com.ydl:ydl-platform:0.0.11@aar',
"ydl-m-user-api" : 'com.ydl:m-user-api:0.0.5',
"ydl-webview" : 'com.ydl:ydl-webview:0.0.14@aar',
"ydl-m-muse-api" : 'com.ydl:m-muse-api:0.0.1@aar'
......
m-consultant/modular.gradle
......@@ -8,14 +8,14 @@ modular {
groupId = "com.ydl"
artifactId = "m-consultant-module-xlzx"
// 上报的 心理咨询 业务模块 aar 包的版本号
version = "0.0.11"
version = "0.0.12"
}
ydl{
groupId = "com.ydl"
artifactId = "m-consultant-module-ydl"
// 上报的 壹点灵 业务模块 aar 包的版本号
version = "0.0.11"
version = "0.0.12"
}
}
......
m-tests/build.gradle
......@@ -78,7 +78,8 @@ dependencies {
implementation modularPublication('com.ydl:m-test-api')
}else {
//发布时使用
compileOnly rootProject.ext.dependencies["ydl-m-test-api"]
// compileOnly rootProject.ext.dependencies["ydl-m-test-api"]
implementation modularPublication('com.ydl:m-test-api')
api rootProject.ext.dependencies["ydl-webview"]
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
......
m-user/modular.gradle
......@@ -8,14 +8,14 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-module-xlzx"
// 上报的 心理咨询 业务模块 aar 包的版本号
version = "0.0.19"
version = "0.0.20"
}
ydl{
groupId = "com.ydl"
artifactId = "m-user-module-ydl"
// 上报的 壹点灵 业务模块 aar 包的版本号
version = "0.0.19"
version = "0.0.20"
}
}
......
ydl-platform/gradle.properties
IS_PUBLISH=true
VERSION_NAME=0.0.10
\ No newline at end of file
VERSION_NAME=0.0.11
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/RxUtils.kt
......@@ -86,6 +86,7 @@ object RxUtils {
/**
* RxJava 线程协调 / RxLifecycle绑定方法
* 自动调用 showLoading/hideLoading 方法
* @param view LceView 强转使用
*/
fun <T> applySchedulers(view: ILceView): ObservableTransformer<T, T> {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/mvp/lce/BaseLceActivity.kt
......@@ -2,7 +2,6 @@ package com.ydl.ydlcommon.mvp.lce
import android.support.annotation.CallSuper
import android.view.View
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.mvp.base.IPresenter
import com.ydl.ydlcommon.mvp.base.IView
......@@ -13,34 +12,28 @@ import com.ydl.ydlcommon.mvp.lce.view.ILceViewState
* Des: LCE 架构 BaseActivity，统一处理页面加载状态
* LCE：L：Loading加载，C：Content加载内容，E：Error加载失败
*
* 【注意：StateView需设置id为：R.id.lce_state_view】
* 【注意：ContentView需设置id为：R.id.lce_content_view】
* 【注意：StateView需继承 ILceViewState 接口】
*/
abstract class BaseLceActivity<V : IView, P : IPresenter<V>> : BaseMvpActivity<V, P>(), ILceView{
abstract class BaseLceActivity<V : IView, P : IPresenter<V>> : BaseMvpActivity<V, P>(), ILceView {
protected lateinit var lceStateView: ILceViewState
protected var lceContentView: View? = null
private var lceStateView: ILceViewState? = null
private var lceContentView: View? = null
@CallSuper
override fun onContentChanged() {
super.onContentChanged()
lceStateView = createStateView()
lceContentView = createContentView()
if (lceContentView == null) {
throw NullPointerException(
"请检查布局文件中ContentView是否设置，id需为R.id.lce_content_view"
)
}
}
protected fun createStateView(): ILceViewState {
val stateView = findViewById<View>(R.id.lce_state_view)
if (stateView is ILceViewState) {
private fun createStateView(): ILceViewState {
val stateView:View? = findViewById<View>(getStateViewId())
if (stateView != null && stateView is ILceViewState) {
val viewState = stateView as ILceViewState
viewState.setListener(object : ILceViewState.LogoLoadingListener {
override fun onDataResetClick() {
loadData()
reLoadData()
}
override fun onBackClick() {
......@@ -51,33 +44,48 @@ abstract class BaseLceActivity<V : IView, P : IPresenter<V>> : BaseMvpActivity<V
}
throw NullPointerException(
"请检查布局文件中StateView是否设置，id需为R.id.lce_state_view"
"请检查布局文件中 StateView 是否设置，StateView 需继承 ILceViewState 接口 , className:${this.javaClass.simpleName}"
)
}
protected fun createContentView(): View {
return findViewById(R.id.lce_content_view)
private fun createContentView(): View {
val contentView: View? = findViewById<View>(getContentViewId())
?: throw NullPointerException(
"请检查布局文件中 ContentView 是否设置 , className:${this.javaClass.simpleName}"
)
return contentView!!
}
/**
* 获取 ContentView 控件ID
*/
abstract fun getContentViewId(): Int
/**
* 获取 StateVie 控件 ID
*/
abstract fun getStateViewId(): Int
override fun showLoading() {
lceStateView.showLoading()
lceStateView?.showLoading()
lceContentView?.visibility = View.INVISIBLE
}
override fun hideLoading() {
lceStateView.hideLoading()
}
override fun showContent() {
lceContentView?.visibility = View.VISIBLE
lceStateView.hideLoading()
lceStateView?.hideLoading()
}
override fun showEmpty(msg: String) {
lceStateView.showEmpty(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showEmpty(msg)
}
override fun showError(msg: String) {
lceStateView.showError(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showError(msg)
}
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/mvp/lce/BaseLceDialogFragment.kt
......@@ -4,7 +4,6 @@ import android.os.Bundle
import android.support.annotation.CallSuper
import android.support.v4.app.FragmentActivity
import android.view.View
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.base.BaseMvpDialogFragment
import com.ydl.ydlcommon.mvp.base.IPresenter
import com.ydl.ydlcommon.mvp.base.IView
......@@ -21,30 +20,23 @@ import java.util.*
*/
abstract class BaseLceDialogFragment<V : IView, P : IPresenter<V>> : BaseMvpDialogFragment<V, P>(), ILceView {
protected var lceStateView: ILceViewState? = null
protected var lceContentView: View? = null
private var lceStateView: ILceViewState? = null
private var lceContentView: View? = null
@CallSuper
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
lceStateView = createStateView(view)
lceContentView = createContentView(view)
if (lceContentView == null) {
throw NullPointerException(
"请检查布局文件中ContentView是否设置，id需为R.id.lce_content_view"
)
}
}
protected fun createStateView(view: View): ILceViewState {
val stateView = view.findViewById<View>(R.id.lce_state_view)
if (stateView is ILceViewState) {
private fun createStateView(view: View): ILceViewState {
val stateView:View? = view.findViewById<View>(getStateViewId())
if (stateView != null && stateView is ILceViewState) {
val viewState = stateView as ILceViewState
viewState.setListener(object : ILceViewState.LogoLoadingListener {
override fun onDataResetClick() {
loadData()
reLoadData()
}
override fun onBackClick() {
......@@ -55,34 +47,48 @@ abstract class BaseLceDialogFragment<V : IView, P : IPresenter<V>> : BaseMvpDial
}
throw NullPointerException(
"请检查布局文件中StateView是否设置，id需为R.id.lce_state_view"
"请检查布局文件中 StateView 是否设置，StateView 需继承 ILceViewState 接口 , className:${this.javaClass.simpleName}"
)
}
private fun createContentView(view: View): View {
val contentView: View? = view.findViewById<View>(getContentViewId())
?: throw NullPointerException(
"请检查布局文件中 ContentView 是否设置 , className:${this.javaClass.simpleName}"
)
protected fun createContentView(view: View): View {
return view.findViewById(R.id.lce_content_view)
return contentView!!
}
/**
* 获取 ContentView 控件ID
*/
abstract fun getContentViewId(): Int
/**
* 获取 StateVie 控件 ID
*/
abstract fun getStateViewId(): Int
override fun showLoading() {
lceStateView!!.showLoading()
lceStateView?.showLoading()
lceContentView?.visibility = View.INVISIBLE
}
override fun hideLoading() {
lceStateView!!.hideLoading()
}
override fun showContent() {
lceContentView?.visibility = View.VISIBLE
lceStateView!!.hideLoading()
lceStateView?.hideLoading()
}
override fun showEmpty(msg: String) {
lceStateView!!.showEmpty(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showEmpty(msg)
}
override fun showError(msg: String) {
lceStateView!!.showError(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showError(msg)
}
override fun onDestroyView() {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/mvp/lce/BaseLceFragment.kt
......@@ -4,7 +4,6 @@ import android.os.Bundle
import android.support.annotation.CallSuper
import android.support.v4.app.FragmentActivity
import android.view.View
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.base.BaseMvpFragment
import com.ydl.ydlcommon.mvp.base.IPresenter
import com.ydl.ydlcommon.mvp.base.IView
......@@ -20,8 +19,8 @@ import java.util.*
*/
abstract class BaseLceFragment< V : IView, P : IPresenter<V>> : BaseMvpFragment<V, P>(), ILceView {
protected var lceStateView: ILceViewState? = null
protected var lceContentView: View? = null
private var lceStateView: ILceViewState? = null
private var lceContentView: View? = null
@CallSuper
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
......@@ -37,13 +36,13 @@ abstract class BaseLceFragment< V : IView, P : IPresenter<V>> : BaseMvpFragment<
}
protected fun createStateView(view: View): ILceViewState {
val stateView = view.findViewById<View>(R.id.lce_state_view)
if (stateView is ILceViewState) {
private fun createStateView(view: View): ILceViewState {
val stateView:View? = view.findViewById<View>(getStateViewId())
if (stateView != null && stateView is ILceViewState) {
val viewState = stateView as ILceViewState
viewState.setListener(object : ILceViewState.LogoLoadingListener {
override fun onDataResetClick() {
loadData()
reLoadData()
}
override fun onBackClick() {
......@@ -54,34 +53,48 @@ abstract class BaseLceFragment< V : IView, P : IPresenter<V>> : BaseMvpFragment<
}
throw NullPointerException(
"请检查布局文件中StateView是否设置，id需为R.id.lce_state_view"
"请检查布局文件中 StateView 是否设置，StateView 需继承 ILceViewState 接口 , className:${this.javaClass.simpleName}"
)
}
private fun createContentView(view: View): View {
val contentView: View? = view.findViewById<View>(getContentViewId())
?: throw NullPointerException(
"请检查布局文件中 ContentView 是否设置 , className:${this.javaClass.simpleName}"
)
protected fun createContentView(view: View): View {
return view.findViewById(R.id.lce_content_view)
return contentView!!
}
/**
* 获取 ContentView 控件ID
*/
abstract fun getContentViewId(): Int
/**
* 获取 StateVie 控件 ID
*/
abstract fun getStateViewId(): Int
override fun showLoading() {
lceStateView!!.showLoading()
lceStateView?.showLoading()
lceContentView?.visibility = View.INVISIBLE
}
override fun hideLoading() {
lceStateView!!.hideLoading()
}
override fun showContent() {
lceContentView?.visibility = View.VISIBLE
lceStateView!!.hideLoading()
lceStateView?.hideLoading()
}
override fun showEmpty(msg: String) {
lceStateView!!.showEmpty(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showEmpty(msg)
}
override fun showError(msg: String) {
lceStateView!!.showError(msg)
lceContentView?.visibility = View.INVISIBLE
lceStateView?.showError(msg)
}
override fun onDestroyView() {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/mvp/lce/ILceView.kt
......@@ -16,15 +16,12 @@ interface ILceView : IView{
fun hideLoading()
@UiThread
fun showContent()
@UiThread
fun showError(msg: String)
@UiThread
fun showEmpty(msg: String)
@UiThread
fun loadData()
fun reLoadData()
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment