diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo1/Demo1Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo1/Demo1Activity.java index f804a4b..0d346f3 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo1/Demo1Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo1/Demo1Activity.java @@ -4,6 +4,7 @@ import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.View; import com.liaoinstan.demospring.R; import com.liaoinstan.springview.container.DefaultFooter; @@ -26,7 +27,7 @@ protected void onCreate(Bundle savedInstanceState) { springView.setType(SpringView.Type.FOLLOW); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -36,7 +37,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo2/Demo2Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo2/Demo2Activity.java index 38bf36b..b68e8de 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo2/Demo2Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo2/Demo2Activity.java @@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) { springView = (SpringView) findViewById(R.id.springview); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -64,7 +64,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java index b91d96b..c8487a9 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo3/Demo3Activity.java @@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) { springView.setType(SpringView.Type.FOLLOW); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -64,7 +64,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo5/Demo5Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo5/Demo5Activity.java index 09cc1cd..e9c4b4e 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo5/Demo5Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo5/Demo5Activity.java @@ -3,8 +3,10 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.View; import com.liaoinstan.demospring.R; import com.liaoinstan.springview.container.AcFunFooter; @@ -26,11 +28,11 @@ protected void onCreate(Bundle savedInstanceState) { springView.setGive(SpringView.Give.NONE); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { } }); springView.setHeader(new AcFunHeader(this,R.drawable.acfun_header)); diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo6/Demo6Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo6/Demo6Activity.java index 879519c..c078b81 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo6/Demo6Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo6/Demo6Activity.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.View; import android.widget.RadioGroup; import com.liaoinstan.demospring.R; @@ -32,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) { // springView.setGive(SpringView.Give.NONE); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { //如果当前设置的头部是QQHeader,则不finish if (springView.getHeader() instanceof QQHeader) return; @@ -45,7 +46,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo7/Demo7Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo7/Demo7Activity.java index e4cb298..31eac8f 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo7/Demo7Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo7/Demo7Activity.java @@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) { springView.setType(SpringView.Type.FOLLOW); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -44,7 +44,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/demo8/Demo8Activity.java b/demo/src/main/java/com/liaoinstan/demospring/demo8/Demo8Activity.java index d6b0cae..2afb442 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/demo8/Demo8Activity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/demo8/Demo8Activity.java @@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) { springView.setType(SpringView.Type.FOLLOW); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -48,7 +48,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/test/TestActivity.java b/demo/src/main/java/com/liaoinstan/demospring/test/TestActivity.java index cdfb9fb..a28b09a 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/test/TestActivity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/test/TestActivity.java @@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) { springView = (SpringView) findViewById(R.id.my); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { Toast.makeText(TestActivity.this, "onRefresh", Toast.LENGTH_SHORT).show(); new Handler().postDelayed(new Runnable() { @Override @@ -36,8 +36,8 @@ public void run() { } @Override - public void onLoadmore() { - Toast.makeText(TestActivity.this, "onLoadmore", Toast.LENGTH_SHORT).show(); + public void onLoadMore(View view) { + Toast.makeText(TestActivity.this, "onLoadMore", Toast.LENGTH_SHORT).show(); new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/demo/src/main/java/com/liaoinstan/demospring/warning/WarningActivity.java b/demo/src/main/java/com/liaoinstan/demospring/warning/WarningActivity.java index 1db6157..9ddf679 100644 --- a/demo/src/main/java/com/liaoinstan/demospring/warning/WarningActivity.java +++ b/demo/src/main/java/com/liaoinstan/demospring/warning/WarningActivity.java @@ -4,6 +4,7 @@ import android.os.Handler; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.View; import android.view.ViewGroup; import android.widget.RadioGroup; import android.widget.TextView; @@ -32,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) { springView = (SpringView) findViewById(R.id.springview); springView.setListener(new SpringView.OnFreshListener() { @Override - public void onRefresh() { + public void onRefresh(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { @@ -42,7 +43,7 @@ public void run() { } @Override - public void onLoadmore() { + public void onLoadMore(View view) { new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/library/src/main/java/com/liaoinstan/springview/widget/SpringView.java b/library/src/main/java/com/liaoinstan/springview/widget/SpringView.java index 45d2718..14cc794 100644 --- a/library/src/main/java/com/liaoinstan/springview/widget/SpringView.java +++ b/library/src/main/java/com/liaoinstan/springview/widget/SpringView.java @@ -6,7 +6,6 @@ import android.support.v4.view.MotionEventCompat; import android.support.v4.view.ViewCompat; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -94,15 +93,15 @@ public SpringView(Context context, AttributeSet attrs) { give = Give.values()[give_int]; } if (ta.hasValue(R.styleable.SpringView_header)){ - headerResoureId = ta.getResourceId(R.styleable.SpringView_header, 0); + headerResourceId = ta.getResourceId(R.styleable.SpringView_header, 0); } if (ta.hasValue(R.styleable.SpringView_footer)){ - footerResoureId = ta.getResourceId(R.styleable.SpringView_footer, 0); + footerResourceId = ta.getResourceId(R.styleable.SpringView_footer, 0); } ta.recycle(); } - private int headerResoureId; - private int footerResoureId; + private int headerResourceId; + private int footerResourceId; @Override protected void onFinishInflate() { @@ -112,12 +111,12 @@ protected void onFinishInflate() { } setPadding(0,0,0,0); contentView.setPadding(0,contentView.getPaddingTop(),0,contentView.getPaddingBottom()); - if (headerResoureId!=0){ - inflater.inflate(headerResoureId, this, true); + if (headerResourceId !=0){ + inflater.inflate(headerResourceId, this, true); header = getChildAt(getChildCount()-1); } - if (footerResoureId!=0){ - inflater.inflate(footerResoureId, this, true); + if (footerResourceId !=0){ + inflater.inflate(footerResourceId, this, true); footer = getChildAt(getChildCount()-1); footer.setVisibility(INVISIBLE); } @@ -552,18 +551,18 @@ private void callOnAfterFullAnim(){ private void callOnAfterRefreshAnim(){ if (type == Type.FOLLOW) { if (isTop()) { - listener.onRefresh(); + listener.onRefresh(this); } else if (isBottom()) { - listener.onLoadmore(); + listener.onLoadMore(this); } }else if(type == Type.OVERLAP){ if (!isMoveNow) { long nowtime = System.currentTimeMillis(); if (nowtime-lastMoveTime>=MOVE_TIME_OVER){ if (callFreshORload == 1) - listener.onRefresh(); + listener.onRefresh(this); if (callFreshORload == 2) - listener.onLoadmore(); + listener.onLoadMore(this); } } } @@ -612,12 +611,12 @@ private void callOnFinishAnim(){ if (callFreshORload == 1) { if (headerHander != null) headerHander.onFinishAnim(); if (give == Give.BOTTOM || give == Give.NONE){ - listener.onRefresh(); + listener.onRefresh(this); } } else if (callFreshORload == 2) { if (footerHander != null) footerHander.onFinishAnim(); if (give == Give.TOP || give == Give.NONE){ - listener.onLoadmore(); + listener.onLoadMore(this); } } callFreshORload=0; @@ -704,7 +703,7 @@ public void onAnimationStart(Animation animation) { public void onAnimationEnd(Animation animation) { callFreshORload = 1; needResetAnim = true; - listener.onRefresh(); + listener.onRefresh(SpringView.this); } @Override @@ -1019,11 +1018,11 @@ public interface OnFreshListener{ /** * 下拉刷新，回调接口 */ - void onRefresh(); + void onRefresh(View view); /** * 上拉加载，回调接口 */ - void onLoadmore(); + void onLoadMore(View view); } public View getHeaderView(){