diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3378229..271a9f2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,18 @@
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 3234cdb..c9b4893 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,9 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
+ viewBinding {
+ enabled = true
+ }
}
dependencies {
@@ -41,4 +44,10 @@ dependencies {
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
+
+ implementation project(":source")
+ implementation project(":observer")
+ implementation project(":paging")
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99d27fd..ea11580 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,19 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.RetrofitSource" />
+ android:theme="@style/Theme.RetrofitSource">
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/me/twc/retrofitsource/MainActivity.kt b/app/src/main/java/me/twc/retrofitsource/MainActivity.kt
new file mode 100644
index 0000000..9f40567
--- /dev/null
+++ b/app/src/main/java/me/twc/retrofitsource/MainActivity.kt
@@ -0,0 +1,22 @@
+package me.twc.retrofitsource
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import me.twc.retrofitsource.databinding.ActMainBinding
+
+/**
+ * @author 唐万超
+ * @date 2022/09/23
+ */
+class MainActivity : AppCompatActivity() {
+
+ private val mBinding by lazy { ActMainBinding.inflate(layoutInflater) }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(mBinding.root)
+ mBinding.tvObserverView2.setOnClickListener {
+ SourceObserverView2Activity.show(this)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/twc/retrofitsource/SourceObserverView2Activity.kt b/app/src/main/java/me/twc/retrofitsource/SourceObserverView2Activity.kt
new file mode 100644
index 0000000..8c05fa4
--- /dev/null
+++ b/app/src/main/java/me/twc/retrofitsource/SourceObserverView2Activity.kt
@@ -0,0 +1,67 @@
+package me.twc.retrofitsource
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import me.twc.retrofitsource.databinding.ActSourceObserverView2Binding
+import me.twc.source.ErrorSource
+import me.twc.source.LoadingSource
+import me.twc.source.Source
+import me.twc.source.observer.utils.loadingObserver
+
+/**
+ * @author 唐万超
+ * @date 2022/09/23
+ */
+class SourceObserverView2Activity : AppCompatActivity() {
+
+ companion object{
+ fun show(context: Context){
+ val intent = Intent(context,SourceObserverView2Activity::class.java)
+ context.startActivity(intent)
+ }
+ }
+
+ private val mBinding by lazy { ActSourceObserverView2Binding.inflate(layoutInflater) }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(mBinding.root)
+ mBinding.root.setOnClickListener {
+ Toast.makeText(this, "content click", Toast.LENGTH_SHORT).show()
+ }
+ mBinding.obserview.mReloadFun = fun(){
+ test()
+ }
+ test.loadingObserver(this,mBinding.obserview){
+ Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+ }
+ lifecycleScope.launchWhenResumed { test() }
+ }
+
+
+ private val _test: MutableLiveData> by lazy {
+ return@lazy MutableLiveData>()
+ }
+
+ val test: LiveData> = _test
+
+ private var testJob: Job? = null
+
+ fun test() {
+ testJob?.cancel()
+ testJob = lifecycleScope.launch {
+ _test.value = LoadingSource
+ delay(1000)
+ _test.value = ErrorSource("测试异常")
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml
new file mode 100644
index 0000000..e2a956a
--- /dev/null
+++ b/app/src/main/res/layout/act_main.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_source_observer_view2.xml b/app/src/main/res/layout/act_source_observer_view2.xml
new file mode 100644
index 0000000..6bfab0a
--- /dev/null
+++ b/app/src/main/res/layout/act_source_observer_view2.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/src/main/java/me/twc/source/observer/widget/SourceObserverView2.kt b/observer/src/main/java/me/twc/source/observer/widget/SourceObserverView2.kt
new file mode 100644
index 0000000..3afaf6c
--- /dev/null
+++ b/observer/src/main/java/me/twc/source/observer/widget/SourceObserverView2.kt
@@ -0,0 +1,111 @@
+package me.twc.source.observer.widget
+
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.annotation.MainThread
+import androidx.core.view.isVisible
+import me.twc.source.observer.R
+import me.twc.source.observer.engine.ISourceObserverView
+
+/**
+ * @author 唐万超
+ * @date 2022/09/23
+ */
+open class SourceObserverView2 @JvmOverloads constructor(
+ context: Context,
+ attributeSet: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : FrameLayout(context, attributeSet, defStyleAttr), ISourceObserverView {
+ companion object {
+ /**
+ * 展示实际 Loading 的延迟时间
+ */
+ val GLOBAL_LOADING_DELAY_TIME = 450L
+ val GLOBAL_ERROR_BACKGROUND = Color.WHITE
+ val GLOBAL_EMPTY_BACKGROUND = Color.WHITE
+ }
+
+ var mLoadingDelayTime = GLOBAL_LOADING_DELAY_TIME
+ var mErrorBackground = GLOBAL_ERROR_BACKGROUND
+ var mEmptyBackground = GLOBAL_EMPTY_BACKGROUND
+ var mReloadFun: (() -> Unit)? = null
+
+ private val mLayoutInflater = LayoutInflater.from(context)
+ private var mLoadingLayout: View? = null
+ private var mErrorLayout: View? = null
+ private var mEmptyLayout: View? = null
+
+ private val mDelayLoadingRunnable = Runnable {
+ mLoadingLayout?.isVisible = true
+ }
+
+ init {
+ // 可点击,防止点击穿透
+ isClickable = true
+ isVisible = false
+ }
+
+ @LayoutRes
+ open fun getLoadingLayoutRes(): Int = R.layout.source_observer_layout_loading
+
+ @LayoutRes
+ open fun getErrorLayoutRes(): Int = R.layout.source_observer_layout_error
+
+ @LayoutRes
+ open fun getEmptyLayoutRes(): Int = R.layout.source_observer_layout_empty
+
+ @MainThread
+ override fun showSourceLoadingView() {
+ if (mLoadingLayout == null) {
+ mLoadingLayout = mLayoutInflater.inflate(getLoadingLayoutRes(), this, false)
+ addView(mLoadingLayout)
+ }
+ showView()
+ postDelayed(mDelayLoadingRunnable, mLoadingDelayTime)
+ }
+
+ @MainThread
+ override fun showSourceErrorView(message: String) {
+ if (mErrorLayout == null) {
+ mErrorLayout = mLayoutInflater.inflate(getErrorLayoutRes(), this, false)
+ mErrorLayout!!.setBackgroundColor(mErrorBackground)
+ mErrorLayout!!.setOnClickListener {
+ mReloadFun?.invoke()
+ }
+ addView(mErrorLayout)
+ }
+ mErrorLayout!!.findViewById(R.id.tv_network_error).text = message
+ showView(mErrorLayout)
+ }
+
+ @MainThread
+ override fun showSourceEmptyView(message: String) {
+ if (mEmptyLayout == null) {
+ mEmptyLayout = mLayoutInflater.inflate(getEmptyLayoutRes(), this, false)
+ mEmptyLayout!!.setBackgroundColor(mEmptyBackground)
+ addView(mEmptyLayout)
+ }
+ mEmptyLayout!!.findViewById(R.id.tv_empty).text = message
+ showView(mEmptyLayout)
+ }
+
+ @MainThread
+ override fun showSourceSuccessView() {
+ removeCallbacks(mDelayLoadingRunnable)
+ isVisible = false
+ }
+
+ private fun showView(show: View? = null) {
+ removeCallbacks(mDelayLoadingRunnable)
+ mLoadingLayout?.isVisible = show === mLoadingLayout
+ mErrorLayout?.isVisible = show === mErrorLayout
+ mEmptyLayout?.isVisible = show === mEmptyLayout
+ isVisible = true
+ }
+}
\ No newline at end of file
diff --git a/observer/src/main/res/drawable-xxhdpi/source_observer_ic_network_error.xml b/observer/src/main/res/drawable-xxhdpi/source_observer_ic_network_error.xml
new file mode 100644
index 0000000..6baa3fb
--- /dev/null
+++ b/observer/src/main/res/drawable-xxhdpi/source_observer_ic_network_error.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/observer/src/main/res/drawable-xxhdpi/source_observer_ic_status_empty.png b/observer/src/main/res/drawable-xxhdpi/source_observer_ic_status_empty.png
new file mode 100644
index 0000000..786eb92
Binary files /dev/null and b/observer/src/main/res/drawable-xxhdpi/source_observer_ic_status_empty.png differ
diff --git a/observer/src/main/res/drawable/source_observer_bg_error_button.xml b/observer/src/main/res/drawable/source_observer_bg_error_button.xml
new file mode 100644
index 0000000..1856b7e
--- /dev/null
+++ b/observer/src/main/res/drawable/source_observer_bg_error_button.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/src/main/res/layout/source_observer_layout_empty.xml b/observer/src/main/res/layout/source_observer_layout_empty.xml
new file mode 100644
index 0000000..0f4674d
--- /dev/null
+++ b/observer/src/main/res/layout/source_observer_layout_empty.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/src/main/res/layout/source_observer_layout_error.xml b/observer/src/main/res/layout/source_observer_layout_error.xml
new file mode 100644
index 0000000..5c933ef
--- /dev/null
+++ b/observer/src/main/res/layout/source_observer_layout_error.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/src/main/res/layout/source_observer_layout_loading.xml b/observer/src/main/res/layout/source_observer_layout_loading.xml
new file mode 100644
index 0000000..145b402
--- /dev/null
+++ b/observer/src/main/res/layout/source_observer_layout_loading.xml
@@ -0,0 +1,6 @@
+
+