From d5dfdd2209461f52aa1a70e21f649301fc5b1885 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 28 Nov 2023 13:25:47 +0800 Subject: [PATCH] [6.2.0] [charter] [revert] --- .../com/magic/mogo/och/charter/view/SlidePanelView.kt | 8 +++----- gradle/bytex/bytex.gradle | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt index 3acbacbc59..74c639ca82 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/SlidePanelView.kt @@ -8,7 +8,6 @@ import android.util.AttributeSet import android.view.MotionEvent import android.view.View import android.view.animation.DecelerateInterpolator -import androidx.core.graphics.scale import com.magic.mogo.och.charter.R import com.mogo.commons.AbsMogoApplication import me.jessyan.autosize.AutoSizeConfig @@ -86,10 +85,9 @@ class SlidePanelView @JvmOverloads constructor( val size = AutoSizeUtils.dp2px(context, 120f) val opts = BitmapFactory.Options() opts.inDensity = AutoSizeConfig.getInstance().initDensity.toInt() - bmBlock = (BitmapFactory.decodeResource(resources, R.drawable.charter_base_slide_block, opts) as Bitmap).apply { - scale(size,size) - blockWidth = width - } + bmBlock = BitmapFactory.decodeResource(resources, R.drawable.charter_base_slide_block, opts) + bmBlock = Bitmap.createScaledBitmap(bmBlock!!, size, size, true) + blockWidth = bmBlock!!.getWidth() } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { diff --git a/gradle/bytex/bytex.gradle b/gradle/bytex/bytex.gradle index daa366db18..e7234ebe60 100644 --- a/gradle/bytex/bytex.gradle +++ b/gradle/bytex/bytex.gradle @@ -13,7 +13,7 @@ if (!isAndroidTest) { apply from: rootProject.file('gradle/bytex/bytex_log_chain.gradle') apply from: rootProject.file('gradle/bytex/bytex_sticky_service.gradle') apply from: rootProject.file('gradle/bytex/bytex_thread_opt.gradle') - apply from: rootProject.file('gradle/bytex/bytex_lancetx.gradle') +// apply from: rootProject.file('gradle/bytex/bytex_lancetx.gradle') apply from: rootProject.file('gradle/bytex/bytex_apm.gradle') apply from: rootProject.file('gradle/bytex/bytex_systrace.gradle') apply from: rootProject.file('gradle/bytex/bytex_matrix.gradle')