up

app/src/main/java/io/legado/app/App.kt

@@ -143,7 +143,7 @@ class App : Application() {
     private fun registerActivityLife(){
         registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks{
             override fun onActivityPaused(activity: Activity) {
-                ActivityHelp.getInstance().add(activity)
+                ActivityHelp.add(activity)
             }
 
             override fun onActivityResumed(activity: Activity) {
@@ -153,7 +153,7 @@ class App : Application() {
             }
 
             override fun onActivityDestroyed(activity: Activity) {
-                ActivityHelp.getInstance().remove(activity)
+                ActivityHelp.remove(activity)
             }
 
             override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {

app/src/main/java/io/legado/app/help/ActivityHelp.kt

@@ -7,27 +7,10 @@ import java.util.*
 /**
  * Activity管理器,管理项目中Activity的状态
  */
-class ActivityHelp private constructor() {
+object ActivityHelp {
-
-    companion object {
 
     private var activities: MutableList<WeakReference<Activity>> = arrayListOf()
 
-        @Volatile
-        private var instance: ActivityHelp? = null
-
-        fun getInstance(): ActivityHelp {
-            if (null == instance) {
-                synchronized(ActivityHelp::class.java) {
-                    if (null == instance) {
-                        instance = ActivityHelp()
-                    }
-                }
-            }
-            return instance!!
-        }
-    }
-
     fun getActivities(): List<WeakReference<Activity>> {
         return activities
     }

app/src/main/java/io/legado/app/help/ReadBookHelp.kt

@@ -0,0 +1,10 @@
+package io.legado.app.help
+
+import android.graphics.drawable.Drawable
+
+object ReadBookHelp {
+
+    var bg: Drawable? = null
+
+
+}

app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt

@@ -46,7 +46,7 @@ class MediaButtonReceiver : BroadcastReceiver() {
         }
 
         private fun readAloud(context: Context) {
-            ActivityHelp.getInstance().isExist(ReadBookActivity::class.java).let {
+            ActivityHelp.isExist(ReadBookActivity::class.java).let {
                 if (!it) {
                     context.startActivity<ReadBookActivity>()
                 }

app/src/main/java/io/legado/app/ui/widget/page/PageView.kt

@@ -3,15 +3,12 @@ package io.legado.app.ui.widget.page
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
-import android.graphics.Color
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.widget.FrameLayout
 import io.legado.app.R
 import io.legado.app.ui.widget.page.delegate.CoverPageDelegate
 import io.legado.app.ui.widget.page.delegate.PageDelegate
-import kotlinx.android.synthetic.main.view_book_page.view.*
-import org.jetbrains.anko.backgroundColor
 
 class PageView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs), PageDelegate.PageInterface {
 
@@ -32,8 +29,6 @@ class PageView(context: Context, attrs: AttributeSet) : FrameLayout(context, att
         upBg()
         setWillNotDraw(false)
 
-        page_panel.backgroundColor = Color.WHITE
-
         pageDelegate = CoverPageDelegate(this)
     }