app增加提现记录模块。调整app界面。

app/build.gradle

@@ -38,6 +38,7 @@ dependencies {
     compile 'com.liulishuo.filedownloader:library:1.6.9'
     compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
     debugCompile 'com.readystatesoftware.chuck:library:1.1.0'
+    compile 'de.hdodenhof:circleimageview:2.2.0'
     releaseCompile 'com.readystatesoftware.chuck:library-no-op:1.1.0'
 }
 

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.GET_TASKS"/>
 
 
     <permission
@@ -86,6 +86,9 @@
         <activity
             android:name=".page.TaskRecordActivity"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".page.WithdrawRecordActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

app/src/main/java/com/jiuyan/sheep_children/SheepApp.java

@@ -3,6 +3,7 @@ package com.jiuyan.sheep_children;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.os.Bundle;
 
 import com.liulishuo.filedownloader.FileDownloader;
 import com.liulishuo.filedownloader.connection.FileDownloadUrlConnection;
@@ -21,21 +22,60 @@ public class SheepApp extends Application {
 
     public static Context mContext;
     public static IWXAPI mWxapi;
+    public static SheepApp mSheepApp;
 
-    public static Map<String,Activity>  mActivitys;
+    public static Map<String, Activity> mActivitys;
 
     @Override
     public void onCreate() {
         super.onCreate();
         mContext = getApplicationContext();
         FileDownloader.setup(this);
+        mSheepApp = this;
         regWx();
+        registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
     }
 
     private void regWx() {
         mWxapi = WXAPIFactory.createWXAPI(this, Config.WX_APPID);
         mWxapi.registerApp(Config.WX_APPID);
-        mActivitys=new HashMap<>();
+        mActivitys = new HashMap<>();
     }
 
+    public int mActivityAount;
+    /**
+     * Activity 生命周期监听，用于监控app前后台状态切换
+     */
+    ActivityLifecycleCallbacks activityLifecycleCallbacks = new ActivityLifecycleCallbacks() {
+        @Override
+        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        }
+
+        @Override
+        public void onActivityStarted(Activity activity) {
+            mActivityAount++;
+        }
+
+        @Override
+        public void onActivityResumed(Activity activity) {
+        }
+
+        @Override
+        public void onActivityPaused(Activity activity) {
+        }
+
+        @Override
+        public void onActivityStopped(Activity activity) {
+            mActivityAount--;
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+        }
+
+        @Override
+        public void onActivityDestroyed(Activity activity) {
+        }
+    };
+
 }

app/src/main/java/com/jiuyan/sheep_children/base/BaseActivity.java

@@ -23,15 +23,18 @@ import org.greenrobot.eventbus.EventBus;
  */
 
 public abstract class BaseActivity extends Activity {
+
+    private String mName;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //        EventBus.getDefault().register(this);
         setContentView(getLayoutId());
         initView();
         initListener();
         initData();
-        SheepApp.mActivitys.put(this.getClass().getSimpleName(), this);
+        mName = this.getClass().getSimpleName();
+        SheepApp.mActivitys.put(mName, this);
     }
 
     @Override
@@ -56,17 +59,17 @@ public abstract class BaseActivity extends Activity {
     @Override
     protected void onResume() {
         super.onResume();
-      /*  if (PackageUtil.isAppOnForeground(getApplicationContext())) {
+        if (SheepApp.mSheepApp.mActivityAount > 0) {
             FloatMsg floatMsg = new FloatMsg();
             floatMsg.shouldShow = false;
             EventBus.getDefault().post(floatMsg);
-        }*/
+        }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        //        EventBus.getDefault().unregister(this);
+        SheepApp.mActivitys.remove(mName);
     }
 
     @Override
@@ -77,11 +80,10 @@ public abstract class BaseActivity extends Activity {
     @Override
     protected void onStop() {
         super.onStop();
-       /* if (!PackageUtil.isAppOnForeground(getApplicationContext())) {
+        if (SheepApp.mSheepApp.mActivityAount <= 0) {
             FloatMsg floatMsg = new FloatMsg();
             floatMsg.shouldShow = true;
             EventBus.getDefault().post(floatMsg);
-        }*/
-
+        }
     }
 }

app/src/main/java/com/jiuyan/sheep_children/net/Url.java

@@ -15,6 +15,8 @@ public class Url {
     public static String USER_COMMIT=Config.instance().mBaseUrl + "/v1/user/getDoneTask";
     public static String USER_CHECK_REGISTER=Config.instance().mBaseUrl + "/v1/task_publish/getRegisterTask";
     public static String USER_REGISTER_TASK=Config.instance().mBaseUrl + "/v1/task_publish/registerTask";
+    public static String USER_PULL_TASK=Config.instance().mBaseUrl + "/v1/task_publish/getDoingTask";
+    public static String USER_WITHDRAW_RECORD=Config.instance().mBaseUrl + "/v1/withDraw/getHistroyCommit";
     public static String USER_WITHDRAW=Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
 
 }

app/src/main/java/com/jiuyan/sheep_children/page/DownloadActivity.java

@@ -1,16 +1,10 @@
 package com.jiuyan.sheep_children.page;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
-import android.system.Os;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -44,7 +38,7 @@ public class DownloadActivity extends BaseActivity {
     //    private TextView mTvDownload;
     private ProgressBar mPbDownload;
     private ImageView mImgIcon;
-    private TextView mTvDesc;
+    private TextView mTvTime;
     private TextView mTvTitle;
     private View mBack;
     private TextView mTvPercent;
@@ -84,7 +78,7 @@ public class DownloadActivity extends BaseActivity {
         mApkPath = new File(mPath, SystemClock.currentThreadTimeMillis() + "_sheepTask.apk").getAbsolutePath();
         if (task != null) {
             DOWNLOAD_URL = task.getDownLoadUrl();
-            mTvDesc.setText(task.getTitle());
+            mTvTime.setText(task.getTitle());
             Glide.with(this)
                     .load(task.getIcon())
                     .placeholder(R.drawable.icon)
@@ -109,7 +103,7 @@ public class DownloadActivity extends BaseActivity {
         mTvPercent = (TextView) findViewById(R.id.tv_percent);
         mPbDownload = (ProgressBar) findViewById(R.id.pb_download);
         mImgIcon = (ImageView) findViewById(R.id.img_icon);
-        mTvDesc = (TextView) findViewById(R.id.tv_desc);
+        mTvTime = (TextView) findViewById(R.id.tv_time);
         mTvTitle = (TextView) findViewById(R.id.tv_title);
         mBack = findViewById(R.id.img_back);
     }

app/src/main/java/com/jiuyan/sheep_children/page/MainActivity.java

@@ -24,10 +24,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.bumptech.glide.Glide;
 import com.google.gson.reflect.TypeToken;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.jiuyan.sheep_children.BuildConfig;
 import com.jiuyan.sheep_children.R;
+import com.jiuyan.sheep_children.SheepApp;
 import com.jiuyan.sheep_children.base.BaseActivity;
 import com.jiuyan.sheep_children.event.FloatMsg;
 import com.jiuyan.sheep_children.floatwindow.FloatService;
@@ -41,6 +43,7 @@ import com.jiuyan.sheep_children.page.entry.TaskPublish;
 import com.jiuyan.sheep_children.page.entry.User;
 import com.jiuyan.sheep_children.utils.DeviceInfo;
 import com.jiuyan.sheep_children.utils.GsonUtil;
+import com.jiuyan.sheep_children.utils.PackageUtil;
 import com.jiuyan.sheep_children.utils.PremissUtils;
 import com.jiuyan.sheep_children.utils.SpUtils;
 import com.readystatesoftware.chuck.Chuck;
@@ -55,6 +58,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import de.hdodenhof.circleimageview.CircleImageView;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Response;
@@ -71,7 +75,14 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private ImageView mDown;
     private AlertDialog mDialog;
     private TaskPublish mClickItem;
-
+    private ImageView mImgIcon;
+    private CircleImageView mImgUser;
+    private TextView mTvTitle;
+    private TextView mTvTime;
+    private TextView mTvCount;
+    private TextView mTvMoney;
+    private TextView mTvGuide;
+    private LinearLayout mTlDoing;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -90,7 +101,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     public void initListener() {
         mTvWithdraw.setOnClickListener(this);
         mDown.setOnClickListener(this);
-
+        mImgUser.setOnClickListener(this);
     }
 
 
@@ -109,9 +120,46 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
             @Override
             public void success(User user) {
                 mMoney.setText(user.getBalance());
+                Glide.with(MainActivity.this)
+                        .load(user.getIcon())
+                        .placeholder(R.drawable.icon)
+                        .dontAnimate()
+                        .into(mImgUser);
                 mToday.setText(String.format("今日收入：%s", user.getToday()));
             }
         });
+        NetManager.get(Url.USER_PULL_TASK, map, getApplicationContext(), new SheepCallback<TaskPublish>(this) {
+            @Override
+            public void success(final TaskPublish taskPublish) {
+                if (taskPublish != null) {
+                    mTlDoing.setVisibility(View.VISIBLE);
+                    Glide.with(MainActivity.this)
+                            .load(taskPublish.getTask().getIcon())
+                            .placeholder(R.drawable.icon)
+                            .dontAnimate()
+                            .into(mImgIcon);
+                    mTvTitle.setText(taskPublish.getTask().getTitle());
+                    mTvTime.setText("截止日期：" + taskPublish.getOverTime());
+                    mTvCount.setText(taskPublish.getSurplusCount() + "/" + taskPublish.getTotalCouont());
+                    mTvMoney.setText(taskPublish.getTask().getPrice());
+                    if (!TextUtils.isEmpty(taskPublish.getTask().getPkg())) {
+                        mTlDoing.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                            }
+                        });
+                    }
+                } else {
+                    mTlDoing.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public void otherCode(int code, String string) {
+                mTlDoing.setVisibility(View.GONE);
+            }
+        });
     }
 
     @Override
@@ -223,6 +271,16 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         mHostry = (TextView) head.findViewById(R.id.hostry);
         mToday = (TextView) head.findViewById(R.id.today);
         mDown = head.findViewById(R.id.img_down);
+
+        mImgIcon = (ImageView) head.findViewById(R.id.img_icon);
+        mTvTitle = (TextView) head.findViewById(R.id.tv_title);
+        mTvTime = (TextView) head.findViewById(R.id.tv_time);
+        mTvCount = (TextView) head.findViewById(R.id.tv_count);
+        mTvMoney = (TextView) head.findViewById(R.id.tv_money);
+        mTvGuide = (TextView) head.findViewById(R.id.tv_guide);
+        mTlDoing = (LinearLayout) head.findViewById(R.id.ll_doing);
+        mImgUser = head.findViewById(R.id.img_user);
+
     }
 
     private void findviews() {
@@ -231,9 +289,9 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
 
     @Override
     protected void onResume() {
-        FloatMsg floatMsg = new FloatMsg();
+      /*  FloatMsg floatMsg = new FloatMsg();
         floatMsg.shouldShow = false;
-        EventBus.getDefault().post(floatMsg);
+        EventBus.getDefault().post(floatMsg);*/
         super.onResume();
     }
 
@@ -245,9 +303,9 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        FloatMsg floatMsg = new FloatMsg();
+       /* FloatMsg floatMsg = new FloatMsg();
         floatMsg.shouldShow = true;
-        EventBus.getDefault().post(floatMsg);
+        EventBus.getDefault().post(floatMsg);*/
     }
 
     @Override
@@ -256,7 +314,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         switch (v.getId()) {
             case R.id.tv_withdraw:
                 if (SpUtils.isLogin(getApplicationContext())) {
-                    intent = new Intent(MainActivity.this, UserCenterActivity.class);
+                    intent = new Intent(MainActivity.this, WithdrawActivity.class);
                 } else {
                     intent = new Intent(MainActivity.this, LoginActivity.class);
                 }
@@ -270,6 +328,14 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                 }
                 startActivity(intent);
                 break;
+            case R.id.img_user:
+                if (SpUtils.isLogin(getApplicationContext())) {
+                    intent = new Intent(MainActivity.this, UserCenterActivity.class);
+                } else {
+                    intent = new Intent(MainActivity.this, LoginActivity.class);
+                }
+                startActivity(intent);
+                break;
         }
     }
 }

app/src/main/java/com/jiuyan/sheep_children/page/ShotScreenActivity.java

@@ -10,6 +10,7 @@ import android.view.Window;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.jiuyan.sheep_children.R;
 import com.jiuyan.sheep_children.floatwindow.ShotScreen;
 import com.jiuyan.sheep_children.net.NetManager;
 import com.jiuyan.sheep_children.net.SheepCallback;
@@ -66,6 +67,7 @@ public class ShotScreenActivity extends Activity {
                     shotter.startScreenShot(new ShotScreen.OnShotListener() {
                         @Override
                         public void onFinish(String path) {
+                            setContentView(R.layout.shotscreen_activity);
                             commitTask(path);
                         }
                     });

app/src/main/java/com/jiuyan/sheep_children/page/TaskRecordActivity.java

@@ -145,9 +145,9 @@ public class TaskRecordActivity extends BaseActivity {
                 if (!TextUtils.isEmpty(pkg)) {
                     boolean installed = PackageUtil.isAppInstalled(getApplicationContext(), pkg);
                     if (installed) {
-                        FloatMsg floatMsg = new FloatMsg();
+                      /*  FloatMsg floatMsg = new FloatMsg();
                         floatMsg.shouldShow = true;
-                        EventBus.getDefault().post(floatMsg);
+                        EventBus.getDefault().post(floatMsg);*/
                         PackageUtil.startApp(getApplicationContext(), pkg);
                     } else {
                         Intent intent = new Intent(TaskRecordActivity.this, DownloadActivity.class);

app/src/main/java/com/jiuyan/sheep_children/page/UserCenterActivity.java

@@ -20,12 +20,15 @@ import com.jiuyan.sheep_children.utils.SpUtils;
 
 import java.util.HashMap;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
+
 /**
  * Created by kemllor on 2017/12/13.
  */
 
 public class UserCenterActivity extends BaseActivity implements View.OnClickListener {
-    private ImageView mImgIcon;
+    private CircleImageView mImgIcon;
     private ImageView mBack;
     private TextView mTitle;
     private TextView mTvNick;
@@ -66,7 +69,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                 mUser =user;
                 mTvNick.setText(user.getNickName());
                 mTvLevel.setText(user.getWxId());
-                mTvMoney.setText(String.format("账户余额：%s", user.getBalance()));
+                mTvMoney.setText(user.getBalance());
                 Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
             }
         });
@@ -74,7 +77,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void initView() {
-        mImgIcon = (ImageView) findViewById(R.id.img_icon);
+        mImgIcon =  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);
@@ -100,7 +103,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                 break;
             case R.id.tv_withdraw_hostroy:
                 if (checkLogin()) {
-                    intent = new Intent(UserCenterActivity.this, WithdrawActivity.class);
+                    intent = new Intent(UserCenterActivity.this, WithdrawRecordActivity.class);
                     startActivity(intent);
                 } else {
                     toLogin();

app/src/main/java/com/jiuyan/sheep_children/page/WithdrawRecordActivity.java

@@ -0,0 +1,102 @@
+package com.jiuyan.sheep_children.page;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.jiuyan.sheep_children.R;
+import com.jiuyan.sheep_children.base.BaseActivity;
+import com.jiuyan.sheep_children.net.NetManager;
+import com.jiuyan.sheep_children.net.SheepCallback;
+import com.jiuyan.sheep_children.net.Url;
+import com.jiuyan.sheep_children.page.entry.Commit;
+import com.jiuyan.sheep_children.page.entry.Order;
+import com.jiuyan.sheep_children.utils.SpUtils;
+import com.zhy.adapter.abslistview.CommonAdapter;
+import com.zhy.adapter.abslistview.ViewHolder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by kemllor on 2017/12/29.
+ */
+
+public class WithdrawRecordActivity extends BaseActivity {
+    private ListView mLvRecord;
+    private TextView mTvTitle;
+    private ImageView mImgBack;
+    private CommonAdapter<Order> mAdapter;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.withdraw_record_activity;
+    }
+
+    @Override
+    public void initView() {
+        mLvRecord = (ListView) findViewById(R.id.lv_record);
+        mTvTitle = findViewById(R.id.tv_title);
+        mImgBack = findViewById(R.id.img_back);
+    }
+
+    @Override
+    public void initListener() {
+        mImgBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    public void initData() {
+        mTvTitle.setText("提现记录");
+        final HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        NetManager.get(Url.USER_WITHDRAW_RECORD, map, getApplicationContext(), new SheepCallback<List<Order>>(this) {
+            @Override
+            public void success(List<Order> orders) {
+                mAdapter = new CommonAdapter<Order>(WithdrawRecordActivity.this, R.layout.withdraw_record_item, orders) {
+                    @Override
+                    protected void convert(ViewHolder viewHolder, Order item, int position) {
+                        String[] tmp1 = item.getRequestTime().split("-");
+                        String[] tmp2 = tmp1[2].split(" ")[1].split(":");
+                        String time = tmp1[1] + "/" + tmp1[2].split(" ")[0] + "\n" + tmp2[0] + ":" + tmp2[1];
+                        viewHolder.setText(R.id.tv_time, time);
+                        viewHolder.setText(R.id.tv_money, item.getMoney());
+                        viewHolder.setText(R.id.tv_wx, item.getWxId());
+                        getState(viewHolder.<TextView>getView(R.id.tv_state), item.getStatus());
+                        TextView failed = viewHolder.getView(R.id.tv_failed);
+                        if (!TextUtils.isEmpty(item.getAction())) {
+                            failed.setVisibility(View.VISIBLE);
+                            failed.setText(item.getAction());
+                        }
+                    }
+
+                    private void getState(TextView view, int state) {
+                        switch (state) {
+                            case 1:
+                                view.setText("处理中");
+                                view.setBackgroundResource(R.color.theme);
+                                break;
+                            case 2:
+                                view.setText("已付款");
+                                view.setBackgroundResource(R.color.green);
+                                break;
+                            case 3:
+                                view.setText("付款异常");
+                                view.setBackgroundResource(R.color.red);
+                                break;
+                        }
+                    }
+                };
+                mLvRecord.setAdapter(mAdapter);
+            }
+        });
+    }
+}

app/src/main/java/com/jiuyan/sheep_children/page/adapter/TaskAdapter.java

@@ -56,7 +56,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
     public void onBindViewHolder(ViewHolder viewHolder, final int position) {
         viewHolder.mTvTitle.setText(datas.get(position).getTask().getTitle());
         viewHolder.mTvCount.setText(datas.get(position).getSurplusCount() + "/" + datas.get(position).getTotalCouont());
-        viewHolder.mTvDesc.setText(datas.get(position).getTask().getDesc());
+        viewHolder.mTvTime.setText(datas.get(position).getOverTime());
         viewHolder.mTvMoney.setText(datas.get(position).getTask().getPrice());
         Glide.with(mActivity)
                 .load(datas.get(position).getTask().getIcon())
@@ -86,7 +86,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public ImageView mImgIcon;
         public TextView mTvTitle;
-        public TextView mTvDesc;
+        public TextView mTvTime;
         public TextView mTvCount;
         public TextView mTvGuide;
         public TextView mTvMoney;
@@ -97,7 +97,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
             mRootView = view;
             mImgIcon = (ImageView) view.findViewById(R.id.img_icon);
             mTvTitle = (TextView) view.findViewById(R.id.tv_title);
-            mTvDesc = (TextView) view.findViewById(R.id.tv_desc);
+            mTvTime = (TextView) view.findViewById(R.id.tv_time);
             mTvCount = (TextView) view.findViewById(R.id.tv_count);
             mTvGuide = (TextView) view.findViewById(R.id.tv_guide);
             mTvMoney = (TextView) view.findViewById(R.id.tv_money);

app/src/main/java/com/jiuyan/sheep_children/page/entry/Order.java

@@ -0,0 +1,84 @@
+package com.jiuyan.sheep_children.page.entry;
+
+/**
+ * Created by kemllor on 2017/12/29.
+ */
+
+public class Order {
+
+
+    /**
+     * Id : 1
+     * UserId : 1
+     * Money : 20
+     * RequestTime : 2017-12-29 13:36:14
+     * Status : 1
+     * DoTime :
+     * WxId : kemllor
+     * Action :
+     */
+
+    private int Id;
+    private String Money;
+    private String RequestTime;
+    private int Status;
+    private String DoTime;
+    private String WxId;
+    private String Action;
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int Id) {
+        this.Id = Id;
+    }
+
+    public String getMoney() {
+        return Money;
+    }
+
+    public void setMoney(String Money) {
+        this.Money = Money;
+    }
+
+    public String getRequestTime() {
+        return RequestTime;
+    }
+
+    public void setRequestTime(String RequestTime) {
+        this.RequestTime = RequestTime;
+    }
+
+    public int getStatus() {
+        return Status;
+    }
+
+    public void setStatus(int Status) {
+        this.Status = Status;
+    }
+
+    public String getDoTime() {
+        return DoTime;
+    }
+
+    public void setDoTime(String DoTime) {
+        this.DoTime = DoTime;
+    }
+
+    public String getWxId() {
+        return WxId;
+    }
+
+    public void setWxId(String WxId) {
+        this.WxId = WxId;
+    }
+
+    public String getAction() {
+        return Action;
+    }
+
+    public void setAction(String Action) {
+        this.Action = Action;
+    }
+}

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

@@ -4,5 +4,5 @@
     <corners android:radius="3dp"/>
     <stroke
         android:width="1dp"
-        android:color="@color/red"/>
+        android:color="@color/theme"/>
 </shape>

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

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

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:bottomRightRadius="25dp"
+        android:topRightRadius="25dp"
+        />
+    <stroke android:color="@color/blue"
+        android:width="1px"/>
+
+    <solid android:color="@color/theme"/>
+
+</shape>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners
+        android:bottomLeftRadius="25dp"
+        android:topLeftRadius="25dp"
+        />
+    <stroke android:color="@color/blue"
+        android:width="1px"/>
+
+    <solid android:color="@color/theme"/>
+
+</shape>

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

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

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

@@ -3,6 +3,6 @@
 
     <corners android:radius="3dp"/>
 
-    <solid android:color="@color/red"/>
+    <solid android:color="@color/theme"/>
 
 </shape>

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

@@ -2,6 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_selected="true"/>
     <item android:color="@color/theme" android:state_pressed="true"/> <!-- pressed -->
-    <item android:color="@color/red"/> <!-- default -->
+    <item android:color="@color/theme"/> <!-- default -->
 
 </selector>

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

@@ -22,7 +22,7 @@
         android:layout_marginLeft="20dp"
         android:layout_marginTop="15dp"
         android:text="添加好友->佣金发放号:"
-        android:textColor="@color/theme"/>
+        android:textColor="@color/black_dark"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
         android:layout_height="35dp"
         android:layout_gravity="center"
         android:layout_marginLeft="5dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="100dp"
         android:background="@drawable/text_backgroud"
         android:gravity="center"
         android:text="绑定微信"

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

@@ -22,7 +22,7 @@
             />
 
         <TextView
-            android:id="@+id/tv_desc"
+            android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"

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

@@ -4,5 +4,5 @@
     android:layout_width="match_parent"
     android:layout_height="1px"
     android:layout_alignParentBottom="true"
-    android:background="@color/black_dark"/>
+    android:background="@color/black_light"/>
 

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

@@ -0,0 +1,12 @@
+<?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="match_parent"
+                android:orientation="vertical">
+
+    <ProgressBar
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_centerInParent="true"/>
+
+</RelativeLayout>

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

@@ -6,21 +6,40 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="110dp"
-        android:background="@color/theme"
+        android:layout_height="120dp"
+        android:background="@color/theme_light"
         >
 
+
+        <RelativeLayout
+            android:layout_width="50dp"
+            android:layout_height="30dp"
+            android:layout_centerVertical="true"
+            android:background="@drawable/texe_background_round_theme_left"
+            >
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/img_user"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="2.5dp"
+                />
+        </RelativeLayout>
+
         <TextView
             android:id="@+id/tv_withdraw"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="30dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginBottom="10dp"
-            android:layout_marginRight="5dp"
+            android:background="@drawable/texe_background_round_theme_right"
+            android:gravity="center_vertical"
+            android:paddingLeft="15dp"
             android:text="提现"
             android:textColor="@color/white"
-            android:textSize="18sp"/>
+            android:textSize="14sp"/>
 
         <ImageView
             android:id="@+id/img_down"
@@ -29,8 +48,8 @@
             android:layout_alignParentRight="true"
             android:layout_marginTop="5dp"
             android:padding="5dp"
-            android:visibility="gone"
-            android:src="@drawable/down_load"/>
+            android:src="@drawable/down_load"
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/title"
@@ -45,40 +64,86 @@
         <TextView
             android:id="@+id/money"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
             android:layout_below="@id/title"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
-            android:textColor="@color/white_red"
-            android:textSize="30dp"
+            android:background="@drawable/texe_background_round_white"
+            android:gravity="center"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textColor="@color/red"
+            android:textSize="25dp"
             />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="200dp"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/hostry"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center_vertical"
+                android:layout_margin="5dp"
+                android:layout_weight="1"
+                android:gravity="center"
                 android:text="历史收入"
-                android:textColor="@color/white"/>
+                android:textColor="@color/white"
+                android:textSize="12sp"/>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="10dp"
+                android:layout_gravity="center"
+                android:background="@color/white"/>
 
             <TextView
                 android:id="@+id/today"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="50dp"
+                android:layout_margin="5dp"
+                android:layout_weight="1"
+                android:gravity="center"
                 android:text="今日收入"
-                android:textColor="@color/white"/>
+                android:textColor="@color/white"
+                android:textSize="12sp"/>
         </LinearLayout>
     </RelativeLayout>
 
+    <LinearLayout
+        android:id="@+id/ll_doing"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:text="进行中"
+            android:textColor="@color/black_light"/>
+
+        <include
+            layout="@layout/task_item"/>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingTop="5dp"
+        android:text="发布中"
+        android:textColor="@color/black_light"/>
+
 </LinearLayout>

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

@@ -6,22 +6,25 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:layout_margin="5dp"
-        android:background="@color/backgroud">
+        android:layout_height="80dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/backgroud"
+        >
 
         <ImageView
-            android:layout_margin="5dp"
             android:id="@+id/img_icon"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_centerVertical="true"
+            android:layout_margin="5dp"
             android:src="@drawable/icon"/>
 
         <LinearLayout
-            android:layout_marginLeft="10dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/img_icon"
             android:orientation="vertical">
 
@@ -33,57 +36,63 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:text="title"
-                android:textColor="@color/theme"
+                android:textColor="@color/black_dark"
                 android:textSize="14sp"/>
 
+
             <TextView
-                android:id="@+id/tv_desc"
+                android:id="@+id/tv_count"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_marginLeft="5dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:text="下载游戏，试玩到5级，截图上报，完成任务"
-                android:textColor="@color/black_dark"
+                android:text="250/250"
+                android:textColor="@color/black_light"
                 android:textSize="12sp"/>
 
             <TextView
-                android:id="@+id/tv_count"
+                android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_marginLeft="5dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:text="250/250"
-                android:textColor="@color/black_dark"
+                android:text="截止时间：2018-1-1"
+                android:textColor="@color/black_light"
                 android:textSize="12sp"/>
 
         </LinearLayout>
 
 
         <TextView
-            android:layout_alignTop="@id/img_icon"
             android:id="@+id/tv_money"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="5dp"
+            android:layout_alignTop="@id/img_icon"
+            android:layout_marginRight="10dp"
             android:text="5.00"
             android:textColor="@color/red"
-            android:textSize="18sp"/>
+            android:textSize="22sp"/>
+
         <TextView
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
             android:id="@+id/tv_guide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="3dp"
+            android:layout_marginRight="5dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="任务攻略 >>"
             android:textColor="@color/theme"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="5dp"
-            android:textSize="12sp"/>
+            android:textSize="12sp"
+            />
+
+        <include
+            layout="@layout/line_h_1px_black"/>
 
     </RelativeLayout>
 

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

@@ -8,102 +8,135 @@
         layout="@layout/title"/>
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        >
 
-        <ImageView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/img_icon"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
             android:src="@drawable/icon"/>
 
         <TextView
             android:id="@+id/tv_nick"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="15dp"
             android:layout_toRightOf="@id/img_icon"
-            android:text="昵称"
+            android:text="asdasd"
             android:textColor="@color/black_dark"
-            android:textSize="18sp"/>
+            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_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginLeft="15dp"
             android:layout_toRightOf="@id/img_icon"
-            android:text="称号：撸大师"
-            android:textColor="@color/theme"
-            android:textSize="15sp"/>
-    </RelativeLayout>
+            android:text="asdasd"
+            android:textColor="@color/black_light"
+            android:textSize="12sp"/>
 
-    <include
-        layout="@layout/line_h_1px"/>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="余额："
+                android:textColor="@color/theme"
+                android:textSize="12sp"/>
 
-        <TextView
+            <TextView
+                android:id="@+id/tv_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/red"
+                android:textSize="30sp"/>
+
+        </LinearLayout>
 
-            android:id="@+id/tv_money"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp"
-            android:text="我的羊毛：250"
-            android:textColor="@color/red"
-            android:textSize="20sp"/>
 
         <TextView
             android:id="@+id/tv_withdraw"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="70dp"
+            android:layout_height="20dp"
+            android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
+            android:layout_marginBottom="3dp"
             android:layout_marginRight="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/red"
-            android:padding="3dp"
-            android:text="马上提现"
+            android:background="@drawable/texe_background_round_red"
+            android:gravity="center"
+            android:text="立即提现"
             android:textColor="@color/white"
-            android:textSize="15sp"/>
+            android:textSize="12sp"/>
     </RelativeLayout>
 
     <include
         layout="@layout/line_h_1px"/>
 
-    <TextView
-        android:id="@+id/tv_task"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:text="任务记录"
-        android:textColor="@color/black_dark"
-        android:textSize="18sp"/>
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="5dp">
+
+        <ImageView
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/task_record"/>
+
+        <TextView
+            android:id="@+id/tv_task"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:layout_marginLeft="5dp"
+            android:gravity="center_vertical"
+            android:text="任务记录"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+
+    </LinearLayout>
+
 
     <include
         layout="@layout/line_h_1px"/>
 
-    <TextView
-        android:id="@+id/tv_withdraw_hostroy"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:text="提现记录"
-        android:textColor="@color/black_dark"
-        android:textSize="18sp"/>
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="5dp">
+
+        <ImageView
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/withdraw"/>
+
+        <TextView
+            android:id="@+id/tv_withdraw_hostroy"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:layout_marginLeft="5dp"
+            android:gravity="center_vertical"
+            android:text="提现记录"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+
+    </LinearLayout>
+
 
     <include
         layout="@layout/line_h_1px"/>

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

@@ -15,7 +15,7 @@
         android:layout_marginTop="10dp"
         android:paddingLeft="15dp"
         android:text="余 额：25.5"
-        android:textColor="@color/black_dark"
+        android:textColor="@color/red"
         android:textSize="14sp"/>
 
     <GridView
@@ -33,7 +33,7 @@
     <TextView
         android:id="@+id/tv_wx"
         android:layout_width="200dp"
-        android:layout_height="40dp"
+        android:layout_height="35dp"
         android:layout_marginLeft="5dp"
         android:layout_marginTop="15dp"
         android:background="@drawable/text_backgroud"

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

@@ -0,0 +1,62 @@
+<?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="match_parent"
+              android:orientation="vertical">
+
+    <include
+        layout="@layout/title"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="申请日期"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="金额"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="微信号"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="订单状态"
+            android:textColor="@color/black_dark"
+            android:textSize="14sp"/>
+    </LinearLayout>
+
+    <include
+        layout="@layout/line_h_1px"/>
+
+    <ListView
+        android:id="@+id/lv_record"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ListView>
+
+</LinearLayout>

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

@@ -0,0 +1,84 @@
+<?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">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_marginTop="5dp"
+        android:background="@color/backgroud"
+        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"/>
+
+
+        <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/theme"
+            android:textSize="14sp"/>
+
+        <TextView
+            android:id="@+id/tv_wx"
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="@color/black_dark"
+            android:textSize="12sp"/>
+
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical"
+            >
+
+            <TextView
+                android:id="@+id/tv_state"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/theme"
+                android:padding="3dp"
+                android:textColor="@color/white"
+                android:textSize="12dp"/>
+
+            <TextView
+                android:id="@+id/tv_failed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="5dp"
+                android:textColor="@color/black_dark"
+                android:textSize="12dp"
+                android:visibility="gone"/>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/line_h_1px_black"/>
+
+
+</LinearLayout>

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

@@ -3,12 +3,16 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#ff842c</color>
-    <color name="theme">#ff842c</color>
+    <color name="theme_bule">#ff842c</color>
+    <color name="theme">#add6ff</color>
+    <color name="theme_light">#d1e8ff</color>
     <color name="translate">#00ffffff</color>
     <color name="white">#ffffff</color>
     <color name="white_red">#fffbf9</color>
-    <color name="black_dark">#363636</color>
-    <color name="backgroud">#f9f5f4</color>
+    <color name="black_dark">#d7363636</color>
+    <color name="black_light">#999999</color>
+    <color name="backgroud">#f4f4f9</color>
     <color name="green">#358400</color>
     <color name="red">#f00</color>
+    <color name="blue">#80c4ff</color>
 </resources>