From d3492789ca86ce1864e6708a7063f8213b7ea5ee Mon Sep 17 00:00:00 2001 From: lambert Date: Mon, 25 Jun 2018 12:09:38 +0800 Subject: [PATCH] Merge branch 'master' of https://github.com/HeYongRui/FireworkAnim # Conflicts: # .gitignore --- app/src/main/java/com/heyongrui/firework/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/heyongrui/firework/MainActivity.java b/app/src/main/java/com/heyongrui/firework/MainActivity.java index 4247adb..7cf0f66 100644 --- a/app/src/main/java/com/heyongrui/firework/MainActivity.java +++ b/app/src/main/java/com/heyongrui/firework/MainActivity.java @@ -17,7 +17,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListener { - private BezierFireworkAnim fireworkAnim; + private BezierFireworkAnim fireworkAnim;//贝塞尔抛物线动画 private Drawable redHeartBg; private Drawable grayBg;