任务记录

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

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

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

@@ -38,6 +38,7 @@ public class MoneyHistroyActivity extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setTitle(this, "资金记录")
                 .setTitleFinish(this);
+        mLv.setDividerHeight(0);
     }
 
     @Override
@@ -110,11 +111,21 @@ public class MoneyHistroyActivity extends BaseActivity {
                     assignViews(convertView);
                 } else if (type == 1) {
                     convertView = View.inflate(MoneyHistroyActivity.this, R.layout.money_history_item_tab, null);
+                    assignViewsTab(convertView);
                 }
             }
             return convertView;
         }
 
+        private TextView mTvIn;
+        private TextView mTvOut;
+
+        private void assignViewsTab(View view) {
+            mTvIn = (TextView) view.findViewById(R.id.tv_in);
+            mTvOut = (TextView) view.findViewById(R.id.tv_out);
+        }
+
+
         private TextView mTvDesc;
         private TextView mTvClass;
         private TextView mTvTime;

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

@@ -48,7 +48,7 @@ public class TaskRecordActivity extends BaseActivity {
         mLvTask = (ListView) findViewById(R.id.lv_task);
         mLvTask.setDividerHeight(0);
         TitleBarUtils.getInstance()
-                .setTitle(this,"任务记录")
+                .setTitle(this, "任务记录")
                 .setTitleFinish(this);
     }
 
@@ -184,12 +184,12 @@ public class TaskRecordActivity extends BaseActivity {
                                     .placeholder(R.drawable.icon)
                                     .dontAnimate()
                                     .into(viewHolder.<ImageView>getView(R.id.img_icon));
-                            viewHolder.setText(R.id.tv_money, item.getTask().getPrice());
+                            viewHolder.setText(R.id.tv_money, "￥" + item.getTask().getPrice());
                             TextView failed = viewHolder.getView(R.id.tv_failed);
                             if (!TextUtils.isEmpty(item.getFailDesc())) {
                                 failed.setVisibility(View.VISIBLE);
                                 failed.setText(item.getFailDesc());
-                            }else {
+                            } else {
                                 failed.setVisibility(View.GONE);
                             }
                         }
@@ -198,15 +198,15 @@ public class TaskRecordActivity extends BaseActivity {
                             switch (state) {
                                 case 1:
                                     view.setText("审核中");
-                                    view.setBackgroundResource(R.color.theme);
+                                    view.setBackgroundResource(R.drawable.sp_btn_common);
                                     break;
                                 case 2:
                                     view.setText("已审核");
-                                    view.setBackgroundResource(R.color.green);
+                                    view.setBackgroundResource(R.drawable.sp_btn_common_green);
                                     break;
                                 case 3:
                                     view.setText("未通过");
-                                    view.setBackgroundResource(R.color.sheep_red);
+                                    view.setBackgroundResource(R.drawable.sp_btn_common_orange);
                                     break;
                             }
                         }

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

@@ -37,8 +37,9 @@ public class WithdrawRecordActivity extends BaseActivity {
     public void initView() {
         mLvRecord = (ListView) findViewById(R.id.lv_record);
         TitleBarUtils.getInstance()
-                .setTitle(this,"提现记录")
+                .setTitle(this, "提现记录")
                 .setTitleFinish(this);
+        mLvRecord.setDividerHeight(0);
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="@color/green" />
     <corners android:radius="100dp" />
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="@color/orange_text_light" />
     <corners android:radius="100dp" />
 </shape>

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

@@ -31,7 +31,6 @@
             android:orientation="horizontal"
             >
 
-
             <TextView
                 android:id="@+id/tv_in"
                 android:layout_width="wrap_content"
@@ -48,7 +47,6 @@
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/content_padding_big"
                 android:gravity="center"
-                android:text="asdas"
                 android:textColor="@color/black_text_gray"
                 android:textSize="@dimen/text_size_3"/>
         </LinearLayout>

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

@@ -8,8 +8,9 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="70dp"
+        android:layout_margin="@dimen/content_padding"
         android:layout_marginTop="10dp"
-        android:background="@color/backgroud"
+        android:background="@color/background_light_gray"
         >
 
         <TextView
@@ -17,10 +18,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
             android:gravity="center"
-            android:textColor="@color/black_dark"
-            android:textSize="14sp"/>
+            android:textColor="@color/black_text_deep"
+            android:textSize="@dimen/text_size_3"/>
 
 
         <ImageView
@@ -66,12 +67,11 @@
             android:paddingRight="3dp">
 
             <TextView
-                android:layout_gravity="right"
                 android:id="@+id/tv_state"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/theme"
-                android:padding="3dp"
+                android:layout_gravity="right"
+                android:padding="@dimen/content_padding"
                 android:textColor="@color/white"
                 android:textSize="12dp"/>
 
@@ -87,8 +87,6 @@
 
         </LinearLayout>
 
-        <include
-            layout="@layout/line_h_1px_black"/>
 
     </RelativeLayout>
 

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

@@ -24,15 +24,6 @@
             android:src="@drawable/icon"
             />
 
-        <TextView
-            android:id="@+id/tv_nick"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@id/img_icon"
-            android:textColor="@color/black_dark"
-            android:textSize="14sp"/>
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -46,8 +37,20 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/tv_nick"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="@dimen/content_padding_big"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_size_3"/>
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
                 android:text="账户余额"
                 android:textColor="@color/black_text_gray"
                 android:textSize="12sp"/>
@@ -56,6 +59,8 @@
                 android:id="@+id/tv_money"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
                 android:textColor="@color/black_text_deep"
                 android:textSize="30sp"/>
 
@@ -70,7 +75,10 @@
             android:layout_centerVertical="true"
             android:background="@drawable/texe_background_round_theme_right"
             android:gravity="center"
-            android:padding="@dimen/content_padding"
+            android:paddingTop="@dimen/content_padding_small"
+            android:paddingBottom="@dimen/content_padding_small"
+            android:paddingLeft="@dimen/content_padding"
+            android:paddingRight="@dimen/content_padding_big"
             android:text="立即提现"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_3"/>
@@ -80,18 +88,18 @@
             android:id="@+id/tv_wx_aacount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/linearLayout"
             android:layout_centerVertical="true"
             android:background="@drawable/texe_background_round_theme_left"
             android:gravity="center"
-            android:padding="@dimen/content_padding"
+            android:paddingTop="@dimen/content_padding_small"
+            android:paddingBottom="@dimen/content_padding_small"
+            android:paddingLeft="@dimen/content_padding_big"
+            android:paddingRight="@dimen/content_padding"
             android:text="微信账户"
             android:textColor="@color/black_text_gray"
             android:textSize="@dimen/text_size_3"/>
     </RelativeLayout>
 
-    <include
-        layout="@layout/line_h_1px"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -117,8 +125,8 @@
             android:textSize="14sp"/>
 
         <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
             android:layout_marginRight="@dimen/content_padding"
             android:src="@drawable/narrow_enter"/>
 
@@ -152,8 +160,8 @@
             android:textSize="14sp"/>
 
         <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
             android:layout_marginRight="@dimen/content_padding"
             android:src="@drawable/narrow_enter"/>
 
@@ -188,8 +196,8 @@
             android:textSize="14sp"/>
 
         <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
             android:layout_marginRight="@dimen/content_padding"
             android:src="@drawable/narrow_enter"/>