我的资产界面完善；任务记录与提现明细界面优化

app/src/main/java/com/kfzs/duanduan/fragment/FgtMyMoney2.java

@@ -1,6 +1,5 @@
 package com.kfzs.duanduan.fragment;
 
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
@@ -19,9 +18,6 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 
@@ -35,7 +31,7 @@ import rx.schedulers.Schedulers;
  * Created by realicing on 2018/5/8.
  * realicing@sina.com
  */
-public class FgtMyMoney2 extends BaseFragment {
+public class FgtMyMoney extends BaseFragment {
     @BindView(R.id.list_view)
     ListView list_view;
     @BindView(R.id.swipe_container)
@@ -44,7 +40,7 @@ public class FgtMyMoney2 extends BaseFragment {
     View empty_view;
     @Override
     public int getLayoutId() {
-        return R.layout.list_has_empty2;
+        return R.layout.list_has_empty;
     }
 
     private List<Friend> list = ListUtil.emptyList();
@@ -57,13 +53,20 @@ public class FgtMyMoney2 extends BaseFragment {
             adapter = new ArrayAdapter<Friend>(getActivity(), R.layout.x_my_money_act_layout_item, list){
                 @Override
                 public boolean convert(int position, View convertView, ViewGroup parent, Friend item) {
+                    View my_money_item_top = convertView.findViewById(R.id.my_money_item_top);
+                    View my_money_item_center = convertView.findViewById(R.id.my_money_item_center);
+                    View my_money_item_bottom = convertView.findViewById(R.id.my_money_item_bottom);
                     TextView my_money_item_recharge_amount = convertView.findViewById(R.id.my_money_item_recharge_amount);
                     TextView my_money_item_recharge_status = convertView.findViewById(R.id.my_money_item_recharge_status);
                     TextView my_money_item_recharge_time = convertView.findViewById(R.id.my_money_item_recharge_time);
                     my_money_item_recharge_amount.setText(String.format(Locale.CHINA, "%d", position+1));
                     my_money_item_recharge_status.setText(item.getInvitation_code());
                     my_money_item_recharge_time.setText(TimeUtil.TimeStamp2Date(item.getCreate_time(), "yyyy/MM/dd HH:mm"));
-                    convertView.setBackgroundColor(position % 2 == 1 ? 0xffF8F8F8 : 0xffffffff);
+                    boolean isFirst = position == 0;
+                    boolean isLast = ListUtil.isLastPosition(list, position);
+                    my_money_item_top.setVisibility(isFirst ? View.VISIBLE : View.GONE);
+                    my_money_item_center.setBackgroundColor(position % 2 == 1 ? 0xffF8F8F8 : 0xffffffff);
+                    my_money_item_bottom.setVisibility(isLast ? View.VISIBLE : View.GONE);
                     return true;
                 }
             };

app/src/main/java/com/kfzs/duanduan/fragment/FgtMyMoney1.java

@@ -1,102 +0,0 @@
-package com.kfzs.duanduan.fragment;
-
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.alibaba.fastjson.JSON;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.view.adapter.ArrayAdapter;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * 我的资产 --> 充值记录
- * Created by realicing on 2018/5/8.
- * realicing@sina.com
- */
-public class FgtMyMoney1 extends BaseFragment {
-    @BindView(R.id.list_view)
-    ListView list_view;
-    @BindView(R.id.swipe_container)
-    SwipeRefreshLayout swipe_container;
-    @BindView(R.id.empty_view)
-    View empty_view;
-    @Override
-    public int getLayoutId() {
-        return R.layout.list_has_empty;
-    }
-
-    private List<TaskReleaseEty> list = new ArrayList<>();
-    private ArrayAdapter<TaskReleaseEty> adapter;
-    @Override
-    public void onViewCreated() {
-        ButterKnife.bind(this, mView);
-        if(getActivity() != null) {
-//            swipe_container.setFooterView(getActivity(), list_view, R.layout.listview_footer);
-            adapter = new ArrayAdapter<TaskReleaseEty>(getActivity(), R.layout.x_my_money_act_layout_item, list){
-                @Override
-                public boolean convert(int position, View convertView, ViewGroup parent, TaskReleaseEty item) {
-                    TextView my_money_item_recharge_amount = convertView.findViewById(R.id.my_money_item_recharge_amount);
-                    TextView my_money_item_recharge_status = convertView.findViewById(R.id.my_money_item_recharge_status);
-                    TextView my_money_item_recharge_time = convertView.findViewById(R.id.my_money_item_recharge_time);
-                    convertView.setBackgroundColor(position % 2 == 1 ? 0xffF8F8F8 : 0xffffffff);
-                    return true;
-                }
-            };
-            list_view.setAdapter(adapter);
-            swipe_container.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-                @Override
-                public void onRefresh() {
-                    initData();
-                }
-            });
-            initData();
-        }
-    }
-
-    private void initData() {
-        list.clear();
-        adapter.notifyDataSetChanged();
-        empty_view.setVisibility(View.INVISIBLE);
-        SheepApp.getInstance().getNetComponent().getApiService().getReleaseTaskCreditCard()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
-                        list.addAll(newList);
-                        notifyDataSetChanged();
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        if(BuildConfig.DEBUG)
-                            System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
-                        notifyDataSetChanged();
-                    }
-                });
-    }
-    private void notifyDataSetChanged() {
-        empty_view.setVisibility(list.isEmpty() ? View.VISIBLE : View.INVISIBLE);
-        adapter.notifyDataSetChanged();
-        swipe_container.setRefreshing(false);
-    }
-}

app/src/main/java/com/sheep/gamegroup/util/ListUtil.java

@@ -37,4 +37,12 @@ public class ListUtil {
         }
         return count;
     }
+
+    public static <T> boolean isLastPosition(List<T> list, int position) {
+        return size(list) == position + 1;
+    }
+
+    private static <T> int size(List<T> list) {
+        return isEmpty(list) ? 0 : list.size();
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -13,8 +13,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;
-import com.kfzs.duanduan.fragment.FgtMyMoney1;
-import com.kfzs.duanduan.fragment.FgtMyMoney2;
+import com.kfzs.duanduan.fragment.FgtMyMoney;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
@@ -65,8 +64,8 @@ public class ActMyMoney extends AbsChooseImageActivity {
 //        String sr = "可提现金额 <font color='#ff2d4b'><big>" + balanceAmount + "</big></font> 元";
 //        tv.setText(Html.fromHtml(sr));
         mAdapter = new GiftpackListAdapter(getSupportFragmentManager(), getApplicationContext());
-        mAdapter.add(new FgtMyMoney2(), "充值记录");
-        mAdapter.add(new FgtMyMoney1(), "提现&消费记录");
+        mAdapter.add(new FgtMyMoney(), "充值记录");
+        mAdapter.add(new FgtMyMoney(), "提现&消费记录");
         pager.setAdapter(mAdapter);
 //        indicator.setupWithViewPager(pager);
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

app/src/main/res/drawable/shape_white_solid_rectangle_small_bottom.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
+    <solid android:color="#ffffff" />
+</shape>

app/src/main/res/drawable/shape_white_solid_rectangle_small_top.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" />
+    <solid android:color="#ffffff" />
+</shape>

app/src/main/res/layout/list_has_empty.xml

@@ -9,27 +9,19 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/content_padding_10">
 
-        <LinearLayout
+        <ListView
+            android:id="@+id/list_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ListView
-                android:id="@+id/list_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_white_solid_rectangle_small"
-                android:divider="@null"
-                android:listSelector="@color/transparent"
-                android:paddingBottom="@dimen/content_padding_8"
-                android:paddingTop="@dimen/content_padding_8"
-                android:scrollbars="none" />
-        </LinearLayout>
-    </android.support.v4.widget.SwipeRefreshLayout>
+            android:layout_height="wrap_content"
+            android:divider="@null"
+            android:listSelector="@color/transparent"
+            android:scrollbars="none" />
+    </com.sheep.gamegroup.view.customview.RefreshLayout>
 
 </RelativeLayout>

app/src/main/res/layout/list_has_empty2.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <include
-        android:id="@+id/empty_view"
-        layout="@layout/empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.sheep.gamegroup.view.customview.RefreshLayout
-        android:id="@+id/swipe_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding_10">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ListView
-                android:id="@+id/list_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_white_solid_rectangle_small"
-                android:divider="@null"
-                android:listSelector="@color/transparent"
-                android:paddingBottom="@dimen/content_padding_8"
-                android:paddingTop="@dimen/content_padding_8"
-                android:scrollbars="none" />
-        </LinearLayout>
-    </com.sheep.gamegroup.view.customview.RefreshLayout>
-
-</RelativeLayout>

app/src/main/res/layout/withdrawal_list.xml

@@ -19,6 +19,7 @@
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:padding="@dimen/content_padding_13"
         android:layout_below="@+id/title">
 
         <ListView
@@ -26,8 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@+id/title"
-            android:layout_margin="@dimen/content_padding_13"
-            android:divider="@null"
+            android:divider="@color/transparent"
+            android:dividerHeight="@dimen/content_padding_10"
             android:listSelector="@color/transparent"
             android:scrollbars="none" />
 

app/src/main/res/layout/x_my_money_act_layout_item.xml

@@ -2,38 +2,61 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:padding="@dimen/content_padding_10"
-    android:orientation="horizontal">
-    <TextView
-        android:id="@+id/my_money_item_recharge_amount"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:gravity="left"
-        android:singleLine="true"
-        android:textSize="12sp"
-        android:textColor="#282828"
-        android:text="充值金额100.00元"/>
-    <TextView
-        android:id="@+id/my_money_item_recharge_status"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textSize="12sp"
-        android:textColor="#282828"
-        android:text="充值成功"/>
-    <TextView
-        android:id="@+id/my_money_item_recharge_time"
-        android:layout_width="0dp"
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/my_money_item_top"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_10"
+        android:background="@drawable/shape_white_solid_rectangle_small_top" />
+
+    <LinearLayout
+        android:id="@+id/my_money_item_center"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:singleLine="true"
-        android:gravity="right"
-        android:textSize="12sp"
-        android:textColor="#282828"
-        android:text="2018/05/07 20:59"/>
+        android:gravity="center_vertical"
+        android:padding="@dimen/content_padding_10"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/my_money_item_recharge_amount"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="left"
+            android:singleLine="true"
+            android:text="充值金额100.00元"
+            android:textColor="#282828"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/my_money_item_recharge_status"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:singleLine="true"
+            android:text="充值成功"
+            android:textColor="#282828"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/my_money_item_recharge_time"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="right"
+            android:singleLine="true"
+            android:text="2018/05/07 20:59"
+            android:textColor="#282828"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/my_money_item_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_10"
+        android:background="@drawable/shape_white_solid_rectangle_small_bottom" />
 
 </LinearLayout>