资金记录

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -15,8 +15,8 @@ public class Config {
         return mConfig;
     }
 
-//    public String mBaseUrl = "http://10.8.220.213:8088";
-    public String mBaseUrl = "http://test.ss.shouyouquan.com";
+    public String mBaseUrl = "http://10.8.220.213:8088";
+//    public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static  String WX_APPID = "wx3c0376c4fcc8b723";
     public final static  String BUGLY_APPID = "0dd998212c";
     public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.213:8089", "http://10.8.220.250:8088"};

app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -108,8 +108,7 @@ public class LoginActivity extends BaseActivity {
         req.state = "small_sheep_auther";
         SheepApp.mWxapi.sendReq(req);*/
 
-//        SpUtils.login(this, "4ff3898049503dfb7ca61da4dc31cc91");
-        SpUtils.login(this, "123456");
+        SpUtils.login(this, "5e640a54730f5bec1e2fa6dc53200a20");
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MoneyHistroyActivity.java

@@ -1,8 +1,10 @@
 package com.sheep.jiuyan.samllsheep.page;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -12,6 +14,7 @@ import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
+import com.sheep.jiuyan.samllsheep.page.entry.MoneyRecord;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -25,7 +28,7 @@ import java.util.List;
 public class MoneyHistroyActivity extends BaseActivity {
     private ListView mLv;
     private MoneyAdapter mAdapter;
-    List<MoneyHistroy> mData;
+    List<MoneyRecord> mData;
 
     @Override
     protected int getLayoutId() {
@@ -45,7 +48,7 @@ public class MoneyHistroyActivity extends BaseActivity {
     public void initListener() {
     }
 
-    private void showView(List<MoneyHistroy> orders) {
+    private void showView(List<MoneyRecord> orders) {
         mData = orders;
         if (mAdapter == null) {
             mAdapter = new MoneyAdapter();
@@ -58,9 +61,9 @@ public class MoneyHistroyActivity extends BaseActivity {
     private void getTask() {
         final HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
-        NetManager.get(Url.MONEYRECORD, map, getApplicationContext(), new SheepCallback<List<MoneyHistroy>>(this) {
+        NetManager.get(Url.MONEYRECORD, map, getApplicationContext(), new SheepCallback<List<MoneyRecord>>(this) {
             @Override
-            public void success(List<MoneyHistroy> orders) {
+            public void success(List<MoneyRecord> orders) {
                 showView(orders);
             }
         });
@@ -94,7 +97,10 @@ public class MoneyHistroyActivity extends BaseActivity {
 
         @Override
         public int getItemViewType(int position) {
-            return super.getItemViewType(position);
+            if (TextUtils.isEmpty(mData.get(position).getMonth())) {
+                return 1;
+            } else
+                return 0;
         }
 
         @Override
@@ -104,36 +110,77 @@ public class MoneyHistroyActivity extends BaseActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
+            int type = getItemViewType(position);
+            if (type == 0) {
+                convertView = getTabView(position, convertView, parent);
+            } else if (type == 1) {
+                convertView = getInfoView(position, convertView, parent);
+            }
+            return convertView;
+        }
+
+        private View getTabView(final int position, View convertView,
+                                ViewGroup parent) {
+            final TablViewHolder holder;
             if (convertView == null) {
-                int type = getItemViewType(position);
-                if (type == 0) {
-                    convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item, null);
-                    assignViews(convertView);
-                } else if (type == 1) {
-                    convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item_tab, null);
-                    assignViewsTab(convertView);
-                }
+                convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item_tab, null);
+                holder = new TablViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (TablViewHolder) convertView.getTag();
             }
+            MoneyRecord record = mData.get(position);
+            holder.mTvMonth.setText(record.getMonth());
             return convertView;
         }
 
+        private View getInfoView(final int position, View convertView,
+                                 ViewGroup parent) {
+            final InfoViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item, null);
+                holder = new InfoViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (InfoViewHolder) convertView.getTag();
+            }
+            MoneyRecord record = mData.get(position);
+            holder.mTvClass.setText(record.getData().getDesc());
+            if (record.getData().getMoney().startsWith("-")) {
+                holder.mTvMoney.setTextColor(getResources().getColor(R.color.green));
+            } else {
+                holder.mTvMoney.setTextColor(getResources().getColor(R.color.orange_text_light));
+            }
+            holder.mTvMoney.setText(record.getData().getMoney());
+            holder.mTvTime.setText(record.getData().getCreateTime());
+
+            return convertView;
+        }
+    }
+
+    class TablViewHolder {
         private TextView mTvIn;
         private TextView mTvOut;
+        private TextView mTvMonth;
 
-        private void assignViewsTab(View view) {
+        public TablViewHolder(View view) {
             mTvIn = (TextView) view.findViewById(R.id.tv_in);
             mTvOut = (TextView) view.findViewById(R.id.tv_out);
+            mTvMonth = (TextView) view.findViewById(R.id.tv_month);
         }
+    }
 
-
+    class InfoViewHolder {
         private TextView mTvDesc;
         private TextView mTvClass;
         private TextView mTvTime;
         private TextView mTvMoney;
+        private ImageView mTvIcon;
 
-        private void assignViews(View view) {
+        public InfoViewHolder(View view) {
             mTvDesc = (TextView) view.findViewById(R.id.tv_desc);
             mTvClass = (TextView) view.findViewById(R.id.tv_class);
+            mTvIcon = (ImageView) view.findViewById(R.id.img_icon);
             mTvTime = (TextView) view.findViewById(R.id.tv_time);
             mTvMoney = (TextView) view.findViewById(R.id.tv_money);
         }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/entry/MoneyRecord.java

@@ -5,4 +5,29 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  */
 
 public class MoneyRecord {
+
+
+    /**
+     * Month : 2018年02月
+     * Data : {"Id":0,"Uid":0,"Desc":"","Money":"","CreateTime":"","Balance":""}
+     */
+
+    private String Month;
+    private MoneyHistroy Data;
+
+    public String getMonth() {
+        return Month;
+    }
+
+    public void setMonth(String month) {
+        Month = month;
+    }
+
+    public MoneyHistroy getData() {
+        return Data;
+    }
+
+    public void setData(MoneyHistroy data) {
+        Data = data;
+    }
 }

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical">
@@ -32,7 +33,7 @@
             android:text="1218"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_income"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_income"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -45,7 +46,7 @@
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
             android:visibility="gone"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_succ"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_succ"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_history"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -57,7 +58,7 @@
             android:text="128"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_3"
-            app:layout_constraintLeft_toRightOf="@id/txt_fgt_main_page_task_remain"
+            app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -69,9 +70,9 @@
             android:text="今日收入"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_income"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_income"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_income"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_income"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -80,9 +81,9 @@
             android:text="今日完成"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_succ"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_succ"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_succ"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_succ"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -92,9 +93,9 @@
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
             android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_remain"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_remain"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_remain"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_remain"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -103,17 +104,18 @@
             android:text="任务记录"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_2"
-            app:layout_constraintLeft_toLeftOf="@id/txt_fgt_main_page_task_history"
-            app:layout_constraintRight_toRightOf="@id/txt_fgt_main_page_task_history"
-            app:layout_constraintTop_toBottomOf="@id/txt_fgt_main_page_task_income" />
+            app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_history"
+            app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_history"
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/layout_heigh_default"
+            android:layout_width="8dp"
+            android:layout_height="48dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteX="8dp">
 
             <View
                 android:id="@+id/view_income_today"

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

@@ -7,8 +7,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding"
+        android:layout_height="@dimen/layout_heigh_default"
+        android:layout_margin="@dimen/content_padding_small"
         android:layout_marginTop="5dp"
         android:background="@color/background_light_gray"
         android:gravity="center_vertical"
@@ -16,18 +16,22 @@
         >
 
         <ImageView
+            android:id="@+id/img_icon"
             android:layout_width="@dimen/image_item"
             android:layout_height="@dimen/image_item"
             android:layout_gravity="center_vertical"
             android:layout_margin="@dimen/content_padding"
+            android:src="@drawable/icon"
+            android:visibility="gone"
             />
 
         <LinearLayout
+            android:padding="@dimen/content_padding_small"
             android:layout_width="wrap_content"
-            android:paddingTop="@dimen/content_padding"
-            android:paddingBottom="@dimen/content_padding"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_marginLeft="@dimen/content_padding"
+            android:orientation="vertical"
+            >
 
             <TextView
                 android:id="@+id/tv_desc"
@@ -36,7 +40,8 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:textColor="@color/black_dark"
-                android:textSize="@dimen/text_size_4"/>
+                android:textSize="@dimen/text_size_4"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/tv_class"
@@ -44,8 +49,7 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:padding="3dp"
-                android:textColor="@color/black_text_gray"
+                android:textColor="@color/black_text_deep"
                 android:textSize="@dimen/text_size_3"/>
 
             <TextView
@@ -55,9 +59,8 @@
                 android:layout_centerVertical="true"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="asdas"
                 android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_3"/>
+                android:textSize="@dimen/text_size_2"/>
         </LinearLayout>
 
         <TextView

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

@@ -15,6 +15,7 @@
         >
 
         <TextView
+            android:id="@+id/tv_month"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="@dimen/content_padding"
@@ -24,6 +25,7 @@
             />
 
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/content_padding"