Merge branch 'hotfix-v5.22.0-570-crashes' into 'release'

Hotfix v5.22.0 570 crashes

See merge request halo/android/assistant-android!869
This commit is contained in:
陈君陶
2023-04-03 12:00:06 +08:00
2 changed files with 3 additions and 2 deletions

View File

@ -33,13 +33,14 @@ import okhttp3.RequestBody
import org.json.JSONException
import org.json.JSONObject
import java.util.*
import java.util.concurrent.CopyOnWriteArrayList
object PackageObserver {
private val mPackageViewModel: PackageViewModel
by lazy { PackageViewModel(HaloApp.getInstance().application, PackageRepository) }
private val mPackageChangeListenerList = Collections.synchronizedList(ArrayList<PackageChangeListener>())
private val mPackageChangeListenerList = CopyOnWriteArrayList<PackageChangeListener>()
fun registerPackageChangeChangeListener(listener: PackageChangeListener) {
mPackageChangeListenerList.add(listener)

View File

@ -440,7 +440,7 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS
fun showFullPauseBitmap() {
mThumbImageViewLayout.visibility = View.VISIBLE
findViewById<ImageView>(R.id.thumbImage).setImageBitmap(mFullPauseBitmap)
findViewById<ImageView>(R.id.thumbImage).setImageBitmap(mTextureView.initCover())
}
override fun changeUiToCompleteShow() {