From b704df61097e3f4e3381c0af548421bcd661ce93 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Tue, 22 Jun 2021 18:45:29 +0800 Subject: [PATCH] =?UTF-8?q?UI=E8=B5=B0=E6=9F=A5=20=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=9D=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/view/SlidePanelView.java | 7 +++++-- OCH/mogo-och/src/main/res/values/attrs.xml | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java index fd2c4ddd65..8f2e12b9a6 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/view/SlidePanelView.java @@ -50,6 +50,7 @@ public class SlidePanelView extends View { NORMAL_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_NORMAL_TEXT_MARGIN_RIGHT, NORMAL_TEXT_MARGIN_RIGHT); SHORT_TEXT_MARGIN_LEFT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_LEFT, SHORT_TEXT_MARGIN_LEFT); SHORT_TEXT_MARGIN_RIGHT = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SHORT_TEXT_MARGIN_RIGHT, SHORT_TEXT_MARGIN_RIGHT); + SLIDEPANELVIEW_VIEW_HIGH = (int) mTypedArray.getDimension(R.styleable.SlidePanelView_SLIDEPANELVIEW_VIEW_HIGH, SLIDEPANELVIEW_VIEW_HIGH); init(); } @@ -64,6 +65,7 @@ public class SlidePanelView extends View { private static int NORMAL_TEXT_MARGIN_RIGHT = 60; private static int SHORT_TEXT_MARGIN_LEFT = 60; private static int SHORT_TEXT_MARGIN_RIGHT = 70; + private static int SLIDEPANELVIEW_VIEW_HIGH = 160; private int textMarginLeft = NORMAL_TEXT_MARGIN_LEFT; private int textMarginRight = NORMAL_TEXT_MARGIN_RIGHT; @@ -148,7 +150,8 @@ public class SlidePanelView extends View { // 高度根据图片大小和上下间隔确定 textPaint.getTextBounds(blockText, 0, blockText.length(), textRect); widthSize = BLOCK_START_X * 2 + bmBlock.getWidth() + textMarginLeft + textMarginRight + textRect.width(); - heightSize = BLOCK_START_Y * 2 + bmBlock.getHeight(); +// heightSize = BLOCK_START_Y * 2 + bmBlock.getHeight(); + heightSize = SLIDEPANELVIEW_VIEW_HIGH; widthMeasureSpec = MeasureSpec.makeMeasureSpec(widthSize, widthMode); heightMeasureSpec = MeasureSpec.makeMeasureSpec(heightSize, heightMode); } @@ -245,7 +248,7 @@ public class SlidePanelView extends View { protected void onDraw(Canvas canvas) { super.onDraw(canvas); // 画背景 - canvas.drawRoundRect(bgRectF, (float) getHeight() / 2, (float) getHeight() / 2, bgPaint); + canvas.drawRoundRect(bgRectF, (float) getHeight() / 2, SLIDEPANELVIEW_VIEW_HIGH / 2, bgPaint); // 画文字 gradientMatrix.setTranslate(matrixTranslate, 0); textGradient.setLocalMatrix(gradientMatrix); diff --git a/OCH/mogo-och/src/main/res/values/attrs.xml b/OCH/mogo-och/src/main/res/values/attrs.xml index 33fc037d9c..24c52520f0 100644 --- a/OCH/mogo-och/src/main/res/values/attrs.xml +++ b/OCH/mogo-och/src/main/res/values/attrs.xml @@ -6,6 +6,7 @@ +