优化封装

app/src/main/java/com/hankkin/pagelayoutdemo/MainActivity.kt

@@ -15,20 +15,11 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
 
-        PageLayout.Builder(this)
-                .initPage(this)
-                .setEmpty(R.layout.layout_empty)
-                .setError(R.layout.layout_error)
-                .setLoading(R.layout.layout_loading)
-                .setOnRetryListener(object : PageLayout.OnRetryClickListener{
-                    override fun onRetry() {
-                        loadData()
-                    }
-                })
-                .create()
-
          page = PageLayout.Builder(this)
                 .initPage(ll)
+                 .setEmpty(R.layout.layout_empty)
+                 .setError(R.layout.layout_error)
+                 .setLoading(R.layout.layout_loading_demo)
                 .setOnRetryListener(object : PageLayout.OnRetryClickListener{
                     override fun onRetry() {
                         loadData()

pagelayout/src/main/java/com/hankkin/pagelayout/PageLayout.kt

@@ -120,7 +120,7 @@ class PageLayout : FrameLayout {
         private lateinit var mTvError: TextView
         private lateinit var mTvLoading: TextView
         private lateinit var mBlinkLayout: BlinkLayout
-        private lateinit var mOnRetryClickListener: OnRetryClickListener
+        private var mOnRetryClickListener: OnRetryClickListener? = null
 
 
         constructor(context: Context) {
@@ -138,7 +138,7 @@ class PageLayout : FrameLayout {
             mPageLayout.mError = mInflater.inflate(R.layout.layout_error, mPageLayout, false)
                     .apply {
                         mTvError = findViewById(R.id.tv_page_error)
-                        mTvError.setOnClickListener { mOnRetryClickListener.onRetry() }
+                        mTvError.setOnClickListener { mOnRetryClickListener?.onRetry() }
                     }
             mPageLayout.mLoading = mInflater.inflate(R.layout.layout_loading, mPageLayout, false)
                     .apply {
@@ -153,11 +153,30 @@ class PageLayout : FrameLayout {
             return this
         }
 
-        fun setError(error: Int): Builder {
+        fun setError(errorView: View, errorClickTv: TextView): Builder {
-            mPageLayout.mError = mInflater.inflate(error, mPageLayout, false)
+            mPageLayout.mError = errorView
+            mTvError = errorClickTv
+            errorClick(mTvError)
             return this
         }
 
+        fun setError(errorView: View, errorClickId: Int): Builder {
+            mPageLayout.mError = errorView
+            mTvError = errorView.findViewById(errorClickId)
+            errorClick(mTvError)
+            return this
+        }
+
+        private fun errorClick(errorClickView: View) {
+            if (mOnRetryClickListener != null) {
+                errorClickView.setOnClickListener {
+                    mOnRetryClickListener?.onRetry()
+                }
+            } else {
+                throw NullPointerException("Please setOnRetryClickListener")
+            }
+        }
+
         fun setEmpty(empty: Int): Builder {
             mPageLayout.mEmpty = mInflater.inflate(empty, null, false)
             return this