Skip to content

Commit 16f0992

Browse files
thinaaronthinaaron
committed
去除 jazzList 依赖，已经用 recyclerview 代替
1 parent 8ee33c5 commit 16f0992

31 files changed

Lines changed: 10 additions & 1142 deletions

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ dependencies {
8686
compile project(':social_sdk_library_project')
8787
compile 'com.bigkoo:convenientbanner:1.0.8'
8888
compile 'com.android.support:design:23.1.1'
89-
compile project(':scrollanimationlibrary')
9089
compile files('libs/pinyin4j-2.5.0.jar')
9190
compile files('libs/jg_filter_sdk_1.1.jar')
9291
compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')

‎app/src/main/java/net/coding/program/mall/MallIndexActivity.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
import android.view.View;
88

99
import net.coding.program.R;
10-
import net.coding.program.common.Global;
1110
import net.coding.program.common.SaveFragmentPagerAdapter;
1211
import net.coding.program.common.widget.RefreshBaseActivity;
13-
import net.coding.program.model.MallBannerObject;
1412
import net.coding.program.third.WechatTab;
1513

1614
import org.androidannotations.annotations.AfterViews;
@@ -38,12 +36,6 @@ public class MallIndexActivity extends RefreshBaseActivity {
3836
@ViewById
3937
View blankLayout;
4038

41-
final String BANNER_URL = Global.HOST_API + "/gifts/sliders";
42-
43-
final String TAG_BANNER = "TAG_BANNER";
44-
45-
private ArrayList<MallBannerObject> mBannerData = new ArrayList<>();
46-
4739
@OptionsItem
4840
void action_order() {
4941
MallOrderDetailActivity_.intent(this).start();

‎app/src/main/java/net/coding/program/mall/MallListFragment.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ public class MallListFragment extends RefreshBaseAppCompatFragment {
4949

5050
private MyRecyclerAdapter mAdapter;
5151

52-
View.OnClickListener onClickRetry = new View.OnClickListener() {
53-
@Override
54-
public void onClick(View v) {
55-
onRefresh();
56-
}
57-
};
52+
View.OnClickListener onClickRetry = v -> onRefresh();
5853

5954
@AfterViews
6055
void initView() {
@@ -126,9 +121,6 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
126121
if (code == 0) {
127122
if (isLoadingFirstPage(tag)) {
128123
mData.clear();
129-
// mAdapter = new MyRecyclerAdapter(mData, userPoint, getImageLoad(),
130-
// getActivity());
131-
// mallListHeaderGridView.setAdapter(mAdapter);
132124
mAdapter.setUserPoint(userPoint);
133125
mAdapter.removeAll();
134126
}
@@ -180,20 +172,16 @@ public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
180172

181173
private int space;
182174

183-
public SpaceItemDecoration(int space) {
175+
SpaceItemDecoration(int space) {
184176
this.space = space;
185177
}
186178

187179
@Override
188180
public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
189181
RecyclerView.State state) {
190-
191182
outRect.left = space;
192183
outRect.right = space;
193184
outRect.bottom = space / 2;
194-
195-
// if(parent.getChildLayoutPosition(view) == 0)
196-
// outRect.top = space;
197185
}
198186
}
199187
}

‎app/src/main/java/net/coding/program/mall/MallOrderDetailFragment.java‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
/**
3232
* Created by libo on 2015/11/22.
33+
*
3334
*/
3435
@EFragment(R.layout.fragment_mall_order_detail)
3536
public class MallOrderDetailFragment extends RefreshBaseFragment {
@@ -38,10 +39,7 @@ public class MallOrderDetailFragment extends RefreshBaseFragment {
3839
ListView listView;
3940

4041
@ViewById
41-
View blankLayout;
42-
43-
@ViewById
44-
View list_footer;
42+
View blankLayout, list_footer;
4543

4644
@FragmentArg
4745
Type mType;
@@ -52,12 +50,7 @@ public class MallOrderDetailFragment extends RefreshBaseFragment {
5250

5351
String mUrl;
5452

55-
View.OnClickListener onClickRetry = new View.OnClickListener() {
56-
@Override
57-
public void onClick(View v) {
58-
onRefresh();
59-
}
60-
};
53+
View.OnClickListener onClickRetry = v -> onRefresh();
6154

6255
BaseAdapter mAdapter = new BaseAdapter() {
6356
@Override
@@ -162,9 +155,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
162155
@AfterViews
163156
protected final void init() {
164157
initRefreshLayout();
165-
// mFootUpdate.init(listView, mInflater, this);
166158
list_footer.setVisibility(View.GONE);
167-
168159
listView.setAdapter(mAdapter);
169160
switch (mType) {
170161
case un_send:
@@ -209,30 +200,12 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
209200
}
210201
}
211202

212-
// MallOrderObject orderObject = new MallOrderObject();
213-
// orderObject.setCreatedAt(1448174663000L);
214-
// orderObject.setExpressNo("expressNo");
215-
// orderObject.setId(1);
216-
// orderObject.setName("name");
217-
// orderObject.setOrderNo("12312421");
218-
// orderObject.setPointsCost(2.2);
219-
// orderObject.setReceiverAddress("address");
220-
// orderObject.setReceiverName("receiverName");
221-
// orderObject.setReceiverPhone("123532424");
222-
// orderObject.setRemark("remark");
223-
// orderObject.setStatus(0);
224-
// orderObject.setUserId(23424);
225-
//
226-
// mData.add(orderObject);
227-
228203
if (mData.size() != 0 && footerAdded.compareAndSet(false, true)) {
229-
230204
View footerView = LayoutInflater.from(getActivity()).inflate(
231205
R.layout.mall_detail_list_footer, listView, false);
232206
listView.addFooterView(footerView, null, false);
233207
}
234208

235-
// mFootUpdate.updateState(code, isLoadingLastPage(tag), mData.size());
236209
String tip = BlankViewDisplay.OTHER_MALL_ORDER_BLANK;
237210
if (mType == Type.already_send) {
238211
tip = BlankViewDisplay.OTHER_MALL_ORDER_BLANK_ALREADYSEND;
@@ -254,7 +227,6 @@ public void loadMore() {
254227
showDialogLoading();
255228
}
256229
getNextPageNetwork(mUrl, mUrl);
257-
258230
}
259231

260232
@Override
@@ -270,31 +242,17 @@ public enum Type {
270242
}
271243

272244
class ViewHolder {
273-
274245
ImageView goodImg;
275-
276246
TextView orderNo;
277-
278247
TextView goodTitle;
279-
280248
TextView count;
281-
282249
TextView note;
283-
284250
TextView pointCost;
285-
286251
TextView receiverName;
287-
288252
TextView receiverPhone;
289-
290253
TextView status;
291-
292254
TextView express;
293-
294255
TextView time;
295-
296256
TextView receiverAddress;
297-
298257
}
299-
300258
}

‎app/src/main/java/net/coding/program/maopao/MaopaoListFragment.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
import android.view.MenuInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12-
import android.view.ViewPropertyAnimator;
1312
import android.widget.ImageView;
1413
import android.widget.TextView;
1514

1615
import com.bigkoo.convenientbanner.CBPageAdapter;
1716
import com.bigkoo.convenientbanner.CBViewHolderCreator;
1817
import com.bigkoo.convenientbanner.ConvenientBanner;
1918
import com.melnykov.fab.FloatingActionButton;
20-
import com.twotoasters.jazzylistview.effects.SlideInEffect;
2119

2220
import net.coding.program.MyApp;
2321
import net.coding.program.R;
@@ -355,23 +353,6 @@ public ClickImageParam(String url) {
355353

356354
ArrayList<BannerObject> mBannerDatas = new ArrayList<>();
357355

358-
// listview 向上滑才有动画
359-
class UpSlideInEffect extends SlideInEffect {
360-
@Override
361-
public void initView(View item, int position, int scrollDirection) {
362-
if (scrollDirection > 0) {
363-
super.initView(item, position, scrollDirection);
364-
}
365-
}
366-
367-
@Override
368-
public void setupAnimation(View item, int position, int scrollDirection, ViewPropertyAnimator animator) {
369-
if (scrollDirection > 0) {
370-
super.setupAnimation(item, position, scrollDirection, animator);
371-
}
372-
}
373-
}
374-
375356
class LocalImageHolder implements CBPageAdapter.Holder<BannerObject> {
376357
ImageView imageView;
377358

‎app/src/main/java/net/coding/program/user/UserPointActivity.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,8 @@ public class UserPointActivity extends BackActivity {
4343
protected final void initUserPointActivity() {
4444
View head = mInflater.inflate(R.layout.user_point_list_head, null);
4545
pointsAll = (TextView) head.findViewById(R.id.pointAll);
46-
head.findViewById(R.id.itemShop).setOnClickListener(new View.OnClickListener() {
47-
@Override
48-
public void onClick(View v) {
49-
// WebActivity_.intent(UserPointActivity.this)
50-
// .url(Global.HOST + "/shop")
51-
// .start();
52-
MallIndexActivity_.intent(UserPointActivity.this).start();
53-
}
54-
});
46+
head.findViewById(R.id.itemShop).setOnClickListener(v ->
47+
MallIndexActivity_.intent(UserPointActivity.this).start());
5548
listView.addHeaderView(head, null, false);
5649

5750
View footShade = mInflater.inflate(R.layout.divide_shade_up, null);

‎app/src/main/res/layout/fragment_mall_order_detail.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
android:layout_above="@+id/list_footer"
1616
android:layout_height="match_parent">
1717

18-
<!--todo 替换为 listview -->
19-
<com.twotoasters.jazzylistview.JazzyListView
18+
<ListView
2019
android:id="@+id/listView"
2120
android:scrollingCache="false"
2221
android:layout_width="match_parent"
2322
android:layout_height="wrap_content"
2423
android:background="@color/divide"
2524
android:divider="@null"
26-
android:dividerHeight="6dp"
25+
android:dividerHeight="0dp"
2726
android:footerDividersEnabled="false"/>
2827

2928
</android.support.v4.widget.SwipeRefreshLayout>

‎scrollanimationlibrary/build.gradle‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎scrollanimationlibrary/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)