图片更新

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

@@ -1,10 +1,8 @@
 package com.sheep.jiuyan.samllsheep.page;
 
-import android.database.DataSetObserver;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ExpandableListAdapter;
+import android.widget.BaseAdapter;
 import android.widget.ListView;
 
 import com.sheep.jiuyan.samllsheep.R;
@@ -15,8 +13,6 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.entry.MoneyHistroy;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.zhy.adapter.abslistview.CommonAdapter;
-import com.zhy.adapter.abslistview.ViewHolder;
 
 import java.util.HashMap;
 import java.util.List;
@@ -27,7 +23,8 @@ import java.util.List;
 
 public class MoneyHistroyActivity extends BaseActivity {
     private ListView mLv;
-    private CommonAdapter<MoneyHistroy> mAdapter;
+    private MoneyAdapter mAdapter;
+    List<MoneyHistroy> mData;
 
     @Override
     protected int getLayoutId() {
@@ -47,31 +44,15 @@ public class MoneyHistroyActivity extends BaseActivity {
     }
 
     private void showView(List<MoneyHistroy> orders) {
-        mAdapter = new CommonAdapter<MoneyHistroy>(MoneyHistroyActivity.this, R.layout.money_history_item, orders) {
-            @Override
-            protected void convert(ViewHolder viewHolder, MoneyHistroy item, int position) {
-
-                viewHolder.setText(R.id.tv_time, item.getCreateTime().replace(" ", "\n"));
-                viewHolder.setText(R.id.tv_blacne, item.getBalance());
-                viewHolder.setText(R.id.tv_des, item.getDesc());
-                if (!TextUtils.isEmpty(item.getMoney())) {
-
-                    String str = item.getMoney();
-                    if (str.startsWith("-")) {
-                        viewHolder.setTextColor(R.id.tv_money, getResources().getColor(R.color.green));
-                        viewHolder.setText(R.id.tv_money, str.substring(1));
-                    } else {
-                        viewHolder.setTextColor(R.id.tv_money, getResources().getColor(R.color.sheep_red));
-                        viewHolder.setText(R.id.tv_money, str);
-                    }
-                }
-
-            }
-        };
-        mLv.setAdapter(mAdapter);
+        mData = orders;
+        if (mAdapter == null) {
+            mAdapter = new MoneyAdapter();
+            mLv.setAdapter(mAdapter);
+        } else {
+            mAdapter.notifyDataSetChanged();
+        }
     }
 
-
     private void getTask() {
         final HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
@@ -89,96 +70,39 @@ public class MoneyHistroyActivity extends BaseActivity {
     }
 
 
-    class MoneyAdapter implements ExpandableListAdapter {
-
-        @Override
-        public void registerDataSetObserver(DataSetObserver observer) {
-
-        }
-
-        @Override
-        public void unregisterDataSetObserver(DataSetObserver observer) {
-
-        }
-
-        @Override
-        public int getGroupCount() {
-            return 0;
-        }
-
-        @Override
-        public int getChildrenCount(int groupPosition) {
-            return 0;
-        }
-
-        @Override
-        public Object getGroup(int groupPosition) {
-            return null;
-        }
+    private class MoneyAdapter extends BaseAdapter {
 
         @Override
-        public Object getChild(int groupPosition, int childPosition) {
-            return null;
+        public int getViewTypeCount() {
+            return 2;
         }
 
         @Override
-        public long getGroupId(int groupPosition) {
-            return 0;
+        public int getCount() {
+            if (mData != null)
+                return mData.size();
+            else
+                return 0;
         }
 
         @Override
-        public long getChildId(int groupPosition, int childPosition) {
-            return 0;
+        public Object getItem(int position) {
+            return position;
         }
 
         @Override
-        public boolean hasStableIds() {
-            return false;
+        public int getItemViewType(int position) {
+            return super.getItemViewType(position);
         }
 
         @Override
-        public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
-            return null;
+        public long getItemId(int position) {
+            return position;
         }
 
         @Override
-        public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
+        public View getView(int position, View convertView, ViewGroup parent) {
             return null;
         }
-
-        @Override
-        public boolean isChildSelectable(int groupPosition, int childPosition) {
-            return false;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return false;
-        }
-
-        @Override
-        public void onGroupExpanded(int groupPosition) {
-
-        }
-
-        @Override
-        public void onGroupCollapsed(int groupPosition) {
-
-        }
-
-        @Override
-        public long getCombinedChildId(long groupId, long childId) {
-            return 0;
-        }
-
-        @Override
-        public long getCombinedGroupId(long groupId) {
-            return 0;
-        }
     }
 }

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

@@ -36,7 +36,6 @@ import de.hdodenhof.circleimageview.CircleImageView;
 public class UserCenterActivity extends BaseActivity implements View.OnClickListener {
     private CircleImageView mImgIcon;
     private TextView mTvNick;
-    private TextView mTvLevel;
     private TextView mTvMoney;
     private TextView mTvCode;
     private TextView mTvWithdraw;
@@ -77,7 +76,6 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
             public void success(User user) {
                 mUser = user;
                 mTvNick.setText(user.getNickName());
-                mTvLevel.setText(user.getWxId());
                 mTvMoney.setText(user.getBalance());
                 mTvCode.setText("我的邀请码  " + user.getInvitationCode());
                 Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
@@ -89,7 +87,6 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     public void initView() {
         mImgIcon = (CircleImageView) findViewById(R.id.img_icon);
         mTvNick = (TextView) findViewById(R.id.tv_nick);
-        mTvLevel = (TextView) findViewById(R.id.tv_level);
         mTvMoney = (TextView) findViewById(R.id.tv_money);
         mTvCode = (TextView) findViewById(R.id.tv_invitation_code);
         mTvWithdraw = (TextView) findViewById(R.id.tv_withdraw);

app/src/main/res/layout/main_activity.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:orientation="vertical">
 
@@ -33,7 +34,8 @@
             android:paddingLeft="@dimen/content_padding"
             android:paddingRight="@dimen/content_padding"
             android:paddingTop="@dimen/content_padding_small"
-            app:layout_constraintTop_toBottomOf="@id/txt_main_activity_money">
+            app:layout_constraintTop_toBottomOf="@+id/txt_main_activity_money"
+            tools:layout_editor_absoluteX="0dp">
 
             <ImageView
                 android:id="@+id/img_user"
@@ -67,21 +69,23 @@
             android:textColor="@color/theme_sheep_dark"
             android:textSize="@dimen/text_size_2"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/txt_main_activity_money" />
+            app:layout_constraintTop_toBottomOf="@+id/txt_main_activity_money" />
 
         <com.sheep.jiuyan.samllsheep.page.view.RappTabLayout
             android:id="@+id/tab_main_activity"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/layout_heigh_default"
+            android:layout_width="344dp"
+            android:layout_height="48dp"
             android:layout_marginTop="@dimen/content_padding_big"
-            app:layout_constraintTop_toBottomOf="@id/tv_withdraw"></com.sheep.jiuyan.samllsheep.page.view.RappTabLayout>
+            app:layout_constraintTop_toBottomOf="@+id/tv_withdraw"
+            tools:layout_editor_absoluteX="8dp"></com.sheep.jiuyan.samllsheep.page.view.RappTabLayout>
 
         <android.support.v4.view.ViewPager
             android:id="@+id/viewpager_main_activity"
-            android:layout_width="match_parent"
+            android:layout_width="344dp"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            app:layout_constraintTop_toBottomOf="@id/tab_main_activity">
+            app:layout_constraintTop_toBottomOf="@+id/tab_main_activity"
+            tools:layout_editor_absoluteX="8dp">
 
         </android.support.v4.view.ViewPager>
 

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

@@ -1,59 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/content_padding"
         android:layout_marginTop="5dp"
-        android:background="@color/backgroud"
+        android:background="@color/background_light_gray"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         >
 
-        <TextView
-            android:gravity="center"
-            android:id="@+id/tv_time"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_weight="1"
-            android:text="asdas"
-            android:textColor="@color/black_dark"
-            android:textSize="14sp"/>
+        <ImageView
+            android:layout_width="@dimen/image_item"
+            android:layout_height="@dimen/image_item"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/content_padding"
+            />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:paddingTop="@dimen/content_padding"
+            android:paddingBottom="@dimen/content_padding"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <TextView
-            android:gravity="center"
-            android:id="@+id/tv_money"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textColor="@color/black_dark"
-            android:textSize="14sp"/>
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@color/black_dark"
+                android:textSize="@dimen/text_size_4"/>
 
-        <TextView
-            android:id="@+id/tv_blacne"
-            android:layout_width="0dp"
-            android:gravity="center"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textColor="@color/black_dark"
-            android:textSize="12sp"/>
+            <TextView
+                android:id="@+id/tv_class"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:padding="3dp"
+                android:textColor="@color/black_text_gray"
+                android:textSize="@dimen/text_size_3"/>
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                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"/>
+        </LinearLayout>
 
         <TextView
-            android:id="@+id/tv_des"
-            android:layout_width="wrap_content"
+            android:id="@+id/tv_money"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/content_padding_big"
             android:layout_weight="1"
-            android:gravity="center"
-            android:padding="3dp"
-            android:textColor="@color/black_dark"
-            android:textSize="12dp"/>
-
+            android:gravity="right"
+            android:text="+15"
+            android:textColor="@color/orange_text_light"
+            android:textSize="@dimen/text_size_6"
+            android:textStyle="bold"/>
 
     </LinearLayout>
 

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

@@ -7,10 +7,10 @@
     <include
         layout="@layout/title"/>
 
-    <ExpandableListView
+    <ListView
         android:id="@+id/lv"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </ExpandableListView>
+    </ListView>
 
 </LinearLayout>

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

@@ -2,23 +2,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:orientation="vertical">
+              android:orientation="vertical"
+              android:weightSum="1">
 
     <include
         layout="@layout/title"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimary"
         >
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/img_icon"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
-            android:src="@drawable/icon"/>
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/content_padding_big"
+            android:src="@drawable/icon"
+            />
 
         <TextView
             android:id="@+id/tv_nick"
@@ -30,36 +34,29 @@
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
 
-        <TextView
-            android:id="@+id/tv_level"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/img_icon"
-            android:layout_marginLeft="15dp"
-            android:layout_toRightOf="@id/img_icon"
-            android:textColor="@color/black_light"
-            android:textSize="12sp"/>
-
         <LinearLayout
+            android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_below="@+id/img_icon"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginRight="15dp"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal">
+            android:layout_marginTop="@dimen/content_padding"
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="余额："
-                android:textColor="@color/theme"
+                android:text="账户余额"
+                android:textColor="@color/black_text_gray"
                 android:textSize="12sp"/>
 
             <TextView
                 android:id="@+id/tv_money"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/sheep_red"
+                android:textColor="@color/black_text_deep"
                 android:textSize="30sp"/>
 
         </LinearLayout>
@@ -67,32 +64,30 @@
 
         <TextView
             android:id="@+id/tv_withdraw"
-            android:layout_width="70dp"
-            android:layout_height="20dp"
-            android:layout_alignParentBottom="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginBottom="3dp"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/texe_background_round_red"
+            android:layout_centerVertical="true"
+            android:background="@drawable/texe_background_round_theme_right"
             android:gravity="center"
+            android:padding="@dimen/content_padding"
             android:text="立即提现"
-            android:textColor="@color/white"
-            android:textSize="12sp"/>
+            android:textColor="@color/black_text_gray"
+            android:textSize="@dimen/text_size_3"/>
 
 
         <TextView
             android:id="@+id/tv_wx_aacount"
-            android:layout_width="70dp"
-            android:layout_height="20dp"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="3dp"
-            android:layout_marginRight="10dp"
-            android:background="@drawable/texe_background_round_red"
+            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:text="微信账户"
-            android:layout_toLeftOf="@id/tv_withdraw"
-            android:textColor="@color/white"
-            android:textSize="12sp"/>
+            android:textColor="@color/black_text_gray"
+            android:textSize="@dimen/text_size_3"/>
     </RelativeLayout>
 
     <include
@@ -112,14 +107,21 @@
 
         <TextView
             android:id="@+id/tv_task"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="任务记录"
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
 
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginRight="@dimen/content_padding"
+            android:src="@drawable/narrow_enter"/>
+
     </LinearLayout>
 
 
@@ -127,38 +129,41 @@
         layout="@layout/line_h_1px"/>
 
     <LinearLayout
+        android:id="@+id/ll_money_hostroy"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal"
-        android:id="@+id/ll_money_hostroy"
         android:paddingLeft="5dp">
 
         <ImageView
             android:layout_width="15dp"
             android:layout_height="15dp"
-            android:src="@drawable/sell_icon"/>
+            android:src="@drawable/money_record"/>
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="资金记录"
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
 
-    </LinearLayout>
-
-
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginRight="@dimen/content_padding"
+            android:src="@drawable/narrow_enter"/>
 
+    </LinearLayout>
 
 
     <include
         layout="@layout/line_h_1px"/>
 
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -169,22 +174,30 @@
         <ImageView
             android:layout_width="15dp"
             android:layout_height="15dp"
-            android:src="@drawable/withdraw"/>
+            android:src="@drawable/withdrawal"/>
 
         <TextView
             android:id="@+id/tv_withdraw_hostroy"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="提现记录"
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
 
+        <ImageView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginRight="@dimen/content_padding"
+            android:src="@drawable/narrow_enter"/>
+
     </LinearLayout>
 
     <include
         layout="@layout/line_h_1px"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -195,18 +208,18 @@
         <ImageView
             android:layout_width="15dp"
             android:layout_height="15dp"
-            android:src="@drawable/withdraw"/>
+            android:src="@drawable/invite_code"/>
 
         <TextView
             android:id="@+id/tv_invitation_code"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="50dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="我的邀请码"
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
-
     </LinearLayout>
 
     <include

app/src/main/res/values/common.xml

@@ -27,7 +27,9 @@
 
     <!--一般layout的高度-->
     <dimen name="layout_heigh_default">48dp</dimen>
+    <dimen name="layout_heigh_large">60dp</dimen>
     <dimen name="layout_heigh_small">32dp</dimen>
+    <dimen name="image_item">50dp</dimen>
 
     <!--下载按钮的style-->
     <style name="style_btn" parent="android:Widget.Material.Light.Button.Borderless.Small">
@@ -60,14 +62,14 @@
 
 
     <!--下面的tagid用于设置tag使用-->
-    <item name="tagid1" type="id" />
-    <item name="tagid2" type="id" />
-    <item name="tagid3" type="id" />
-    <item name="tagid4" type="id" />
-    <item name="tagid5" type="id" />
-    <item name="tagid6" type="id" />
-    <item name="tagid7" type="id" />
-    <item name="tagid8" type="id" />
+    <item name="tagid1" type="id"/>
+    <item name="tagid2" type="id"/>
+    <item name="tagid3" type="id"/>
+    <item name="tagid4" type="id"/>
+    <item name="tagid5" type="id"/>
+    <item name="tagid6" type="id"/>
+    <item name="tagid7" type="id"/>
+    <item name="tagid8" type="id"/>
 
 
 </resources>