diff --git a/ChangeLog.md b/CHANGELOG.md similarity index 100% rename from ChangeLog.md rename to CHANGELOG.md diff --git a/README.OPENSOURCE b/README.OPENSOURCE index f6faf476d72a421a6d8269b1ed9e0a127f0766dc..5e92727d038964263dce453889b2c62f9b1a2b5e 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -4,9 +4,9 @@ "Name": "AndroidLoadingAnimation", - "License": "", + "License": "无", - "License File": "", + "License File": "无", "Version Number": "master", 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 8d5112ccca329b14d36d3e61b5659be1a6d778bb..27e4d4a06ca3e22b7cdeb2c0552404ce8f4ec7ea 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 @@ -33,6 +33,7 @@ import ohos.eventhandler.EventRunner; */ public class FiveLine extends Component implements Component.DrawTask { + EventHandler eventHandler = new EventHandler(EventRunner.getMainEventRunner()); private Paint paint; private boolean isInit = false; private float width = 0; @@ -41,8 +42,13 @@ public class FiveLine extends Component implements Component.DrawTask { private float numb = 0; private boolean isStop = false; private float[] initLine = new float[]{0.6f, 0.3f, 0, 0.3f, 0.6f}; - EventHandler eventHandler = new EventHandler(EventRunner.getMainEventRunner()); + /** + * 构造 + * + * @param context 上下文 + * @param attrs 属性集 + */ public FiveLine(Context context, AttrSet attrs) { super(context, attrs); addDrawTask(this); 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 7877432fa943569ce9bc43792f9c055b3cc8ed89..2147dd028cba30cede63f561db100ef4664f89ab 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 @@ -98,7 +98,7 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { if (!isInit) { startAnimation(); } - //显示固定的圆,逐个出现 + // 显示固定的圆,逐个出现 if (show <= 4) { canvas.drawCircle(R, R, R, paint2); } @@ -111,7 +111,7 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { if (show <= 1) { canvas.drawCircle(R, getHeight() - R, R, paint5); } - //逐个消失 + // 逐个消失 if (show > 4) { if (show <= 4) { canvas.drawCircle(R, R, R, paint2); @@ -126,7 +126,7 @@ public class FourCirlceRotate extends Component implements Component.DrawTask { canvas.drawCircle(R, getHeight() - R, R, paint5); } } - //移动 + // 移动 if (where < 1 && where > 0) { canvas.drawCircle(R + (getWidth() - 2 * R) * where, R, R, paint1); show = 4; 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 c8427f9b43336f8f7a602e1a827e1252e6b2d760..1a30b9910a4384fb99df986e4ff8c62b6ac7a7eb 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 @@ -21,6 +21,7 @@ import java.util.ArrayList; */ public class PointToLineRotate extends Component implements Component.DrawTask { + ArrayList dataAnimatorValues = new ArrayList<>(); EventHandler eventHandler = new EventHandler(EventRunner.getMainEventRunner()); private Paint paint; private float pi = (float) Math.PI; @@ -31,6 +32,12 @@ public class PointToLineRotate extends Component implements Component.DrawTask { private DataAnimatorValue startValue; private int width = 10; + /** + * 构造 + * + * @param context 上下文 + * @param attrs 属性集 + */ public PointToLineRotate(Context context, AttrSet attrs) { super(context, attrs); addDrawTask(this); @@ -74,8 +81,6 @@ public class PointToLineRotate extends Component implements Component.DrawTask { return valueAnimator; } - ArrayList dataAnimatorValues = new ArrayList<>(); - private DataAnimatorValue makeEndValueAnimator(float... value) { DataAnimatorValue value1 = new DataAnimatorValue(); value1.setStart(30); 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 a1557130c33048ce941be8a4e514752b4090069f..5fe7da93335f1e7af3c92ee7ad07a9a36fec24c2 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,6 +14,7 @@ import ohos.eventhandler.EventRunner; * Created by bigwen on 2015/12/31. */ public class SquareLine extends Component implements Component.DrawTask { + float f = 0; private Context mContext; private Paint paint; private DataAnimatorValue valueA; @@ -51,8 +52,6 @@ public class SquareLine extends Component implements Component.DrawTask { paint.setStrokeWidth(10); } - float f = 0; - private void start() { if (valueA == null) { valueA = getValueAnimator(); 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 70abe536f7bb950b6d3d64b24b04766e8a2df024..9a7b7ce9874ba7ceaaab9c37c93ff7909a7bb6a0 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 @@ -145,7 +145,7 @@ public class TaiJiButton extends Component implements Component.DrawTask { @Override public void onDraw(Component component, final Canvas canvas) { - //初始化 + // 初始化 if (!isInit) { mGrayPaint.setColor(new Color(colorGray)); mBlackPaint.setColor(new Color(colorBlack)); 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 2bcd7122e806295fcc5db59b7ff6665696c15c4a..21a02e521cfabbe15b9c322cec8528818e3c369a 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 @@ -64,7 +64,7 @@ public class WindowsLoad extends Component implements Component.DrawTask { loading(); invalidate(); } - },10); + }, 10); } private DataAnimatorValue getCircleData(float[] startCoordinate, float[] coordinate, int delay) { 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 79701e13bb032863dbeccb139aad96878958decf..73d79e17cdae887b9ae7f4e2d5f92474e66c0164 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 @@ -25,7 +25,7 @@ import java.util.Random; * Created by bigwen on 2016/4/25. */ -public class GameMap extends Component implements Component.DrawTask,Component.BindStateChangedListener { +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 TWO = 2; @@ -59,6 +59,9 @@ public class GameMap extends Component implements Component.DrawTask,Component.B private Thread mThread; private boolean isPlay = false; private SpringCallback springCallback = null; + private float latsX, lastY, tx = 0, ty = 0; + private List removePoint = new ArrayList<>(); + private float degree = 0; /** * GameMap 构造方法 @@ -137,8 +140,6 @@ public class GameMap extends Component implements Component.DrawTask,Component.B for (Point point : randomPoints) { float xx = point.getPointX() + tx; float yy = point.getPointY() + ty; - if (!(xx > 0 && xx < screenW && yy > 0 && yy < screenH)) { - } if ((xx >= (screenW / TWO - sw) && xx <= (screenW / TWO + sw)) && (yy >= (screenH / TWO - sh) && yy <= (screenH / TWO + sh))) { @@ -167,20 +168,16 @@ public class GameMap extends Component implements Component.DrawTask,Component.B int y; } - private List removePoint = new ArrayList<>(); - private void addRandomPoint(int param) { for (int i = 0; i < param; i++) { Point point = new Point(); int kk = random.nextBoolean() ? 1 : -1; int k = random.nextBoolean() ? 1 : -1; - point.modify(kk * random.nextInt(FIVE * mapW),k * random.nextInt(FIVE * mapH)); + point.modify(kk * random.nextInt(FIVE * mapW), k * random.nextInt(FIVE * mapH)); randomPoints.add(point); } } - private float latsX, lastY, tx = 0, ty = 0; - /** * translateCanvas 方法 * @@ -193,8 +190,11 @@ public class GameMap extends Component implements Component.DrawTask,Component.B invalidate(); } - private float degree = 0; - + /** + * 移动 + * + * @param dv 值 + */ public void move(double dv) { float pi = (float) Math.PI; if (dv < 0) { 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 bb3bb347de321e8aaac4a925a6815064c4b312f7..05e88deb34a9b951a458151312b1aa1189be6141 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 @@ -16,8 +16,19 @@ import java.util.List; /** * Created by bigwen on 2016/4/25. */ -public class SpringView extends Component implements Component.EstimateSizeListener,Component.DrawTask, +public class SpringView extends Component implements Component.EstimateSizeListener, Component.DrawTask, Component.BindStateChangedListener { + /** + * 变量 springW + */ + + public static float springW = 0; + + /** + * 变量 springH + */ + + public static float springH = 0; private static final int FIVE = 5; private static final int TWO = 2; private static final int TEN = 10; @@ -35,28 +46,20 @@ public class SpringView extends Component implements Component.EstimateSizeListe 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 dd; private boolean isPlay = false; - /** - * 变量 springW - * - */ - public static float springW = 0; - /** - * 变量 springH - * - */ - public static float springH = 0; private float scale = 1f; private int moveUnit = 0; private Point lastPoint; private double degree = 0; private Thread mThread; private Path path = new Path(); + /** * SpringView 构造方法 * @@ -118,7 +121,7 @@ public class SpringView extends Component implements Component.EstimateSizeListe private void initPoint() { for (int i = 0; i < TEN; i++) { Point point = new Point(); - point.modify(width / TWO + i * dd,height / TWO); + point.modify(width / TWO + i * dd, height / TWO); points.add(point); } } @@ -131,8 +134,6 @@ public class SpringView extends Component implements Component.EstimateSizeListe points.add(lastPoint); } - Point addP = new Point(); - /** * pointMove 方法 * @@ -145,7 +146,7 @@ public class SpringView extends Component implements Component.EstimateSizeListe int xx = (int) (Math.cos(degree) * moveUnit); int yy = (int) (Math.sin(degree) * moveUnit); Point firstP = points.get(0); - addP.modify(firstP.getPointX() + xx,firstP.getPointY() + yy); + addP.modify(firstP.getPointX() + xx, firstP.getPointY() + yy); points.add(0, addP); points.remove(points.size() - 1); 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 7d20149cdd0db8b43e308b5aa4cafd3340608e39..cc8ef199bca8956470ca04dccf91442db5265824 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 @@ -13,7 +13,7 @@ import ohos.eventhandler.EventRunner; /** * Created by bigwen on 2016/4/23. */ -public class StarCircle extends DirectionalLayout implements Component.EstimateSizeListener,Component.BindStateChangedListener { +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; 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 e5c1011aa879b6b5f5d9cb171bb173263c985909..d4867994f530fecba011d9928f5dd8eec794b4c5 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 @@ -23,7 +23,7 @@ public class StarView extends Component implements Component.EstimateSizeListene private int alpha = 255; private boolean isDirection = true; - //颜色变化率 + // 颜色变化率 private int v = 3; private boolean isInit = false; private Thread thread; @@ -127,7 +127,7 @@ public class StarView extends Component implements Component.EstimateSizeListene @Override public void onDraw(Component component, Canvas canvas) { if (!isInit) { - //支持padding,不然padding属性无效 + // 支持padding,不然padding属性无效 int paddingLeft = getPaddingLeft(); int paddingTop = getPaddingTop(); int paddingRight = getPaddingRight(); @@ -149,7 +149,7 @@ public class StarView extends Component implements Component.EstimateSizeListene alpha = 255; isDirection = true; } - paint.setColor(new Color(Color.argb(255,255, 255, alpha))); + 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/tool/BWValueAnimator.java b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/BWValueAnimator.java index 7164df6842749069f01526f7e70459d8f899f5f6..3254a1496b408adc07d5b828da2e941068820b0a 100644 --- a/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/BWValueAnimator.java +++ b/mylibrary/src/main/java/com/bcgtgjyb/huanwen/customview/mylibrary/tool/BWValueAnimator.java @@ -35,7 +35,7 @@ public class BWValueAnimator { * @param time 时间 * @return 0 */ - public static DataAnimatorValue getValueAnimator(float start,float end, int time) { + public static DataAnimatorValue getValueAnimator(float start, float end, int time) { DataAnimatorValue valueX = new DataAnimatorValue(); valueX.setCurveType(Animator.CurveType.LINEAR); valueX.setDuration(time); 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 703e6f1be7777ca6b167150a0db5669fcdd3a657..83b895c39101145662f9f8e5e8d49cd87fd532f1 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 @@ -9,20 +9,23 @@ import ohos.agp.utils.RectFloat; */ public class Move { - private String TAG = Move.class.getName(); // 默认1秒 private static final int TIME = 1000; + + // 被除数 private static final int two = 2; + + // 角度 private static final int aa = 360; + private static final int CIRCLEDEGREE = 360; + private String TAG = Move.class.getName(); private DataAnimatorValue vAX = null; private DataAnimatorValue vAY = null; + private DataAnimatorValue circleVA = null; /** - * 定义bwCallback 变量 - * + * 定义bwCallback变量 */ public BWCallback bwCallback; - private DataAnimatorValue circleVA = null; - private static final int CIRCLEDEGREE = 360; /** * Move 构造方法