Skip to content

Commit ce647e7

Browse files
android-cjjandroid-cjj
committed
fix some bug ......123
1 parent f01a49d commit ce647e7

File tree

15 files changed

+547
-54
lines changed

15 files changed

+547
-54
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
<category android:name="android.intent.category.LAUNCHER" />
1717
</intent-filter>
1818
</activity>
19-
<activity android:name=".ListViewActivity"/>
20-
<activity android:name=".RecyclerViewActivity"/>
19+
<activity android:name=".AutoRefreshActivity"/>
20+
<activity android:name=".LoadMoreActivity"/>
21+
<activity android:name=".SimpleActivity"/>
22+
<activity android:name=".WaveActivity"/>
23+
<activity android:name=".SunActivity"/>
24+
<activity android:name=".OverLayActivity"/>
2125
</application>
2226

2327
</manifest>

‎app/src/main/java/com/cjj/android_materialrefreshlayout/ListViewActivity.java renamed to ‎app/src/main/java/com/cjj/android_materialrefreshlayout/AutoRefreshActivity.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Created by Administrator on 2015/9/10.
1212
*/
13-
public class ListViewActivity extends BaseActivity {
13+
public class AutoRefreshActivity extends BaseActivity {
1414
private MaterialRefreshLayout materialRefreshLayout;
1515

1616
@Override
@@ -19,14 +19,13 @@ protected void onCreate(Bundle savedInstanceState) {
1919
setContentView(R.layout.activity_listview);
2020
String[] array = new String[50];
2121
for (int i = 0; i < array.length; i++) {
22-
array[i] = "cjj " + i;
22+
array[i] = "啊哈哈哈哈哈，啊哈哈 " + i;
2323
}
2424

2525
final ListView listView = (ListView) findViewById(R.id.lv);
2626
listView.setAdapter(new android.widget.ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, array));
2727
materialRefreshLayout = (MaterialRefreshLayout) findViewById(R.id.refresh);
2828
materialRefreshLayout.setLoadMore(true);
29-
materialRefreshLayout.setSunStyle(true);
3029
materialRefreshLayout.finishRefreshLoadMore();
3130
materialRefreshLayout.setMaterialRefreshListener(new MaterialRefreshListener() {
3231
@Override
@@ -43,12 +42,12 @@ public void run() {
4342

4443
@Override
4544
public void onfinish() {
46-
Toast.makeText(ListViewActivity.this, "finish", Toast.LENGTH_LONG).show();
45+
Toast.makeText(AutoRefreshActivity.this, "finish", Toast.LENGTH_LONG).show();
4746
}
4847

4948
@Override
5049
public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) {
51-
Toast.makeText(ListViewActivity.this, "load more", Toast.LENGTH_LONG).show();
50+
Toast.makeText(AutoRefreshActivity.this, "load more", Toast.LENGTH_LONG).show();
5251
}
5352
});
5453

‎app/src/main/java/com/cjj/android_materialrefreshlayout/RecyclerViewActivity.java renamed to ‎app/src/main/java/com/cjj/android_materialrefreshlayout/LoadMoreActivity.java

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.cjj.android_materialrefreshlayout;
22

33
import android.content.Context;
4-
import android.os.Handler;
54
import android.support.annotation.Nullable;
65
import android.os.Bundle;
76
import android.support.v7.widget.DefaultItemAnimator;
@@ -16,24 +15,23 @@
1615
import android.widget.ImageView;
1716
import android.widget.Toast;
1817

19-
import com.cjj.MaterialHeadListener;
2018
import com.cjj.MaterialRefreshLayout;
2119
import com.cjj.MaterialRefreshListener;
2220

2321
import java.util.ArrayList;
2422
import java.util.List;
2523
import java.util.Random;
2624

27-
public class RecyclerViewActivity extends BaseActivity {
25+
public class LoadMoreActivity extends BaseActivity {
2826
private MaterialRefreshLayout materialRefreshLayout;
27+
2928
@Override
3029
protected void onCreate(@Nullable Bundle savedInstanceState) {
3130
super.onCreate(savedInstanceState);
3231
setContentView(R.layout.fragment_list);
3332
initsToolbar();
3433

3534
materialRefreshLayout = (MaterialRefreshLayout) findViewById(R.id.refresh);
36-
materialRefreshLayout.setSunStyle(true);
3735
materialRefreshLayout.setMaterialRefreshListener(new MaterialRefreshListener() {
3836
@Override
3937
public void onRefresh(final MaterialRefreshLayout materialRefreshLayout) {
@@ -44,28 +42,30 @@ public void run() {
4442

4543
}
4644
}, 3000);
47-
materialRefreshLayout.finishRefreshLoadMore();
45+
4846

4947
}
5048

5149
@Override
5250
public void onfinish() {
53-
Toast.makeText(RecyclerViewActivity.this, "finish", Toast.LENGTH_LONG).show();
51+
Toast.makeText(LoadMoreActivity.this, "finish", Toast.LENGTH_LONG).show();
5452
}
5553

5654
@Override
57-
public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) {
58-
Toast.makeText(RecyclerViewActivity.this, "load more", Toast.LENGTH_LONG).show();
55+
public void onRefreshLoadMore(final MaterialRefreshLayout materialRefreshLayout) {
56+
Toast.makeText(LoadMoreActivity.this, "load more", Toast.LENGTH_LONG).show();
57+
58+
materialRefreshLayout.postDelayed(new Runnable() {
59+
@Override
60+
public void run() {
61+
materialRefreshLayout.finishRefreshLoadMore();
62+
63+
}
64+
}, 3000);
5965
}
6066
});
6167

62-
new Handler().postDelayed(new Runnable() {
63-
@Override
64-
public void run() {
65-
materialRefreshLayout
66-
.autoRefreshLoadMore();
67-
}
68-
}, 1000);
68+
6969
RecyclerView rv = (RecyclerView) findViewById(R.id.recyclerview);
7070
setupRecyclerView(rv);
7171
}
@@ -124,7 +124,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
124124

125125
private void setupRecyclerView(RecyclerView recyclerView) {
126126
recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext()));
127-
recyclerView.setAdapter(new SimpleStringRecyclerViewAdapter(RecyclerViewActivity.this));
127+
recyclerView.setAdapter(new SimpleStringRecyclerViewAdapter(LoadMoreActivity.this));
128128
recyclerView.setItemAnimator(new DefaultItemAnimator());
129129
}
130130

@@ -166,11 +166,9 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
166166

167167
@Override
168168
public void onBindViewHolder(final ViewHolder holder, int position) {
169-
if(position==0)
170-
{
169+
if (position == 0) {
171170
holder.mImageView.setImageResource(R.drawable.a6);
172-
}else if(position == 1)
173-
{
171+
} else if (position == 1) {
174172
holder.mImageView.setImageResource(R.drawable.a5);
175173
}
176174

‎app/src/main/java/com/cjj/android_materialrefreshlayout/OverLayActivity.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.cjj.android_materialrefreshlayout;
2+
3+
import android.os.Bundle;
4+
import android.widget.ListView;
5+
import android.widget.Toast;
6+
7+
import com.cjj.MaterialRefreshLayout;
8+
import com.cjj.MaterialRefreshListener;
9+
10+
/**
11+
* Created by cjj on 2016/2/24.
12+
*/
13+
public class OverLayActivity extends BaseActivity {
14+
15+
private MaterialRefreshLayout materialRefreshLayout;
16+
17+
@Override
18+
protected void onCreate(Bundle savedInstanceState) {
19+
super.onCreate(savedInstanceState);
20+
setContentView(R.layout.activity_listview);
21+
String[] array = new String[50];
22+
for (int i = 0; i < array.length; i++) {
23+
array[i] = "啊哈哈哈哈哈 " + i;
24+
}
25+
26+
final ListView listView = (ListView) findViewById(R.id.lv);
27+
listView.setAdapter(new android.widget.ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, array));
28+
materialRefreshLayout = (MaterialRefreshLayout) findViewById(R.id.refresh);
29+
materialRefreshLayout.setSunStyle(true);
30+
materialRefreshLayout.setIsOverLay(true);
31+
materialRefreshLayout.setMaterialRefreshListener(new MaterialRefreshListener() {
32+
@Override
33+
public void onRefresh(final MaterialRefreshLayout materialRefreshLayout) {
34+
materialRefreshLayout.postDelayed(new Runnable() {
35+
@Override
36+
public void run() {
37+
materialRefreshLayout.finishRefresh();
38+
39+
}
40+
}, 3000);
41+
42+
}
43+
44+
@Override
45+
public void onfinish() {
46+
Toast.makeText(OverLayActivity.this, "finish", Toast.LENGTH_LONG).show();
47+
}
48+
49+
50+
});
51+
52+
}
53+
}

‎app/src/main/java/com/cjj/android_materialrefreshlayout/ScrollViewActivity.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void run() {
2828
materialRefreshLayout.finishRefresh();
2929

3030
}
31-
}, 5000);
31+
}, 3000);
3232
materialRefreshLayout.finishRefreshLoadMore();
3333

3434
}
@@ -45,14 +45,32 @@ public void onClick(View v) {
4545

4646
switch (v.getId())
4747
{
48+
case R.id.simple:
49+
startActivity(new Intent(this,SimpleActivity.class));
50+
break;
51+
52+
case R.id.wave:
53+
startActivity(new Intent(this,WaveActivity.class));
54+
break;
55+
4856
case R.id.rv:
49-
Intent intent = new Intent(this,RecyclerViewActivity.class);
57+
Intent intent = new Intent(this,LoadMoreActivity.class);
5058
startActivity(intent);
5159
break;
5260
case R.id.lv:
53-
Intent intent2 = new Intent(this,ListViewActivity.class);
61+
Intent intent2 = new Intent(this,AutoRefreshActivity.class);
5462
startActivity(intent2);
5563
break;
64+
65+
66+
case R.id.sun:
67+
startActivity(new Intent(this,SunActivity.class));
68+
break;
69+
70+
case R.id.overLay:
71+
startActivity(new Intent(this,OverLayActivity.class));
72+
break;
73+
5674
}
5775
}
5876
}

‎app/src/main/java/com/cjj/android_materialrefreshlayout/SimpleActivity.java

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
package com.cjj.android_materialrefreshlayout;
2+
3+
import android.content.Context;
4+
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.support.v7.widget.DefaultItemAnimator;
7+
import android.support.v7.widget.LinearLayoutManager;
8+
import android.support.v7.widget.RecyclerView;
9+
import android.support.v7.widget.Toolbar;
10+
import android.view.LayoutInflater;
11+
import android.view.Menu;
12+
import android.view.View;
13+
import android.view.ViewGroup;
14+
import android.widget.ImageView;
15+
import android.widget.Toast;
16+
17+
import com.cjj.MaterialRefreshLayout;
18+
import com.cjj.MaterialRefreshListener;
19+
20+
import java.util.ArrayList;
21+
import java.util.List;
22+
import java.util.Random;
23+
24+
/**
25+
* Created by cjj on 2016/2/24.
26+
*/
27+
public class SimpleActivity extends BaseActivity {
28+
29+
private MaterialRefreshLayout materialRefreshLayout;
30+
31+
@Override
32+
protected void onCreate(@Nullable Bundle savedInstanceState) {
33+
super.onCreate(savedInstanceState);
34+
setContentView(R.layout.activity_simple);
35+
initsToolbar();
36+
37+
materialRefreshLayout = (MaterialRefreshLayout) findViewById(R.id.refresh);
38+
materialRefreshLayout.setMaterialRefreshListener(new MaterialRefreshListener() {
39+
@Override
40+
public void onRefresh(final MaterialRefreshLayout materialRefreshLayout) {
41+
materialRefreshLayout.postDelayed(new Runnable() {
42+
@Override
43+
public void run() {
44+
materialRefreshLayout.finishRefresh();
45+
46+
}
47+
}, 3000);
48+
materialRefreshLayout.finishRefreshLoadMore();
49+
50+
}
51+
52+
@Override
53+
public void onfinish() {
54+
Toast.makeText(SimpleActivity.this, "finish", Toast.LENGTH_LONG).show();
55+
}
56+
57+
});
58+
59+
RecyclerView rv = (RecyclerView) findViewById(R.id.recyclerview);
60+
setupRecyclerView(rv);
61+
}
62+
63+
private void initsToolbar() {
64+
Toolbar toolbar = (Toolbar) this.findViewById(R.id.toolbar);
65+
setSupportActionBar(toolbar);
66+
}
67+
68+
69+
@Override
70+
public boolean onCreateOptionsMenu(Menu menu) {
71+
getMenuInflater().inflate(R.menu.menu_main, menu);
72+
return true;
73+
}
74+
75+
private void setupRecyclerView(RecyclerView recyclerView) {
76+
recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext()));
77+
recyclerView.setAdapter(new SimpleStringRecyclerViewAdapter(SimpleActivity.this));
78+
recyclerView.setItemAnimator(new DefaultItemAnimator());
79+
}
80+
81+
private List<String> getRandomSublist(String[] array, int amount) {
82+
ArrayList<String> list = new ArrayList<>(amount);
83+
Random random = new Random();
84+
while (list.size() < amount) {
85+
list.add(array[random.nextInt(array.length)]);
86+
}
87+
return list;
88+
}
89+
90+
public static class SimpleStringRecyclerViewAdapter
91+
extends RecyclerView.Adapter<SimpleStringRecyclerViewAdapter.ViewHolder> {
92+
93+
94+
public static class ViewHolder extends RecyclerView.ViewHolder {
95+
96+
public final ImageView mImageView;
97+
98+
public ViewHolder(View view) {
99+
super(view);
100+
mImageView = (ImageView) view.findViewById(R.id.avatar);
101+
}
102+
103+
104+
}
105+
106+
public SimpleStringRecyclerViewAdapter(Context context) {
107+
super();
108+
}
109+
110+
@Override
111+
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
112+
View view = LayoutInflater.from(parent.getContext())
113+
.inflate(R.layout.list_item, parent, false);
114+
return new ViewHolder(view);
115+
}
116+
117+
@Override
118+
public void onBindViewHolder(final ViewHolder holder, int position) {
119+
if (position == 0) {
120+
holder.mImageView.setImageResource(R.drawable.a6);
121+
} else if (position == 1) {
122+
holder.mImageView.setImageResource(R.drawable.a5);
123+
}
124+
125+
}
126+
127+
@Override
128+
public int getItemCount() {
129+
return 3;
130+
}
131+
}
132+
133+
}

0 commit comments

Comments
 (0)