🐛 💄

[Update] - 优化了过场动画 [Fix] - 阅读界面依然能打开侧边栏的 BUG
rosuH · Mar 6, 2019 · ccc5611 · ccc5611
1 parent 0563a72
commit ccc5611
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "me.rosuh.android.jianews"
         minSdkVersion 22
         targetSdkVersion 28
-        versionCode 10
-        versionName "0.8.6"
+        versionCode 11
+        versionName "0.8.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 //    signingConfigs {

diff --git a/app/src/main/java/me/rosuh/jianews/util/DrawerLocker.kt b/app/src/main/java/me/rosuh/jianews/util/DrawerLocker.kt
@@ -0,0 +1,10 @@
+package me.rosuh.jianews.util
+
+/**
+ *
+ * @author rosuh
+ * @date 2019/3/7
+ */
+interface DrawerLocker {
+    fun setDrawerLocked(shouldLock:Boolean)
+}
diff --git a/app/src/main/java/me/rosuh/jianews/view/ArticleReadingFrag.kt b/app/src/main/java/me/rosuh/jianews/view/ArticleReadingFrag.kt
@@ -21,6 +21,7 @@ import kotlinx.coroutines.Dispatchers
 import me.rosuh.android.jianews.R
 import me.rosuh.jianews.bean.ArticleBean
 import me.rosuh.jianews.util.Const
+import me.rosuh.jianews.util.DrawerLocker
 
 /**
  * 这个类是文章阅读页面的 AppCompatActivity 类
@@ -61,6 +62,11 @@ class ArticleReadingFrag : BaseFragment(), CoroutineScope {
         }
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        (activity as DrawerLocker).setDrawerLocked(true)
+    }
+
     private fun initWebView(view: View) {
         webView = view.findViewById(R.id.wv_reading)
         with(webView.settings) {
@@ -140,17 +146,20 @@ class ArticleReadingFrag : BaseFragment(), CoroutineScope {
     override fun onHiddenChanged(hidden: Boolean) {
         if (hidden) {
             reset()
+            (activity as DrawerLocker).setDrawerLocked(false)
+        }else{
+            (activity as DrawerLocker).setDrawerLocked(true)
         }
         super.onHiddenChanged(hidden)
     }
 
     fun updateBean(newBean: ArticleBean) {
         this.articleBean = newBean
+        webView.loadUrl("")
         webViewLoad(newBean.content)
     }
 
     private fun reset(){
-        webView.loadUrl("")
         fontItemView = null
         mFontPopupMenu = null
     }

diff --git a/app/src/main/java/me/rosuh/jianews/view/HomeActivity.kt b/app/src/main/java/me/rosuh/jianews/view/HomeActivity.kt
@@ -25,13 +25,14 @@ import me.rosuh.jianews.util.GlideApp
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import me.rosuh.jianews.bean.ArticleBean
+import me.rosuh.jianews.util.DrawerLocker
 import me.rosuh.jianews.view.ArticleReadingFrag.Companion.READING_FRAGMENT_TAG
 
 /**
  * 首页 Activity
  * @author rosu
  */
-class HomeActivity : AppCompatActivity() {
+class HomeActivity : AppCompatActivity(), DrawerLocker{
 
     private var isExit = false
 
@@ -147,6 +148,14 @@ class HomeActivity : AppCompatActivity() {
         }
     }
 
+    override fun setDrawerLocked(shouldLock: Boolean) {
+        if (shouldLock){
+            dl_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+        }else{
+            dl_home.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+        }
+    }
+
     /**
      * 判断 Fragment 是否已经实例化
      */
@@ -170,8 +179,8 @@ class HomeActivity : AppCompatActivity() {
                 setCustomAnimations(
                     R.anim.push_left_in, R.anim.push_right_out
                 )
-                hide(readingFrag)
                 show(homeFragment)
+                hide(readingFrag)
                 commit()
             }
         }