feat: 优化代码

app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
 import android.view.Gravity
@@ -19,6 +20,7 @@ import io.legado.app.constant.AppConst
 import io.legado.app.data.entities.RssSource
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.ATH
+import io.legado.app.ui.qrcode.QrCodeActivity
 import io.legado.app.ui.rss.source.debug.RssSourceDebugActivity
 import io.legado.app.ui.widget.KeyboardToolPop
 import io.legado.app.utils.GSON
@@ -26,19 +28,17 @@ import io.legado.app.utils.applyTint
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.shareWithQr
 import kotlinx.android.synthetic.main.activity_rss_source_edit.*
-import org.jetbrains.anko.displayMetrics
+import org.jetbrains.anko.*
-import org.jetbrains.anko.share
-import org.jetbrains.anko.startActivity
-import org.jetbrains.anko.toast
 import kotlin.math.abs
 
 class RssSourceEditActivity :
     VMBaseActivity<RssSourceEditViewModel>(R.layout.activity_rss_source_edit, false),
+    ViewTreeObserver.OnGlobalLayoutListener,
     KeyboardToolPop.CallBack {
 
     private var mSoftKeyboardTool: PopupWindow? = null
     private var mIsSoftKeyBoardShowing = false
-
+    private val qrRequestCode = 101
     private val adapter = RssSourceEditAdapter()
     private val sourceEntities: ArrayList<EditEntity> = ArrayList()
 
@@ -103,6 +103,7 @@ class RssSourceEditActivity :
                     clipboard?.setPrimaryClip(ClipData.newPlainText(null, sourceStr))
                 }
             }
+            R.id.menu_qr_code_camera -> startActivityForResult<QrCodeActivity>(qrRequestCode)
             R.id.menu_paste_source -> viewModel.pasteSource { upRecyclerView(it) }
             R.id.menu_share_str -> GSON.toJson(getRssSource())?.let { sourceStr ->
                 share(sourceStr)
@@ -117,7 +118,7 @@ class RssSourceEditActivity :
     private fun initView() {
         ATH.applyEdgeEffectColor(recycler_view)
         mSoftKeyboardTool = KeyboardToolPop(this, AppConst.keyboardToolChars, this)
-        window.decorView.viewTreeObserver.addOnGlobalLayoutListener(KeyboardOnGlobalChangeListener())
+        window.decorView.viewTreeObserver.addOnGlobalLayoutListener(this)
         recycler_view.layoutManager = LinearLayoutManager(this)
         recycler_view.adapter = adapter
     }
@@ -208,23 +209,34 @@ class RssSourceEditActivity :
         mSoftKeyboardTool?.dismiss()
     }
 
-    private inner class KeyboardOnGlobalChangeListener : ViewTreeObserver.OnGlobalLayoutListener {
+    override fun onGlobalLayout() {
-        override fun onGlobalLayout() {
+        val rect = Rect()
-            val rect = Rect()
+        // 获取当前页面窗口的显示范围
-            // 获取当前页面窗口的显示范围
+        window.decorView.getWindowVisibleDisplayFrame(rect)
-            window.decorView.getWindowVisibleDisplayFrame(rect)
+        val screenHeight = this@RssSourceEditActivity.displayMetrics.heightPixels
-            val screenHeight = this@RssSourceEditActivity.displayMetrics.heightPixels
+        val keyboardHeight = screenHeight - rect.bottom // 输入法的高度
-            val keyboardHeight = screenHeight - rect.bottom // 输入法的高度
+        val preShowing = mIsSoftKeyBoardShowing
-            val preShowing = mIsSoftKeyBoardShowing
+        if (abs(keyboardHeight) > screenHeight / 5) {
-            if (abs(keyboardHeight) > screenHeight / 5) {
+            mIsSoftKeyBoardShowing = true // 超过屏幕五分之一则表示弹出了输入法
-                mIsSoftKeyBoardShowing = true // 超过屏幕五分之一则表示弹出了输入法
+            recycler_view.setPadding(0, 0, 0, 100)
-                recycler_view.setPadding(0, 0, 0, 100)
+            showKeyboardTopPopupWindow()
-                showKeyboardTopPopupWindow()
+        } else {
-            } else {
+            mIsSoftKeyBoardShowing = false
-                mIsSoftKeyBoardShowing = false
+            recycler_view.setPadding(0, 0, 0, 0)
-                recycler_view.setPadding(0, 0, 0, 0)
+            if (preShowing) {
-                if (preShowing) {
+                closePopupWindow()
-                    closePopupWindow()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            qrRequestCode -> if (resultCode == RESULT_OK) {
+                data?.getStringExtra("result")?.let {
+                    viewModel.importSource(it) { source: RssSource ->
+                        upRecyclerView(source)
+                    }
                 }
             }
         }

app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditViewModel.kt

@@ -71,4 +71,16 @@ class RssSourceEditViewModel(application: Application) : BaseViewModel(applicati
             }
         }
     }
+
+    fun importSource(text: String, finally: (source: RssSource) -> Unit) {
+        execute {
+            val text1 = text.trim()
+            GSON.fromJsonObject<RssSource>(text1)?.let {
+                finally.invoke(it)
+            }
+        }.onError {
+            toast(it.localizedMessage ?: "Error")
+        }
+    }
+
 }

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -50,7 +50,7 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
         get() = getViewModel(RssSourceViewModel::class.java)
     private val importRecordKey = "rssSourceRecordKey"
     private val qrRequestCode = 101
-    private val importSource = 13141
+    private val importSource = 124
     private lateinit var adapter: RssSourceAdapter
     private var sourceLiveData: LiveData<List<RssSource>>? = null
     private var groups = hashSetOf<String>()