From e4360550669594f5d3d20951d8bf85743d6680e3 Mon Sep 17 00:00:00 2001 From: zhenxiong han Date: Mon, 30 Aug 2021 10:08:55 +0800 Subject: [PATCH] update --- README.md | 3 +-- entry/build.gradle | 2 +- .../cc/cloudist/acplibrary/ACProgressFlower.java | 16 ++-------------- .../cc/cloudist/acplibrary/views/FlowerView.java | 12 ++++++------ 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 996b468..863e723 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ repositories { // 添加依赖库 dependencies { -implementation('com.gitee.chinasoft_ohos:ACProgressLite:0.0.2-SNAPSHOT') +implementation('com.gitee.chinasoft_ohos:ACProgressLite:0.0.3-SNAPSHOT') ...... } @@ -119,7 +119,6 @@ textSize|文字大小 textColor|文字颜色 textAlpha|文字透明度 textMarginTop|文字与花瓣之间的距离 -isTextExpandWidth|在设置了文字的情况下是否扩展背景大小值正方形。设置了文字会导致背景高度变大，如果设为`true`花瓣仍然根据sizeRatio的大小绘制但整个宽度会扩展至与高度相等，花瓣水平居中；如果设为`false`背景为长方形 * **圆饼类型** 适合显示进度，支持自动更新进度或者手动更新进度。 diff --git a/entry/build.gradle b/entry/build.gradle index 5fac253..b78335c 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -19,7 +19,7 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) // implementation project(path: ':library') - implementation('com.gitee.chinasoft_ohos:ACProgressLite:0.0.2-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:ACProgressLite:0.0.3-SNAPSHOT') testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' } diff --git a/library/src/main/java/cc/cloudist/acplibrary/ACProgressFlower.java b/library/src/main/java/cc/cloudist/acplibrary/ACProgressFlower.java index 8e895dc..7510378 100644 --- a/library/src/main/java/cc/cloudist/acplibrary/ACProgressFlower.java +++ b/library/src/main/java/cc/cloudist/acplibrary/ACProgressFlower.java @@ -41,7 +41,7 @@ public class ACProgressFlower extends ACProgressBaseDialog{ mFlowerView = new FlowerView(mBuilder.mContext, size, windowWidth, mBuilder.mBackgroundColor, mBuilder.mBackgroundAlpha, mBuilder.mBackgroundCornerRadius , mBuilder.mPetalThickness, mBuilder.mPetalCount, mBuilder.mPetalAlpha, mBuilder.mBorderPadding, mBuilder.mCenterPadding , mBuilder.mThemeColor, mBuilder.mFadeColor - , mBuilder.mText, mBuilder.mTextSize, mBuilder.mTextColor, mBuilder.mTextAlpha, mBuilder.mTextMarginTop, mBuilder.mTextExpandWidth); + , mBuilder.mText, mBuilder.mTextSize, mBuilder.mTextColor, mBuilder.mTextAlpha, mBuilder.mTextMarginTop); } setContentCustomComponent(mFlowerView); mFlowerView.setTouchEventListener(new Component.TouchEventListener() { @@ -103,7 +103,7 @@ public class ACProgressFlower extends ACProgressBaseDialog{ private float mTextAlpha = 0.5f; private int mTextSize = 40; private int mTextMarginTop = 40; - private boolean mTextExpandWidth = true; + public float getSizeRatio() { @@ -250,14 +250,6 @@ public class ACProgressFlower extends ACProgressBaseDialog{ this.mTextMarginTop = mTextMarginTop; } - public boolean isTextExpandWidth() { - return mTextExpandWidth; - } - - public void setTextExpandWidth(boolean mTextExpandWidth) { - this.mTextExpandWidth = mTextExpandWidth; - } - public Builder(Context context) { mContext = context; } @@ -353,10 +345,6 @@ public class ACProgressFlower extends ACProgressBaseDialog{ return this; } - public Builder isTextExpandWidth(boolean isTextExpandWidth) { - mTextExpandWidth = isTextExpandWidth; - return this; - } public ACProgressFlower build() { return new ACProgressFlower(this); diff --git a/library/src/main/java/cc/cloudist/acplibrary/views/FlowerView.java b/library/src/main/java/cc/cloudist/acplibrary/views/FlowerView.java index f549273..4c7df7e 100644 --- a/library/src/main/java/cc/cloudist/acplibrary/views/FlowerView.java +++ b/library/src/main/java/cc/cloudist/acplibrary/views/FlowerView.java @@ -43,7 +43,7 @@ public final class FlowerView extends Component implements Component.EstimateSiz Context context, int size, int windowWidth, int bgColor, float bgAlpha, float bgCornerRadius , int petalThickness, int petalCount, float petalAlpha, float borderPadding, float centerPadding , int themeColor, int fadeColor - , String text, int textSize, int textColor, float textAlpha, int textMarginTop, boolean textExpandWidth) { + , String text, int textSize, int textColor, float textAlpha, int textMarginTop) { super(context); setEstimateSizeListener(this); this.windowWidth = windowWidth; @@ -53,16 +53,16 @@ public final class FlowerView extends Component implements Component.EstimateSiz this.mContext = context; init(size, bgColor, bgAlpha, bgCornerRadius, petalThickness, petalCount, petalAlpha, borderPadding, centerPadding, themeColor, fadeColor, - text, textSize, textColor, textAlpha, textExpandWidth); + text, textSize, textColor, textAlpha); } private void init( int size, int bgColor, float bgAlpha, float bgCornerRadius , int petalThickness, int petalCount, float petalAlpha, float borderPadding, float centerPadding , int themeColor, int fadeColor - , String text, int textSize, int textColor, float textAlpha, boolean textExpandWidth) { + , String text, int textSize, int textColor, float textAlpha) { + - boolean mIsExpandWidth = (text != null && text.length() != 0 && textExpandWidth); this.setClipEnabled(false); @@ -74,7 +74,7 @@ public final class FlowerView extends Component implements Component.EstimateSiz mBackgroundPaint.setAntiAlias(true); Color color = new Color(bgColor); mBackgroundPaint.setColor(color); - mBackgroundPaint.setAlpha(0.2f); + mBackgroundPaint.setAlpha(bgAlpha); mPetalPaint = new Paint(); mPetalPaint.setAntiAlias(true); @@ -86,7 +86,7 @@ public final class FlowerView extends Component implements Component.EstimateSiz mTextPaint = new Paint(); mTextPaint.setAntiAlias(true); mTextPaint.setColor(new Color(textColor)); - mTextPaint.setAlpha(0.7f); + mTextPaint.setAlpha(textAlpha); mTextPaint.setTextSize(textSize); mTextPaint.getTextBounds(text); mTextPaint.setTextAlign(TextAlignment.CENTER); -- Gitee