From dbde3d051bac41d99d3d251a384f45a136b6fad2 Mon Sep 17 00:00:00 2001 From: 15296721452 <123> Date: Tue, 8 Jun 2021 16:39:13 +0800 Subject: [PATCH 1/5] README.OPENSOURCE --- CHANGELOG.md | 2 +- .../customview/customview/MainAbility.java | 1 + .../customview/slice/MainAbilitySlice.java | 1 + .../mylibrary/DataAnimatorValue.java | 2 +- .../customview/mylibrary/FiveLine.java | 15 +++--- .../mylibrary/FourCirlceRotate.java | 50 +++++++++--------- .../customview/mylibrary/ManyCircle.java | 52 +++++++++---------- .../customview/mylibrary/PPTVLoading.java | 27 +++++----- .../mylibrary/PointToLineRotate.java | 1 - .../customview/mylibrary/SquareLine.java | 10 ++-- .../customview/mylibrary/TaiJiButton.java | 26 +++++----- .../customview/mylibrary/WindowsLoad.java | 38 +++++++------- .../customview/mylibrary/spring/GameMap.java | 39 +++++++------- .../mylibrary/spring/GameStart.java | 2 +- .../mylibrary/spring/SpringView.java | 31 +++++------ .../customview/mylibrary/star/StarCircle.java | 35 +++++++------ .../customview/mylibrary/tool/Move.java | 13 ++--- .../customview/mylibrary/tool/Rotate.java | 4 +- .../customview/mylibrary/tool/ScreenUtil.java | 8 +-- .../mylibrary/view58/Loading58Path.java | 30 ++++++----- .../mylibrary/view58/Loding58View.java | 17 +++--- 21 files changed, 205 insertions(+), 199 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f50570d..d6cfc02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 0.0.1-SNAPSHOT ohos 第一个版本 -* 实现了原库大部分全部功能 +* 实现了原库大部分功能 * ohos没有自定义插值器，WindowsLoad效果有差异 \ No newline at end of file diff --git a/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/MainAbility.java b/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/MainAbility.java index 6c73bf2..a0a6270 100644 --- a/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/MainAbility.java +++ b/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/MainAbility.java @@ -1,6 +1,7 @@ package com.bcgtgjyb.huanwen.customview.customview; import com.bcgtgjyb.huanwen.customview.customview.slice.MainAbilitySlice; + import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; /** diff --git a/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/slice/MainAbilitySlice.java b/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/slice/MainAbilitySlice.java index e0f1d15..1a12b25 100644 --- a/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/slice/MainAbilitySlice.java +++ b/app/src/main/java/com/bcgtgjyb/huanwen/customview/customview/slice/MainAbilitySlice.java @@ -2,6 +2,7 @@ package com.bcgtgjyb.huanwen.customview.customview.slice; import com.bcgtgjyb.huanwen.customview.customview.ResourceTable; import com.bcgtgjyb.huanwen.customview.mylibrary.TaiJiButton; + import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/DataAnimatorValue.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/DataAnimatorValue.java index 6922f73..3261569 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/DataAnimatorValue.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/DataAnimatorValue.java @@ -18,7 +18,7 @@ import ohos.agp.animation.AnimatorValue; * limitations under the License. */ public class DataAnimatorValue extends AnimatorValue implements AnimatorValue.ValueUpdateListener { - float start, end, curValue; + float start,end,curValue; public void setStart(float start) { this.start = start; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FiveLine.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FiveLine.java index ca6de59..1eb44a8 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FiveLine.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FiveLine.java @@ -17,7 +17,6 @@ package com.bcgtgjyb.huanwen.customview.mylibrary; import ohos.agp.animation.Animator; -import ohos.agp.animation.AnimatorValue; import ohos.agp.components.AttrSet; import ohos.agp.components.Component; import ohos.agp.render.Canvas; @@ -106,13 +105,13 @@ public class FiveLine extends Component implements Component.DrawTask { } private DataAnimatorValue getValueAnimator() { - DataAnimatorValue valueAnimator = new DataAnimatorValue(); - valueAnimator.setStart(-1); - valueAnimator.setEnd(1); - valueAnimator.setDuration(1500); - valueAnimator.setCurveType(Animator.CurveType.LINEAR); - valueAnimator.start(); - return valueAnimator; + DataAnimatorValue animator = new DataAnimatorValue(); + animator.setStart(-1); + animator.setEnd(1); + animator.setDuration(1500); + animator.setCurveType(Animator.CurveType.LINEAR); + animator.start(); + return animator; } @Override diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FourCirlceRotate.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FourCirlceRotate.java index 84633a0..2ac7c36 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FourCirlceRotate.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/FourCirlceRotate.java @@ -24,7 +24,7 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { private DataAnimatorValue valueAnimator; private int delay = 500; private boolean isInit = false; - private float R = 0; + private float mR = 0; private boolean isStop = false; private float where = 0; @@ -61,7 +61,7 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { } else { valueAnimator.start(); } - R = getWidth() / 6; + mR = getWidth() / 6; eventHandler.postTask(new Runnable() { @Override public void run() { @@ -83,13 +83,13 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { } private DataAnimatorValue getValueAnimator() { - DataAnimatorValue valueAnimator = new DataAnimatorValue(); - valueAnimator.setStart(0f); - valueAnimator.setEnd(8f); - valueAnimator.setDuration(4000); - valueAnimator.setCurveType(Animator.CurveType.LINEAR); - valueAnimator.start(); - return valueAnimator; + DataAnimatorValue animator = new DataAnimatorValue(); + animator.setStart(0f); + animator.setEnd(8f); + animator.setDuration(4000); + animator.setCurveType(Animator.CurveType.LINEAR); + animator.start(); + return animator; } @Override @@ -99,63 +99,63 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { } // 显示固定的圆，逐个出现 if (show <= 4) { - canvas.drawCircle(R, R, R, paint2); + canvas.drawCircle(mR, mR, mR, paint2); } if (show <= 3) { - canvas.drawCircle(getWidth() - R, R, R, paint3); + canvas.drawCircle(getWidth() - mR, mR, mR, paint3); } if (show <= 2) { - canvas.drawCircle(getWidth() - R, getHeight() - R, R, paint4); + canvas.drawCircle(getWidth() - mR, getHeight() - mR, mR, paint4); } if (show <= 1) { - canvas.drawCircle(R, getHeight() - R, R, paint5); + canvas.drawCircle(mR, getHeight() - mR, mR, paint5); } // 逐个消失 if (show > 4) { if (show <= 4) { - canvas.drawCircle(R, R, R, paint2); + canvas.drawCircle(mR, mR, mR, paint2); } if (show <= 5) { - canvas.drawCircle(getWidth() - R, R, R, paint3); + canvas.drawCircle(getWidth() - mR, mR, mR, paint3); } if (show <= 6) { - canvas.drawCircle(getWidth() - R, getHeight() - R, R, paint4); + canvas.drawCircle(getWidth() - mR, getHeight() - mR, mR, paint4); } if (show <= 7) { - canvas.drawCircle(R, getHeight() - R, R, paint5); + canvas.drawCircle(mR, getHeight() - mR, mR, paint5); } } // 移动 if (where < 1 && where > 0) { - canvas.drawCircle(R + (getWidth() - 2 * R) * where, R, R, paint1); + canvas.drawCircle(mR + (getWidth() - 2 * mR) * where, mR, mR, paint1); show = 4; } if (where < 2 && where > 1) { - canvas.drawCircle(getHeight() - R, R + (getHeight() - 2 * R) * (where - 1), R, paint1); + canvas.drawCircle(getHeight() - mR, mR + (getHeight() - 2 * mR) * (where - 1), mR, paint1); show = 3; } if (where < 3 && where > 2) { - canvas.drawCircle(getWidth() - R - (getWidth() - 2 * R) * (where - 2), getHeight() - R, R, paint1); + canvas.drawCircle(getWidth() - mR - (getWidth() - 2 * mR) * (where - 2), getHeight() - mR, mR, paint1); show = 2; } if (where < 4 && where > 3) { - canvas.drawCircle(R, getHeight() - R - (getHeight() - 2 * R) * (where - 3), R, paint1); + canvas.drawCircle(mR, getHeight() - mR - (getHeight() - 2 * mR) * (where - 3), mR, paint1); show = 1; } if (where > 4 && where < 5) { - canvas.drawCircle(R + (getWidth() - 2 * R) * (where - 4), R, R, paint1); + canvas.drawCircle(mR + (getWidth() - 2 * mR) * (where - 4), mR, mR, paint1); show = 5; } if (where > 5 && where < 6) { - canvas.drawCircle(getHeight() - R, R + (getHeight() - 2 * R) * (where - 5), R, paint1); + canvas.drawCircle(getHeight() - mR, mR + (getHeight() - 2 * mR) * (where - 5), mR, paint1); show = 6; } if (where > 6 && where < 7) { - canvas.drawCircle(getWidth() - R - (getWidth() - 2 * R) * (where - 6), getHeight() - R, R, paint1); + canvas.drawCircle(getWidth() - mR - (getWidth() - 2 * mR) * (where - 6), getHeight() - mR, mR, paint1); show = 7; } if (where > 7 && where < 8) { - canvas.drawCircle(R, getHeight() - R - (getHeight() - 2 * R) * (where - 7), R, paint1); + canvas.drawCircle(mR, getHeight() - mR - (getHeight() - 2 * mR) * (where - 7), mR, paint1); show = 8; } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java index e6aa882..b286b99 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java @@ -18,7 +18,7 @@ public class ManyCircle extends Component implements Component.DrawTask { private int width; private int height; private float pi2; - private float rr; + private float mRadius; private Paint paint; private int maxRadius = 16; private DataAnimatorValue valueAnimator; @@ -76,15 +76,15 @@ public class ManyCircle extends Component implements Component.DrawTask { } // 分段函数 - private float f(float xx) { - if (xx <= maxRadius / 2) { - return xx; - } else if (xx < maxRadius) { - return maxRadius - xx; - } else if (xx < maxRadius * 3 / 2) { - return xx - maxRadius; + private float f(float radius) { + if (radius <= maxRadius / 2) { + return radius; + } else if (radius < maxRadius) { + return maxRadius - radius; + } else if (radius < maxRadius * 3 / 2) { + return radius - maxRadius; } else { - return 2 * maxRadius - xx; + return 2 * maxRadius - radius; } } @@ -96,26 +96,26 @@ public class ManyCircle extends Component implements Component.DrawTask { width = getWidth() / 2; height = getHeight() / 2; pi2 = 2 * (float) Math.PI; - rr = width - maxRadius; + mRadius = width - maxRadius; } - canvas.drawCircle((float) (width + rr * Math.sin(0)), - (float) (height + rr * Math.cos(0)), f(radiu + 0), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8)), - (float) (height + rr * Math.cos(pi2 / 8)), f(radiu + 2), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 2)), - (float) (height + rr * Math.cos(pi2 / 8 * 2)), f(radiu + 4), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 3)), - (float) (height + rr * Math.cos(pi2 / 8 * 3)), f(radiu + 6), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(0)), + (float) (height + mRadius * Math.cos(0)), f(radiu + 0), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8)), + (float) (height + mRadius * Math.cos(pi2 / 8)), f(radiu + 2), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 2)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 2)), f(radiu + 4), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 3)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 3)), f(radiu + 6), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 4)), - (float) (height + rr * Math.cos(pi2 / 8 * 4)), f(radiu + 8), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 5)), - (float) (height + rr * Math.cos(pi2 / 8 * 5)), f(radiu + 10), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 6)), - (float) (height + rr * Math.cos(pi2 / 8 * 6)), f(radiu + 12), paint); - canvas.drawCircle((float) (width + rr * Math.sin(pi2 / 8 * 7)), - (float) (height + rr * Math.cos(pi2 / 8 * 7)), f(radiu + 14), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 4)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 4)), f(radiu + 8), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 5)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 5)), f(radiu + 10), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 6)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 6)), f(radiu + 12), paint); + canvas.drawCircle((float) (width + mRadius * Math.sin(pi2 / 8 * 7)), + (float) (height + mRadius * Math.cos(pi2 / 8 * 7)), f(radiu + 14), paint); if (valueAnimator.isRunning()) { radiu = (float) valueAnimator.getAnimatedValue(); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PPTVLoading.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PPTVLoading.java index 02cbf1c..5e4c51f 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PPTVLoading.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PPTVLoading.java @@ -17,7 +17,6 @@ package com.bcgtgjyb.huanwen.customview.mylibrary; import ohos.agp.animation.Animator; -import ohos.agp.animation.AnimatorValue; import ohos.agp.components.AttrSet; import ohos.agp.components.Component; import ohos.agp.render.Canvas; @@ -43,7 +42,7 @@ public class PPTVLoading extends Component implements Component.DrawTask { private boolean isStop = false; - private int R = 0; + private int mR = 0; /** * 构造 @@ -88,29 +87,29 @@ public class PPTVLoading extends Component implements Component.DrawTask { } private DataAnimatorValue getValueAnimator() { - DataAnimatorValue valueAnimator = new DataAnimatorValue(); - valueAnimator.setStart(-1); - valueAnimator.setEnd(1f); - valueAnimator.setDuration(1500); - valueAnimator.setCurveType(Animator.CurveType.LINEAR); - valueAnimator.start(); - return valueAnimator; + DataAnimatorValue animator = new DataAnimatorValue(); + animator.setStart(-1); + animator.setEnd(1f); + animator.setDuration(1500); + animator.setCurveType(Animator.CurveType.LINEAR); + animator.start(); + return animator; } @Override public void onDraw(Component component, Canvas canvas) { if (!isInit) { isInit = true; - R = getWidth() / 8; + mR = getWidth() / 8; start(); } numb = (float) valueAnimator.getAnimatedValue(); if (numb < 0) { - canvas.drawCircle((getWidth() - 2 * R) * (1 - Math.abs(numb)) + R, getHeight() / 2, R - 5, paint2); - canvas.drawCircle((getWidth() - 2 * R) * Math.abs(numb) + R, getHeight() / 2, R - 5 * (float) Math.abs(Math.abs(numb) - 0.8), paint1); + canvas.drawCircle((getWidth() - 2 * mR) * (1 - Math.abs(numb)) + mR, getHeight() / 2, mR - 5, paint2); + canvas.drawCircle((getWidth() - 2 * mR) * Math.abs(numb) + mR, getHeight() / 2, mR - 5 * (float) Math.abs(Math.abs(numb) - 0.8), paint1); } else { - canvas.drawCircle((getWidth() - 2 * R) * (1 - Math.abs(numb - 1)) + R, getHeight() / 2, R - 5, paint1); - canvas.drawCircle((getWidth() - 2 * R) * Math.abs(numb - 1) + R, getHeight() / 2, R - 5 * (float) Math.abs(Math.abs(numb) - 0.8), paint2); + canvas.drawCircle((getWidth() - 2 * mR) * (1 - Math.abs(numb - 1)) + mR, getHeight() / 2, mR - 5, paint1); + canvas.drawCircle((getWidth() - 2 * mR) * Math.abs(numb - 1) + mR, getHeight() / 2, mR - 5 * (float) Math.abs(Math.abs(numb) - 0.8), paint2); } if (valueAnimator.isRunning()) { invalidate(); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java index 30fa8a2..e18d160 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java @@ -1,7 +1,6 @@ package com.bcgtgjyb.huanwen.customview.mylibrary; import ohos.agp.animation.Animator; -import ohos.agp.animation.AnimatorGroup; import ohos.agp.animation.AnimatorValue; import ohos.agp.components.AttrSet; import ohos.agp.components.Component; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/SquareLine.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/SquareLine.java index 5fe7da9..d30d1f2 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/SquareLine.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/SquareLine.java @@ -14,7 +14,7 @@ import ohos.eventhandler.EventRunner; * Created by bigwen on 2015/12/31. */ public class SquareLine extends Component implements Component.DrawTask { - float f = 0; + float mF = 0; private Context mContext; private Paint paint; private DataAnimatorValue valueA; @@ -80,7 +80,7 @@ public class SquareLine extends Component implements Component.DrawTask { } private float yValue(float xx, int length) { - float s = length / getEstimatedHeight(); + float mLength = length / getEstimatedHeight(); float allLength = getEstimatedWidth(); return allLength / 1 * xx; } @@ -96,9 +96,9 @@ public class SquareLine extends Component implements Component.DrawTask { int length = width / 9; if (valueA.isRunning()) { - f = (float) valueA.getAnimatedValue(); + mF = (float) valueA.getAnimatedValue(); } - canvas.drawLines(new float[]{yValue(f, length), height / 2, length * 4 + yValue(f, length), height / 2}, paint); - canvas.drawLines(new float[]{yValue(f, length) - width, height / 2, length * 4 + yValue(f, length) - width, height / 2}, paint); + canvas.drawLines(new float[]{yValue(mF, length), height / 2, length * 4 + yValue(mF, length), height / 2}, paint); + canvas.drawLines(new float[]{yValue(mF, length) - width, height / 2, length * 4 + yValue(mF, length) - width, height / 2}, paint); } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/TaiJiButton.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/TaiJiButton.java index 9a7b7ce..5e0be65 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/TaiJiButton.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/TaiJiButton.java @@ -29,7 +29,7 @@ public class TaiJiButton extends Component implements Component.DrawTask { private boolean isLoading = false; private int colorBlack = Color.BLACK.getValue(); private int colorGray = Color.GRAY.getValue(); - private float R = 0; + private float mR = 0; private float raduisX1 = 0; private float raduisY1 = 0; private float raduisX2 = 0; @@ -123,11 +123,11 @@ public class TaiJiButton extends Component implements Component.DrawTask { lineArcAnimator.setDuration(velocity); lineArcAnimator.setValueUpdateListener(new AnimatorValue.ValueUpdateListener() { @Override - public void onUpdate(AnimatorValue animatorValue, float v) { + public void onUpdate(AnimatorValue animatorValue, float value) { if (isLine) { - lineArcRatio = v; + lineArcRatio = value; } else { - lineArcRatio = 1.0f - v; + lineArcRatio = 1.0f - value; if (lineArcRatio < 0.001f) { isStopFinish = true; } @@ -149,10 +149,10 @@ public class TaiJiButton extends Component implements Component.DrawTask { if (!isInit) { mGrayPaint.setColor(new Color(colorGray)); mBlackPaint.setColor(new Color(colorBlack)); - R = ((float) getWidth()) / 2; - raduisX1 = ((float) getWidth()) / 2 + R / 2; + mR = ((float) getWidth()) / 2; + raduisX1 = ((float) getWidth()) / 2 + mR / 2; raduisY1 = ((float) getWidth()) / 2; - raduisX2 = ((float) getWidth()) / 2 - R / 2; + raduisX2 = ((float) getWidth()) / 2 - mR / 2; raduisY2 = ((float) getWidth()) / 2; isInit = true; } @@ -173,10 +173,10 @@ public class TaiJiButton extends Component implements Component.DrawTask { canvas.drawArc(backRectF, arc2, mBlackPaint); // 椭圆渐变 - rectF.modify(((float) getWidth()) / 2 - R, ((float) getWidth()) / 2 - lineArcRatio * R / 2, - ((float) getWidth()) / 2, ((float) getWidth()) / 2 + lineArcRatio * R / 2); - rectF2.modify(((float) getWidth()) / 2, ((float) getWidth()) / 2 - lineArcRatio * R / 2, - ((float) getWidth()) / 2 + R, ((float) getWidth()) / 2 + lineArcRatio * R / 2); + rectF.modify(((float) getWidth()) / 2 - mR, ((float) getWidth()) / 2 - lineArcRatio * mR / 2, + ((float) getWidth()) / 2, ((float) getWidth()) / 2 + lineArcRatio * mR / 2); + rectF2.modify(((float) getWidth()) / 2, ((float) getWidth()) / 2 - lineArcRatio * mR / 2, + ((float) getWidth()) / 2 + mR, ((float) getWidth()) / 2 + lineArcRatio * mR / 2); canvas.drawArc(rectF, arc2, mGrayPaint); canvas.drawArc(rectF2, arc1, mBlackPaint); if (lineArcAnimator != null && lineArcAnimator.isRunning()) { @@ -184,7 +184,7 @@ public class TaiJiButton extends Component implements Component.DrawTask { } // 圆心放大 - canvas.drawCircle(raduisX1, raduisY1, lineArcRatio * R / 5, mGrayPaint); - canvas.drawCircle(raduisX2, raduisY2, lineArcRatio * R / 5, mBlackPaint); + canvas.drawCircle(raduisX1, raduisY1, lineArcRatio * mR / 5, mGrayPaint); + canvas.drawCircle(raduisX2, raduisY2, lineArcRatio * mR / 5, mBlackPaint); } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java index 21a02e5..b75a092 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java @@ -18,12 +18,12 @@ public class WindowsLoad extends Component implements Component.DrawTask { float[] start1; float[] start2; float[] start3; - float x1, x2, x3, y1, y2, y3; + float x1,x2,x3,y1,y2,y3; EventHandler eventHandler = new EventHandler(EventRunner.getMainEventRunner()); private float pi = (float) Math.PI; private String TAG = "WindowsLoad"; private Paint paint; - private int R; + private int mR; private float circleR; private DataAnimatorValue circleAnimator1; private DataAnimatorValue circleAnimator2; @@ -42,7 +42,7 @@ public class WindowsLoad extends Component implements Component.DrawTask { addDrawTask(this); paint = new Paint(); paint.setColor(new Color(Color.getIntColor("#FF4444"))); - R = 10; + mR = 10; } private void loading() { @@ -68,23 +68,23 @@ public class WindowsLoad extends Component implements Component.DrawTask { } private DataAnimatorValue getCircleData(float[] startCoordinate, float[] coordinate, int delay) { - float x1 = startCoordinate[0]; - float y1 = startCoordinate[1]; - float x0 = coordinate[0]; - float y0 = coordinate[1]; - circleR = (float) Math.sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)); - float param = (float) (Math.abs(y1 - y0) / circleR); + float startX = startCoordinate[0]; + float startY = startCoordinate[1]; + float coodX = coordinate[0]; + float coodY = coordinate[1]; + circleR = (float) Math.sqrt((startX - coodX) * (startX - coodX) + (startY - coodY) * (startY - coodY)); + float param = (float) (Math.abs(startY - coodY) / circleR); if (param < -1.0) { param = -1.0f; } else if (param > 1.0) { param = 1.0f; } float am = (float) Math.asin(param); - if (x1 >= x0 && y1 >= y0) { + if (startX >= coodX && startY >= coodY) { am = am; - } else if (x1 < x0 && y1 >= y0) { + } else if (startX < coodX && startY >= coodY) { am = pi - am; - } else if (x1 < x0 && y1 < y0) { + } else if (startX < coodX && startY < coodY) { am = am + pi; } else { am = 2 * pi - am; @@ -132,7 +132,7 @@ public class WindowsLoad extends Component implements Component.DrawTask { // 初始化 if (isInit) { circleCentre = new float[]{getWidth() / 2, getHeight() / 2}; - start1 = new float[]{getWidth() / 2, R}; + start1 = new float[]{getWidth() / 2, mR}; start2 = onCiecleCoordinate(-0.5f, start1, circleCentre); start3 = onCiecleCoordinate(-0.5f, start2, circleCentre); isInit = false; @@ -141,34 +141,34 @@ public class WindowsLoad extends Component implements Component.DrawTask { // 第一个点初始位置 if (!circleAnimator1.isRunning()) { - canvas.drawCircle(start1[0], start1[1], R, paint); + canvas.drawCircle(start1[0], start1[1], mR, paint); } // 第二个点初始位置 if (!circleAnimator2.isRunning()) { - canvas.drawCircle(start2[0], start2[1], R, paint); + canvas.drawCircle(start2[0], start2[1], mR, paint); } // 第三个点初始位置 if (!circleAnimator3.isRunning()) { - canvas.drawCircle(start3[0], start3[1], R, paint); + canvas.drawCircle(start3[0], start3[1], mR, paint); } if (circleAnimator1.isRunning()) { x1 = (float) (circleCentre[0] + circleR * Math.cos((float) circleAnimator1.getAnimatedValue())); y1 = (float) (circleCentre[1] + circleR * Math.sin((float) circleAnimator1.getAnimatedValue())); - canvas.drawCircle(x1, y1, R, paint); + canvas.drawCircle(x1, y1, mR, paint); } if (circleAnimator2.isRunning()) { x2 = (float) (circleCentre[0] + circleR * Math.cos((float) circleAnimator2.getAnimatedValue())); y2 = (float) (circleCentre[1] + circleR * Math.sin((float) circleAnimator2.getAnimatedValue())); - canvas.drawCircle(x2, y2, R, paint); + canvas.drawCircle(x2, y2, mR, paint); } if (circleAnimator3.isRunning()) { x3 = (float) (circleCentre[0] + circleR * Math.cos((float) circleAnimator3.getAnimatedValue())); y3 = (float) (circleCentre[1] + circleR * Math.sin((float) circleAnimator3.getAnimatedValue())); - canvas.drawCircle(x3, y3, R, paint); + canvas.drawCircle(x3, y3, mR, paint); } if (circleAnimator1.isRunning() || circleAnimator2.isRunning() || circleAnimator3.isRunning()) { invalidate(); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameMap.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameMap.java index 9e71cc1..d2c7a0d 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameMap.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameMap.java @@ -2,6 +2,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.spring; import com.bcgtgjyb.huanwen.customview.mylibrary.ResourceTable; import com.bcgtgjyb.huanwen.customview.mylibrary.tool.ScreenUtil; + import ohos.agp.components.AttrSet; import ohos.agp.components.Component; import ohos.agp.render.Canvas; @@ -26,12 +27,12 @@ import java.util.Random; */ public class GameMap extends Component implements Component.DrawTask, Component.BindStateChangedListener { private static final int FIVE = 5; - private static final int aa = -20; + private static final int TWENTY = -20; private static final int TWO = 2; private static final int TEN = 10; private static final int ELEVEN = 11; private static final int TWLVE = 12; - private static final int thirteen = 13; + private static final int THIRTEEN = 13; private static final int THREE = 3; private static final int FOUR = 4; private static final int SIX = 6; @@ -39,13 +40,13 @@ public class GameMap extends Component implements Component.DrawTask, Component. private static final int EIGHT = 8; private static final int NINE = 9; private static final int ZERO = 0; - private static final int fourteen = 14; - private static final int fifteen = 15; - private static final int forty = 40; - private static final int onehundred = 100; - private static final int sixteen = 16; + private static final int FOURTEEN = 14; + private static final int FIFTEEN = 15; + private static final int FORTY = 40; + private static final int ONEHUNDRED = 100; + private static final int SIXTEEN = 16; private Context mContext; - private int mapW, mapH, screenW, screenH; + private int mapW,mapH,screenW,screenH; private PixelMap bitmap; private List mapInfos = new ArrayList<>(); private Paint mPaint; @@ -58,7 +59,7 @@ public class GameMap extends Component implements Component.DrawTask, Component. private Thread mThread; private boolean isPlay = false; private SpringCallback springCallback = null; - private float latsX, lastY, tx = 0, ty = 0; + private float latsX,lastY,tx = 0,ty = 0; private List removePoint = new ArrayList<>(); private float degree = 0; @@ -105,9 +106,9 @@ public class GameMap extends Component implements Component.DrawTask, Component. int nn = screenW / mapW; int mm = screenH / mapH; - int startX = aa * mapW, startY = aa * mapH; - for (int ii = 0; ii < (nn + forty); ii++) { - for (int jj = 0; jj < (mm + forty); jj++) { + int startX = TWENTY * mapW, startY = TWENTY * mapH; + for (int ii = 0; ii < (nn + FORTY); ii++) { + for (int jj = 0; jj < (mm + FORTY); jj++) { MapInfo mapInfo = new MapInfo(); mapInfo.bitmap = bitmap; mapInfo.xx = startX; @@ -116,10 +117,10 @@ public class GameMap extends Component implements Component.DrawTask, Component. mapInfos.add(mapInfo); } startX += mapW; - startY = aa * mapH; + startY = TWENTY * mapH; } initThread(); - addRandomPoint(onehundred); + addRandomPoint(ONEHUNDRED); } @Override @@ -200,7 +201,7 @@ public class GameMap extends Component implements Component.DrawTask, Component. dv = dv + pi * TWO; } float unit = 0.125f * pi; - if (dv > fifteen * unit || dv < unit) { + if (dv > FIFTEEN * unit || dv < unit) { this.degree = ZERO; } else if (dv > unit && dv < THREE * unit) { this.degree = TWO * unit; @@ -212,10 +213,10 @@ public class GameMap extends Component implements Component.DrawTask, Component. this.degree = EIGHT * unit; } else if (dv > NINE * unit && dv < ELEVEN * unit) { this.degree = TEN * unit; - } else if (dv > ELEVEN * unit && dv < thirteen * unit) { + } else if (dv > ELEVEN * unit && dv < THIRTEEN * unit) { this.degree = TWLVE * unit; - } else if (dv > thirteen * unit && dv < fifteen * unit) { - this.degree = fourteen * unit; + } else if (dv > THIRTEEN * unit && dv < FIFTEEN * unit) { + this.degree = FOURTEEN * unit; } } @@ -232,7 +233,7 @@ public class GameMap extends Component implements Component.DrawTask, Component. float y1 = -(float) (Math.sin(getDegree()) * dd); translateCanvas(x1, y1); try { - Thread.sleep(sixteen); + Thread.sleep(SIXTEEN); } catch (InterruptedException e) { } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameStart.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameStart.java index be1d748..102185e 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameStart.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/GameStart.java @@ -20,7 +20,7 @@ public class GameStart extends DirectionalLayout implements Component.TouchEvent private String TAG = GameStart.class.getName(); private SpringView mSpringView; private boolean isMove = false; - private float downX, downY; + private float downX,downY; private double lastD = 0; /** * GameStart 构造方法 diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/SpringView.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/SpringView.java index fb794ff..06eb193 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/SpringView.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/spring/SpringView.java @@ -10,6 +10,7 @@ import ohos.agp.render.Path; import ohos.agp.utils.Color; import ohos.agp.utils.Point; import ohos.app.Context; + import java.util.ArrayList; import java.util.List; @@ -34,7 +35,7 @@ public class SpringView extends Component implements Component.EstimateSizeListe private static final int TEN = 10; private static final int ELEVEN = 11; private static final int TWLVE = 12; - private static final int thirteen = 13; + private static final int THIRTEEN = 13; private static final int THREE = 3; private static final int FOUR = 4; private static final int SIX = 6; @@ -42,15 +43,15 @@ public class SpringView extends Component implements Component.EstimateSizeListe private static final int EIGHT = 8; private static final int NINE = 9; private static final int ZERO = 0; - private static final int fourteen = 14; - private static final int fifteen = 15; - private static final int fivehundred = 500; - private static final float point = 0.125f; + private static final int FOURTEEN = 14; + private static final int FIFTEEN = 15; + private static final int FIVEHUNDRED = 500; + private static final float POINT = 0.125f; Point addP = new Point(); private Context mContext; private List points = new ArrayList(); private Paint mPaint; - private int height, width; + private int height,width; private int dd; private boolean isPlay = false; private float scale = 1f; @@ -120,9 +121,9 @@ public class SpringView extends Component implements Component.EstimateSizeListe private void initPoint() { for (int ij = 0; ij < TEN; ij++) { - Point point = new Point(); - point.modify(width / TWO + ij * dd, height / TWO); - points.add(point); + Point mPoint = new Point(); + mPoint.modify(width / TWO + ij * dd, height / TWO); + points.add(mPoint); } } @@ -162,8 +163,8 @@ public class SpringView extends Component implements Component.EstimateSizeListe if (ds < ZERO) { ds = ds + pi * TWO; } - float unit = point * pi; - if (ds > fifteen * unit || ds < unit) { + float unit = POINT * pi; + if (ds > FIFTEEN * unit || ds < unit) { this.degree = ZERO; } else if (ds > unit && ds < THREE * unit) { this.degree = TWO * unit; @@ -175,10 +176,10 @@ public class SpringView extends Component implements Component.EstimateSizeListe this.degree = EIGHT * unit; } else if (ds > NINE * unit && ds < ELEVEN * unit) { this.degree = TEN * unit; - } else if (ds > ELEVEN * unit && ds < thirteen * unit) { + } else if (ds > ELEVEN * unit && ds < THIRTEEN * unit) { this.degree = TWLVE * unit; - } else if (ds > thirteen * unit && ds < fifteen * unit) { - this.degree = fourteen * unit; + } else if (ds > THIRTEEN * unit && ds < FIFTEEN * unit) { + this.degree = FOURTEEN * unit; } } @@ -191,7 +192,7 @@ public class SpringView extends Component implements Component.EstimateSizeListe initPath(); invalidate(); try { - Thread.sleep(fivehundred); + Thread.sleep(FIVEHUNDRED); } catch (Exception e) { e.printStackTrace(); } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarCircle.java index af1cd93..87053f6 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarCircle.java @@ -2,6 +2,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.star; import com.bcgtgjyb.huanwen.customview.mylibrary.ResourceTable; import com.bcgtgjyb.huanwen.customview.mylibrary.tool.ScreenUtil; + import ohos.agp.components.AttrSet; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -14,10 +15,10 @@ import ohos.eventhandler.EventRunner; * Created by bigwen on 2016/4/23. */ public class StarCircle extends DirectionalLayout implements Component.EstimateSizeListener, Component.BindStateChangedListener { - private static final int sixteen = 16; - private static final int two = 2; - private static final int eight = 8; - private static final int thirty = 30; + private static final int SIXTEEN = 16; + private static final int TWO = 2; + private static final int EIGHT = 8; + private static final int THIRTY = 30; EventHandler eventHandler = new EventHandler(EventRunner.getMainEventRunner()); private Context mContext; private StarView starView1; @@ -30,8 +31,8 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS private String TAG = StarCircle.class.getName(); private int padding; private double circleDegree; - private int circleX, circleY, circleR; - private int[] coordinate1, coordinate2; + private int circleX,circleY,circleR; + private int[] coordinate1,coordinate2; /** * StarCircle 构造方法 * @@ -62,7 +63,7 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS LayoutScatter.getInstance(mContext).parse(ResourceTable.Layout_star_circle, this, true); starView1 = (StarView) findComponentById(ResourceTable.Id_star_view_1); starView2 = (StarView) findComponentById(ResourceTable.Id_star_view_2); - padding = ScreenUtil.dip2px(mContext, eight); + padding = ScreenUtil.dip2px(mContext, EIGHT); initThread(); } @@ -77,7 +78,7 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS degree += 0.1f; setXy(degree); try { - Thread.sleep(sixteen); + Thread.sleep(SIXTEEN); } catch (InterruptedException e) { } eventHandler.postTask(new Runnable() { @@ -93,12 +94,12 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS thread.start(); } - private void setXy(float d) { + private void setXy(float degreeX) { eventHandler.postTask(new Runnable() { @Override public void run() { - coordinate1 = caculateDegree(d); - coordinate2 = caculateDegree(d); + coordinate1 = caculateDegree(degreeX); + coordinate2 = caculateDegree(degreeX); starView1.setTranslationX(coordinate1[0]); starView1.setTranslationY(coordinate1[1]); starView2.setTranslationX(coordinate2[0]); @@ -109,10 +110,10 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS private int[] caculateDegree(float dd) { circleDegree = dd / Math.PI; - circleX = viewWidth / two - padding; - circleY = viewHeight / two - padding; - circleR = viewWidth / two; - int[] xy = new int[two]; + circleX = viewWidth / TWO - padding; + circleY = viewHeight / TWO - padding; + circleR = viewWidth / TWO; + int[] xy = new int[TWO]; xy[0] = (int) (circleX + circleR * Math.cos(circleDegree)); xy[1] = (int) (circleY + circleR * Math.sin(circleDegree)); return xy; @@ -147,8 +148,8 @@ public class StarCircle extends DirectionalLayout implements Component.EstimateS @Override public boolean onEstimateSize(int i, int i1) { - viewWidth = getWidth() - ScreenUtil.dip2px(mContext, thirty); - viewHeight = getHeight() - ScreenUtil.dip2px(mContext, thirty); + viewWidth = getWidth() - ScreenUtil.dip2px(mContext, THIRTY); + viewHeight = getHeight() - ScreenUtil.dip2px(mContext, THIRTY); return false; } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Move.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Move.java index c941d6e..74c2ad5 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Move.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Move.java @@ -1,6 +1,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.tool; import com.bcgtgjyb.huanwen.customview.mylibrary.DataAnimatorValue; + import ohos.agp.utils.RectFloat; /** @@ -13,10 +14,10 @@ public class Move { private static final int TIME = 1000; // 被除数 - private static final int two = 2; + private static final int TWO = 2; // 角度 - private static final int aa = 360; + private static final int DEGREE = 360; private static final int CIRCLEDEGREE = 360; private String TAG = Move.class.getName(); private DataAnimatorValue vAX = null; @@ -66,7 +67,7 @@ public class Move { vAY.start(); } if (!vAX.isRunning()) { - float[] endXY = new float[two]; + float[] endXY = new float[TWO]; endXY[0] = coodinateX + xyx; endXY[1] = coodinateY + yx; vAX = null; @@ -131,12 +132,12 @@ public class Move { public float[] circleMove(int radioX, int radioY, int x, int y, int time, int degree) { float rr = (float) Math.sqrt((radioX - x) * (radioX - x) + (radioY - y) * (radioY - y)); - float nowDegree = (float) Math.atan((y - radioY) / (x - radioX)) * aa; + float nowDegree = (float) Math.atan((y - radioY) / (x - radioX)) * DEGREE; if (circleVA == null) { circleVA = BWValueAnimator.getValueAnimator(degree, time); } if (!circleVA.isRunning()) { - float[] end = new float[two]; + float[] end = new float[TWO]; float endDegree = nowDegree + degree; end[0] = (float) (rr * Math.sin(endDegree / CIRCLEDEGREE)); end[1] = (float) (rr * Math.cos(endDegree / CIRCLEDEGREE)); @@ -145,7 +146,7 @@ public class Move { } return end; } else { - float[] end = new float[two]; + float[] end = new float[TWO]; float endDegree = (float) circleVA.getAnimatedValue() + degree; end[0] = (float) (rr * Math.sin(endDegree / CIRCLEDEGREE)); end[1] = (float) (rr * Math.cos(endDegree / CIRCLEDEGREE)); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Rotate.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Rotate.java index 373028b..da3bd65 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Rotate.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/Rotate.java @@ -7,7 +7,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.tool; */ public class Rotate { private static final int CIRCLEDEGREE = 360; - private static final int two = 2; + private static final int TWO = 2; /** * rotatePoint 方法 @@ -25,7 +25,7 @@ public class Rotate { float yy = point[1]; float rr = (float) Math.sqrt((radioX - xx) * (radioX - xx) + (radioY - yy) * (radioY - yy)); float nowDegree = (float) Math.atan((yy - radioY) / (xx - radioX)) * CIRCLEDEGREE; - float[] end = new float[two]; + float[] end = new float[TWO]; float endDegree = nowDegree + degree; end[0] = (float) (rr * Math.sin(endDegree / CIRCLEDEGREE)); end[1] = (float) (rr * Math.cos(endDegree / CIRCLEDEGREE)); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/ScreenUtil.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/ScreenUtil.java index 3d0a379..f79a201 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/ScreenUtil.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/ScreenUtil.java @@ -5,8 +5,8 @@ import ohos.agp.window.service.DisplayManager; import ohos.app.Context; public class ScreenUtil { - private static final int aa = 129; - private static final int bb = 160; + private static final int ABBR = 129; + private static final int SV = 160; private static int screenHeight = 0; private static int screenWidth = 0; /** @@ -31,7 +31,7 @@ public class ScreenUtil { */ public static int px2sp(Context context, float pxValue) { - int round = Math.round(pxValue * AttrHelper.getDensity(context) / bb); + int round = Math.round(pxValue * AttrHelper.getDensity(context) / SV); return round; } @@ -81,6 +81,6 @@ public class ScreenUtil { */ public static int getStatusBarHeight(Context context) { - return aa; + return ABBR; } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java index 220b4fc..7d895d1 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java @@ -1,6 +1,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.view58; import com.bcgtgjyb.huanwen.customview.mylibrary.DataAnimatorValue; + import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorValue; import ohos.agp.components.AttrSet; @@ -191,18 +192,18 @@ public class Loading58Path extends Component implements Component.DrawTask { } // 三角形一边的垂直平分线函数 - private float[] fx1(float x) { + private float[] fx1(float pointX) { float[] point = new float[2]; - point[0] = x; - point[1] = SQRT3 / 3 * x + (0.5f - SQRT3 / 6) * hh; + point[0] = pointX; + point[1] = SQRT3 / 3 * pointX + (0.5f - SQRT3 / 6) * hh; return point; } // 三角形一边的垂直平分线函数 - private float[] fx2(float x) { + private float[] fx2(float pointX) { float[] point = new float[2]; - point[0] = x; - point[1] = -SQRT3 / 3 * x + (0.5f + SQRT3 / 6) * hh; + point[0] = pointX; + point[1] = -SQRT3 / 3 * pointX + (0.5f + SQRT3 / 6) * hh; return point; } @@ -235,18 +236,18 @@ public class Loading58Path extends Component implements Component.DrawTask { } private float[] fx3(float x2) { - float[] param = new float[two]; - param[0] = x2; - param[1] = x2; - return param; + float[] mParam = new float[two]; + mParam[0] = x2; + mParam[1] = x2; + return mParam; } // 调节点 函数 private float[] fx4(float x1) { - float[] param = new float[two]; - param[0] = x1; - param[1] = ww - x1; - return param; + float[] mParam = new float[two]; + mParam[0] = x1; + mParam[1] = ww - x1; + return mParam; } /** @@ -268,6 +269,7 @@ public class Loading58Path extends Component implements Component.DrawTask { colorVA.setDuration(fivehundred); colorVA.setCurveType(Animator.CurveType.LINEAR); } + private void triangle() { AnimatorValue animatorValue = new AnimatorValue(); int mOne = ww / two; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loding58View.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loding58View.java index 8821d4b..b5302d9 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loding58View.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loding58View.java @@ -2,6 +2,7 @@ package com.bcgtgjyb.huanwen.customview.mylibrary.view58; import com.bcgtgjyb.huanwen.customview.mylibrary.ResourceTable; import com.bcgtgjyb.huanwen.customview.mylibrary.tool.ScreenUtil; + import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorGroup; import ohos.agp.animation.AnimatorProperty; @@ -25,11 +26,11 @@ public class Loding58View extends DirectionalLayout implements Component.BindSta private boolean isPlay = false; private AnimatorGroup riseSet; private AnimatorGroup dropSet; - private AnimatorGroup rolation90, rolation120, rolation180; - private AnimatorGroup aList1, aList2, aList3, aList4; + private AnimatorGroup rolation90,rolation120,rolation180; + private AnimatorGroup aList1,aList2,aList3,aList4; private int duration = 600; private long time = 0L; - private AnimatorGroup riseSet1, riseSet2, riseSet3, dropSet1, dropSet2, dropSet3, dropSet4; + private AnimatorGroup riseSet1,riseSet2,riseSet3,dropSet1,dropSet2,dropSet3,dropSet4; /** * 构造 @@ -156,13 +157,13 @@ public class Loding58View extends DirectionalLayout implements Component.BindSta aList3.setDuration(duration); } - private AnimatorGroup riseVA(float x, float y) { + private AnimatorGroup riseVA(float x, float group) { AnimatorGroup animatorSet = new AnimatorGroup(); - AnimatorProperty p2 = new AnimatorProperty(view); - p2.moveFromY(Math.abs(y)); - p2.moveToY(0); - animatorSet.runSerially(p2); + AnimatorProperty property = new AnimatorProperty(view); + property.moveFromY(Math.abs(group)); + property.moveToY(0); + animatorSet.runSerially(property); // setDuration在isPlay后面设置 animatorSet.setDuration(500); -- Gitee From 8c2d97dcb70f60664e52b64c97e2b0034abef94a Mon Sep 17 00:00:00 2001 From: 15296721452 <123> Date: Tue, 8 Jun 2021 16:54:21 +0800 Subject: [PATCH 2/5] checkstyle --- .../huanwen/customview/mylibrary/ManyCircle.java | 16 ++++++++-------- .../customview/mylibrary/PointToLineRotate.java | 2 +- .../customview/mylibrary/WindowsLoad.java | 4 ++-- .../customview/mylibrary/star/StarView.java | 2 +- .../mylibrary/view58/Loading58Path.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java index b286b99..37d71bf 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java @@ -76,15 +76,15 @@ public class ManyCircle extends Component implements Component.DrawTask { } // 分段函数 - private float f(float radius) { - if (radius <= maxRadius / 2) { - return radius; - } else if (radius < maxRadius) { - return maxRadius - radius; - } else if (radius < maxRadius * 3 / 2) { - return radius - maxRadius; + private float f(float xu) { + if (xu <= maxRadius / 2) { + return xu; + } else if (xu < maxRadius) { + return maxRadius - xu; + } else if (xu < maxRadius * 3 / 2) { + return xu - maxRadius; } else { - return 2 * maxRadius - radius; + return 2 * maxRadius - xu; } } diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java index e18d160..bd6a87d 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/PointToLineRotate.java @@ -121,7 +121,7 @@ public class PointToLineRotate extends Component implements Component.DrawTask { param = -1.0f; } else if (param > 1.0) { param = 1.0f; - } + } else {} float aa = (float) Math.asin(param); if (x1 >= x0 && y1 >= y0) { aa = aa; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java index b75a092..e796709 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/WindowsLoad.java @@ -78,7 +78,7 @@ public class WindowsLoad extends Component implements Component.DrawTask { param = -1.0f; } else if (param > 1.0) { param = 1.0f; - } + } else {} float am = (float) Math.asin(param); if (startX >= coodX && startY >= coodY) { am = am; @@ -110,7 +110,7 @@ public class WindowsLoad extends Component implements Component.DrawTask { param = -1.0f; } else if (param > 1.0) { param = 1.0f; - } + } else {} float am = (float) Math.asin(param); if (x1 >= x0 && y1 >= y0) { am = am; diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarView.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarView.java index 2c57e35..c419eae 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarView.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/star/StarView.java @@ -154,7 +154,7 @@ public class StarView extends Component implements Component.EstimateSizeListene } else if (alpha >= 255) { alpha = 255; isDirection = true; - } + } else {} paint.setColor(new Color(Color.argb(255,255,255, alpha))); canvas.rotate(degree, width / 2, height / 2); canvas.drawPath(pathBig, paint); diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java index 7d895d1..1dd3d1d 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/view58/Loading58Path.java @@ -100,7 +100,7 @@ public class Loading58Path extends Component implements Component.DrawTask { circle(); } else if (runParam == three) { square(); - } + } else {} } private void square() { -- Gitee From 5ea3212d1f54aa10e6fad6047de11a3fa98a7188 Mon Sep 17 00:00:00 2001 From: 15296721452 <123> Date: Tue, 8 Jun 2021 17:00:05 +0800 Subject: [PATCH 3/5] checkstyle --- .../huanwen/customview/mylibrary/ManyCircle.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java index 37d71bf..787c26b 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java @@ -76,15 +76,15 @@ public class ManyCircle extends Component implements Component.DrawTask { } // 分段函数 - private float f(float xu) { - if (xu <= maxRadius / 2) { - return xu; - } else if (xu < maxRadius) { - return maxRadius - xu; - } else if (xu < maxRadius * 3 / 2) { - return xu - maxRadius; + private float f(float max) { + if (max <= maxRadius / 2) { + return max; + } else if (max < maxRadius) { + return maxRadius - max; + } else if (max < maxRadius * 3 / 2) { + return max - maxRadius; } else { - return 2 * maxRadius - xu; + return 2 * maxRadius - max; } } -- Gitee From 200d9afd59ff2d124fdc0c17ed442ac07d559e1f Mon Sep 17 00:00:00 2001 From: 15296721452 <123> Date: Tue, 8 Jun 2021 17:03:05 +0800 Subject: [PATCH 4/5] checkstyle --- .../huanwen/customview/mylibrary/ManyCircle.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java index 787c26b..a7607a6 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java @@ -76,15 +76,15 @@ public class ManyCircle extends Component implements Component.DrawTask { } // 分段函数 - private float f(float max) { - if (max <= maxRadius / 2) { - return max; - } else if (max < maxRadius) { - return maxRadius - max; - } else if (max < maxRadius * 3 / 2) { - return max - maxRadius; + private float f(float x) { + if (x <= maxRadius / 2) { + return x; + } else if (x < maxRadius) { + return maxRadius - x; + } else if (x < maxRadius * 3 / 2) { + return x - maxRadius; } else { - return 2 * maxRadius - max; + return 2 * maxRadius - x; } } -- Gitee From c7b5479f41fa0ee097fe90d7791bf9c229884246 Mon Sep 17 00:00:00 2001 From: 15296721452 <123> Date: Tue, 8 Jun 2021 17:08:01 +0800 Subject: [PATCH 5/5] checkstyle --- .../huanwen/customview/mylibrary/ManyCircle.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java index a7607a6..b286b99 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/ManyCircle.java @@ -76,15 +76,15 @@ public class ManyCircle extends Component implements Component.DrawTask { } // 分段函数 - private float f(float x) { - if (x <= maxRadius / 2) { - return x; - } else if (x < maxRadius) { - return maxRadius - x; - } else if (x < maxRadius * 3 / 2) { - return x - maxRadius; + private float f(float radius) { + if (radius <= maxRadius / 2) { + return radius; + } else if (radius < maxRadius) { + return maxRadius - radius; + } else if (radius < maxRadius * 3 / 2) { + return radius - maxRadius; } else { - return 2 * maxRadius - x; + return 2 * maxRadius - radius; } } -- Gitee