From f862a330a920f5c348d2ebd8d566f45b2694ef91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E5=85=B5=E5=85=B5?= Date: Tue, 8 Jun 2021 16:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mancj/example/RoundRectView.java | 4 ++-- .../materialripple/MaterialRippleLayout.java | 15 ++++----------- .../materialripple/TypedAttrUtils.java | 4 ---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/mancj/example/RoundRectView.java b/app/src/main/java/com/mancj/example/RoundRectView.java index 1b05bbe..fd7b36e 100644 --- a/app/src/main/java/com/mancj/example/RoundRectView.java +++ b/app/src/main/java/com/mancj/example/RoundRectView.java @@ -8,7 +8,7 @@ import ohos.media.image.PixelMap; import ohos.media.image.common.Size; public class RoundRectView extends Image { - private static final int radius = 160;//圆角半径，如果设置成图片的宽度的一半，则会图片变成圆形 + private static final int RADIUS = 160;//圆角半径，如果设置成图片的宽度的一半，则会图片变成圆形 private PixelMapHolder pixelMapHolder;//像素图片持有者 private RectFloat rectDst;//目标区域 private RectFloat rectSrc;//源区域 @@ -37,7 +37,7 @@ public class RoundRectView extends Image { } synchronized (pixelMapHolder) { //绘制圆角矩形图片 - canvas.drawPixelMapHolderRoundRectShape(pixelMapHolder, rectSrc, rectDst, radius, radius); + canvas.drawPixelMapHolderRoundRectShape(pixelMapHolder, rectSrc, rectDst, RADIUS, RADIUS); pixelMapHolder = null; } }); diff --git a/library/src/main/java/com/mancj/materialsearchbar/materialripple/MaterialRippleLayout.java b/library/src/main/java/com/mancj/materialsearchbar/materialripple/MaterialRippleLayout.java index a0d9cd2..9b26286 100644 --- a/library/src/main/java/com/mancj/materialsearchbar/materialripple/MaterialRippleLayout.java +++ b/library/src/main/java/com/mancj/materialsearchbar/materialripple/MaterialRippleLayout.java @@ -1,4 +1,5 @@ -/* + +/** * Copyright (C) 2014 Balys Valentukevicius * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +17,7 @@ package com.mancj.materialsearchbar.materialripple; +import com.mancj.materialsearchbar.materialripple.TypedAttrUtils; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorValue; import ohos.agp.colors.RgbColor; @@ -30,8 +32,6 @@ import ohos.agp.window.service.DisplayManager; import ohos.app.Context; import ohos.eventhandler.EventHandler; import ohos.eventhandler.EventRunner; -import ohos.hiviewdfx.HiLog; -import ohos.hiviewdfx.HiLogLabel; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; @@ -39,10 +39,8 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch Component.DrawTask, Component.ClickedListener { - static final HiLogLabel label = new HiLogLabel(HiLog.LOG_APP, 0x00201, "RippleView");//MY_MODULE=0x00201 private Component childView; - private static final int DEFAULT_LONG_PRESS_TIMEOUT = 500; private static final boolean DEFAULT_DELAY_CLICK = true; private static final float DEFAULT_ALPHA = 0.2f; private static final int DEFAULT_DURATION = 350; @@ -134,8 +132,6 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch rippleDuration = TypedAttrUtils.getInteger(attrSet, "mrl_rippleDuration", DEFAULT_DURATION); rippleDiameter = TypedAttrUtils.getFloat(attrSet, "mrl_rippleDiameterDp", DEFAULT_DIAMETER_DP); rippleOverlay = TypedAttrUtils.getBoolean(attrSet, "mrl_rippleOverlay", DEFAULT_RIPPLE_OVERLAY); - HiLog.info(label, "initAttrs rippleDiameter = " + rippleDiameter); - HiLog.info(label, "initAttrs rippleDuration = " + rippleDuration); } /** @@ -152,7 +148,6 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch @Override public void onDraw(Component component, Canvas canvas) { - HiLog.info(label, "initAttrs onDraw getWidth = " + getWidth() + " getRadius() : " + getRadius()); if (null != mOuterLineDrawable) { mOuterLineDrawable.drawToCanvas(canvas); } @@ -182,7 +177,6 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch if (v <= 0) { return; } - HiLog.info(label, "%{public}s , %{public}s", "mRadiusRipple : " + mRadiusRipple + " ==: mRadiusRipple * v : " + mRadiusRipple * v, " v ===" + v + " rippleDuration : " + rippleDuration); float currentRadius = rippleDiameter + maxRadius * v; if (currentRadius < rippleDiameter) { setRadius(rippleDiameter); @@ -267,7 +261,6 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch public void onEnd(Animator animator) { mOuterLineDrawable = generateTransparentBackgroundDrawable(); if (rippleOverlay && mFingerUp) { - HiLog.info(label, "onEnd ---rippleOverlay : " + rippleOverlay + " ----mFingerUp : " + mFingerUp); setRadius(0); invalidate(); } @@ -673,7 +666,7 @@ public class MaterialRippleLayout extends StackLayout implements Component.Touch } layout.addComponent(child, new ComponentContainer.LayoutConfig(ComponentContainer.LayoutConfig.MATCH_PARENT, ComponentContainer.LayoutConfig.MATCH_PARENT)); -// + if (parent != null) { parent.addComponent(layout, index, params); // parent.addView(layout, index, params); diff --git a/library/src/main/java/com/mancj/materialsearchbar/materialripple/TypedAttrUtils.java b/library/src/main/java/com/mancj/materialsearchbar/materialripple/TypedAttrUtils.java index 7596211..e5a1615 100644 --- a/library/src/main/java/com/mancj/materialsearchbar/materialripple/TypedAttrUtils.java +++ b/library/src/main/java/com/mancj/materialsearchbar/materialripple/TypedAttrUtils.java @@ -20,13 +20,10 @@ package com.mancj.materialsearchbar.materialripple; import ohos.agp.components.Attr; import ohos.agp.components.AttrSet; import ohos.agp.utils.Color; -import ohos.hiviewdfx.HiLog; -import ohos.hiviewdfx.HiLogLabel; import java.util.NoSuchElementException; final class TypedAttrUtils { - static final HiLogLabel label = new HiLogLabel(HiLog.LOG_APP, 0x00201, "jiangbenfu"); public static int getIntColor(AttrSet attrs, String attrName, int defValue) { Attr attr = attrNoSuchElement(attrs, attrName); @@ -106,7 +103,6 @@ final class TypedAttrUtils { try { attr = attrs.getAttr(attrName).get(); } catch (NoSuchElementException e) { - HiLog.info(label, "Exception = " + e.toString()); } return attr; } -- Gitee