add more

.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

.idea/gradle.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
+    </modules>
+  </component>
+</project>

.idea/runConfigurations.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

app/src/main/AndroidManifest.xml

@@ -93,6 +93,18 @@
         <activity
             android:name=".page.WebActivity"
             android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".page.MoneyHistroyActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".page.WXAccountActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".page.InputWXAccountActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
+
 </manifest>

app/src/main/java/com/sheep/jiuyan/samllsheep/net/Url.java

@@ -18,5 +18,11 @@ public class Url {
     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";
+    public static String WXTASK=Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
+    public static String MONEYRECORD=Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
+
+    public static String WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/userChildWxList";
+
+
 
 }

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

@@ -0,0 +1,144 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import android.content.Intent;
+import android.support.design.widget.TextInputEditText;
+import android.support.v7.widget.AppCompatButton;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.WXAccount;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/1/6.
+ */
+
+public class InputWXAccountActivity extends BaseActivity implements View.OnClickListener{
+    private LinearLayout  mLl1;
+    private LinearLayout  mLl2;
+    private LinearLayout  mLl3;
+    private LinearLayout  mLl4;
+
+    private TextInputEditText et_account_1;
+    private TextInputEditText et_account_2;
+    private TextInputEditText et_account_3;
+    private TextInputEditText et_account_4;
+
+
+    private TextInputEditText et_pwd_1;
+    private TextInputEditText et_pwd_2;
+    private TextInputEditText et_pwd_3;
+    private TextInputEditText et_pwd_4;
+
+    private TextView tv_wx;
+
+
+    private TextView mTitle;
+    @Override
+    protected int getLayoutId() {
+        return R.layout.input_wx_account_activity;
+    }
+
+    @Override
+    public void initView() {
+
+        mTitle=(TextView) findViewById(R.id.tv_title);
+        mLl1=(LinearLayout)findViewById(R.id.ll_1);
+        mLl2=(LinearLayout)findViewById(R.id.ll_2);
+        mLl3=(LinearLayout)findViewById(R.id.ll_3);
+        mLl4=(LinearLayout)findViewById(R.id.ll_4);
+
+        et_account_1=(TextInputEditText)findViewById(R.id.et_account_1);
+        et_account_2=(TextInputEditText)findViewById(R.id.et_account_2);
+        et_account_3=(TextInputEditText)findViewById(R.id.et_account_3);
+        et_account_4=(TextInputEditText)findViewById(R.id.et_account_4);
+
+        et_pwd_1=(TextInputEditText)findViewById(R.id.et_pwd_1);
+        et_pwd_2=(TextInputEditText)findViewById(R.id.et_pwd_2);
+        et_pwd_3=(TextInputEditText)findViewById(R.id.et_pwd_3);
+        et_pwd_4=(TextInputEditText)findViewById(R.id.et_pwd_4);
+
+        tv_wx=(TextView) findViewById(R.id.tv_wx);
+    }
+
+    @Override
+    public void initListener() {
+        tv_wx.setOnClickListener(this);
+    }
+
+    @Override
+    public void initData() {
+        mTitle.setText("账户信息");
+        Intent i=getIntent();
+        int  count =i.getIntExtra("count",0);
+
+        switch (count){
+            case 0:
+                mLl1.setVisibility(View.GONE);
+                mLl2.setVisibility(View.GONE);
+                mLl3.setVisibility(View.GONE);
+                mLl4.setVisibility(View.GONE);
+                break;
+            case 1:
+                mLl2.setVisibility(View.GONE);
+                mLl3.setVisibility(View.GONE);
+                mLl4.setVisibility(View.GONE);
+
+            break;
+            case 2:
+                mLl3.setVisibility(View.GONE);
+                mLl4.setVisibility(View.GONE);
+                break;
+            case 3:
+                mLl4.setVisibility(View.GONE);
+                break;
+            case 4:
+                break;
+        }
+    }
+
+    private  void  upload(){
+        HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        map.put("wx_1", et_account_1.getText().toString());
+        map.put("wx_2", et_account_2.getText().toString());
+        map.put("wx_3", et_account_3.getText().toString());
+        map.put("wx_4", et_account_4.getText().toString());
+        map.put("ps_1", et_pwd_1.getText().toString());
+        map.put("ps_2", et_pwd_2.getText().toString());
+        map.put("ps_3", et_pwd_3.getText().toString());
+        map.put("ps_4", et_pwd_4.getText().toString());
+
+        NetManager.get(Url.WXACCOUNT, map, getApplicationContext(), new SheepCallback<String>(this) {
+
+
+            @Override
+            public void success(String s) {
+                  Toast.makeText(InputWXAccountActivity.this,"数据上传成功",Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()){
+            case R.id.tv_wx:
+                upload();
+                break;
+
+
+        }
+
+
+    }
+}

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

@@ -40,6 +40,10 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView() {
         mImgLogin = (ImageView) findViewById(R.id.img_login);
+        loginFromWx();
+        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+        startActivity(intent);
+        finish();
     }
 
     @Override
@@ -104,7 +108,7 @@ public class LoginActivity extends BaseActivity {
         req.state = "small_sheep_auther";
         SheepApp.mWxapi.sendReq(req);*/
 
-        SpUtils.login(this, "123456");
+        SpUtils.login(this, "abcabc");
     }
 
 

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

@@ -1,7 +1,6 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -17,6 +16,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
@@ -30,11 +30,15 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.adapter.TaskAdapter;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
+import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
+import com.sheep.jiuyan.samllsheep.page.weight.MutiProgress;
 import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.tencent.mm.opensdk.modelmsg.WXAppExtendObject;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -71,12 +75,23 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private TextView mTvGuide;
     private LinearLayout mTlDoing;
 
+
+    private  LinearLayout mLlNewTask;
+
+    private  LinearLayout mll_progress;
+
+
+    private MutiProgress mMp1;
+
+    private  WXTask  mWXTask;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestPermission();
         Intent intent = new Intent(MainActivity.this, FloatWindow.class);
         startActivity(intent);
+
     }
 
     @Override
@@ -92,6 +107,9 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     }
 
 
+
+
+
     @Override
     public void initData() {
         HashMap<String, String> map = new HashMap<>();
@@ -274,9 +292,45 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         mTvGuide = (TextView) head.findViewById(R.id.tv_guide);
         mTlDoing = (LinearLayout) head.findViewById(R.id.ll_doing);
         mImgUser = head.findViewById(R.id.img_user);
+        mMp1=(MutiProgress)head.findViewById(R.id.mp_1);
+        mLlNewTask=(LinearLayout)head.findViewById(R.id.ll_new_task);
+        mll_progress=(LinearLayout) head.findViewById(R.id.ll_progress);
+        mll_progress.setOnClickListener(this);
+        requestNewPeopleTask();
 
     }
 
+
+    private void requestNewPeopleTask() {
+        final HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        NetManager.get(Url.WXTASK, map, this, new SheepCallback<WXTask>(this) {
+            @Override
+            public void success(WXTask o) {
+//             if(mMp1)
+                mWXTask=o;
+                mMp1.setVisibility(View.VISIBLE);
+                mMp1.setCurrNodeNO(o.getCommitCount());
+
+            }
+            @Override
+            public void otherCode(int code, String string) {
+
+                mMp1.setVisibility(View.GONE);
+
+
+            }
+
+        });
+
+
+
+    }
+
+
+
+
+
     private void findviews() {
         mRecyclerView = (XRecyclerView) findViewById(R.id.tasks);
     }
@@ -330,6 +384,18 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                 }
                 startActivity(intent);
                 break;
+
+            case R.id.ll_progress:
+
+                if (SpUtils.isLogin(getApplicationContext())) {
+                    intent = new Intent(MainActivity.this, InputWXAccountActivity.class);
+                    intent.putExtra("count",mWXTask.getCommitCount());
+                } else {
+                    intent = new Intent(MainActivity.this, LoginActivity.class);
+                }
+                startActivity(intent);
+
+            break;
         }
     }
 }

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

@@ -0,0 +1,97 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.Order;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.zhy.adapter.abslistview.CommonAdapter;
+import com.zhy.adapter.abslistview.ViewHolder;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by kemllor on 2017/12/29.
+ */
+
+public class MoneyHistroyActivity extends BaseActivity {
+    private ListView mLv;
+    private TextView mTitle;
+    private ImageView mImgBack;
+    private CommonAdapter<MoneyHistroy> mAdapter;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.money_histroy_activity;
+    }
+
+    @Override
+    public void initView() {
+        mLv = (ListView) findViewById(R.id.lv);
+        mTitle = 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();
+            }
+        });
+    }
+    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());
+                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.red));
+                        viewHolder.setText(R.id.tv_money, str);
+                    }
+                }
+
+            }
+        };
+        mLv.setAdapter(mAdapter);
+
+    }
+
+
+    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) {
+            @Override
+            public void success(List<MoneyHistroy> orders) {
+                 showView(orders);
+            }
+        });
+    }
+    @Override
+    public void initData() {
+        mTitle.setText("资金记录");
+        getTask();
+    }
+}

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
@@ -12,7 +13,9 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 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.User;
+import com.sheep.jiuyan.samllsheep.page.entry.WXAccount;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.util.HashMap;
@@ -44,6 +47,10 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     private TextView mTvWithdrawHostroy;
     private User mUser;
 
+    private LinearLayout  mLlMoneyHostroy;
+
+    private  TextView  tv_wx_aacount;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,6 +68,8 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvTask.setOnClickListener(this);
         mTvWithdrawHostroy.setOnClickListener(this);
         mBack.setOnClickListener(this);
+        mLlMoneyHostroy.setOnClickListener(this);
+        tv_wx_aacount.setOnClickListener(this);
     }
 
     @Override
@@ -91,6 +100,9 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
         mTvWithdrawHostroy = (TextView) findViewById(R.id.tv_withdraw_hostroy);
         mBack = (ImageView) findViewById(R.id.img_back);
         mTitle = (TextView) findViewById(R.id.tv_title);
+        tv_wx_aacount=(TextView) findViewById(R.id.tv_wx_aacount);
+
+        mLlMoneyHostroy=(LinearLayout)findViewById(R.id.ll_money_hostroy);
     }
 
     @Override
@@ -122,6 +134,27 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                     toLogin();
                 }
                 break;
+
+            case  R.id.ll_money_hostroy:
+                if (checkLogin()) {
+                    intent = new Intent(UserCenterActivity.this, MoneyHistroyActivity.class);
+                    startActivity(intent);
+                } else {
+                    toLogin();
+                }
+
+                break;
+
+            case  R.id.tv_wx_aacount:
+
+                if (checkLogin()) {
+                    intent = new Intent(UserCenterActivity.this, WXAccountActivity.class);
+                    startActivity(intent);
+                } else {
+                    toLogin();
+                }
+
+                break;
             case R.id.img_back:
                 finish();
                 break;

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

@@ -0,0 +1,106 @@
+package com.sheep.jiuyan.samllsheep.page;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+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.WXAccount;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.zhy.adapter.abslistview.CommonAdapter;
+import com.zhy.adapter.abslistview.ViewHolder;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by kemllor on 2017/12/29.
+ */
+
+public class WXAccountActivity extends BaseActivity {
+    private ListView mLv;
+    private TextView mTitle;
+    private ImageView mImgBack;
+    private CommonAdapter<WXAccount> mAdapter;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.wx_account_activity;
+    }
+
+    @Override
+    public void initView() {
+        mLv = (ListView) findViewById(R.id.lv);
+        mTitle = 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();
+            }
+        });
+    }
+    private  void  showView(List<WXAccount> orders){
+        mAdapter=new CommonAdapter<WXAccount>(WXAccountActivity.this,R.layout.wx_account_item, orders) {
+            @Override
+            protected void convert(ViewHolder viewHolder, WXAccount item, int position) {
+
+                viewHolder.setText(R.id.tv_account, item.getWxId());
+
+                viewHolder.setText(R.id.tv_desc, item.getAction());
+
+                getState(viewHolder.<TextView>getView(R.id.tv_status), item.getStatus());
+
+
+            }
+
+            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;
+                }
+            }
+        };
+        mLv.setAdapter(mAdapter);
+
+    }
+
+
+    private void getTask(){
+        final HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        NetManager.get(Url.WXACCOUNT, map, getApplicationContext(), new SheepCallback<List<WXAccount>>(this) {
+            @Override
+            public void success(List<WXAccount> orders) {
+                 showView(orders);
+            }
+        });
+    }
+    @Override
+    public void initData() {
+        mTitle.setText("账户信息");
+        getTask();
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.sheep.jiuyan.samllsheep.page.entry;
+
+/**
+ * Created by Administrator on 2018/1/6.
+ */
+
+public class MoneyHistroy {
+
+    private  int  Id;
+    private  int Uid;
+    private  String Desc;
+    private  String Money;
+    private  String Balance;
+    private  String CreateTime;
+
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int id) {
+        Id = id;
+    }
+
+    public int getUid() {
+        return Uid;
+    }
+
+    public void setUid(int uid) {
+        Uid = uid;
+    }
+
+    public String getDesc() {
+        return Desc;
+    }
+
+    public void setDesc(String desc) {
+        Desc = desc;
+    }
+
+    public String getMoney() {
+        return Money;
+    }
+
+    public void setMoney(String money) {
+        Money = money;
+    }
+
+    public String getBalance() {
+        return Balance;
+    }
+
+    public void setBalance(String balance) {
+        Balance = balance;
+    }
+
+    public String getCreateTime() {
+        return CreateTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        CreateTime = createTime;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.sheep.jiuyan.samllsheep.page.entry;
+
+/**
+ * Created by Administrator on 2018/1/6.
+ */
+
+public class WXAccount {
+    private  String   WxId;
+
+    /**
+     * 描述
+     */
+    private  String Action;
+    /**
+     * 状态
+     */
+    private  int Status;
+
+
+    public String getWxId() {
+        return WxId;
+    }
+
+    public void setWxId(String wxId) {
+        WxId = wxId;
+    }
+
+    public String getAction() {
+        return Action;
+    }
+
+    public void setAction(String action) {
+        Action = action;
+    }
+
+    public int getStatus() {
+        return Status;
+    }
+
+    public void setStatus(int status) {
+        Status = status;
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.sheep.jiuyan.samllsheep.page.entry;
+
+/**
+ * Created by Administrator on 2018/1/6.
+ */
+
+public class WXTask {
+    private int Id;
+    private String TaskDesc;
+    private String Title;
+    private String Bonus;
+    private  String Status;
+    private int CommitCount;
+
+
+    public int getId() {
+        return Id;
+    }
+
+    public void setId(int id) {
+        Id = id;
+    }
+
+    public String getTaskDesc() {
+        return TaskDesc;
+    }
+
+    public void setTaskDesc(String taskDesc) {
+        TaskDesc = taskDesc;
+    }
+
+    public String getTitle() {
+        return Title;
+    }
+
+    public void setTitle(String title) {
+        Title = title;
+    }
+
+    public String getBonus() {
+        return Bonus;
+    }
+
+    public void setBonus(String bonus) {
+        Bonus = bonus;
+    }
+
+    public String getStatus() {
+        return Status;
+    }
+
+    public void setStatus(String status) {
+        Status = status;
+    }
+
+
+    public int getCommitCount() {
+        return CommitCount;
+    }
+
+    public void setCommitCount(int commitCount) {
+        CommitCount = commitCount;
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/page/weight/MutiProgress.java

@@ -0,0 +1,169 @@
+package com.sheep.jiuyan.samllsheep.page.weight;
+
+import java.util.ArrayList;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import com.sheep.jiuyan.samllsheep.R;
+
+/**
+ * 多节点进度条自定义视图
+ * @author huqiang
+ *
+ */
+public class MutiProgress extends View{
+
+    private int nodesNum ; //节点数量
+    private Drawable progressingDrawable;  //进行中的图标
+    private Drawable unprogressingDrawable;
+    private Drawable progresFailDrawable;  //失败的节点
+    private Drawable progresSuccDrawable;  //成功的节点
+    private int nodeRadius;  //节点的半径
+    private int processingLineColor;  //进度条的颜色
+
+    //    private int progressLineHeight;   //进度条的高度
+    private int currNodeNO;  //当前进行到的节点编号。从0开始计算
+    private int currNodeState; //当前进行到的节点编号所对应的状态 0：失败  1：成功
+    //    private int textSize;  //字体大小
+    Context mContext;
+
+    int mWidth,mHeight;
+    private Paint mPaint;
+    private Canvas mCanvas;
+    private Bitmap mBitmap; //mCanvas绘制在这上面
+    private ArrayList<Node> nodes;
+
+    private int DEFAULT_LINE_COLOR = Color.BLUE;
+    public MutiProgress(Context context) {
+        this(context,null);
+
+    }
+    public MutiProgress(Context context, AttributeSet attrs) {
+        this(context,attrs,0);
+    }
+    public MutiProgress(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+
+        TypedArray mTypedArray = context.obtainStyledAttributes(attrs, R.styleable.MutiProgress);
+        nodesNum = mTypedArray.getInteger(R.styleable.MutiProgress_nodesNum, 1); //默认一个节点
+        nodeRadius = mTypedArray.getDimensionPixelSize(R.styleable.MutiProgress_nodeRadius, 10); //节点半径
+        progressingDrawable = mTypedArray.getDrawable(R.styleable.MutiProgress_progressingDrawable);
+        unprogressingDrawable = mTypedArray.getDrawable(R.styleable.MutiProgress_unprogressingDrawable);
+        progresFailDrawable = mTypedArray.getDrawable(R.styleable.MutiProgress_progresFailDrawable);
+        progresSuccDrawable = mTypedArray.getDrawable(R.styleable.MutiProgress_progresSuccDrawable);
+        processingLineColor = mTypedArray.getColor(R.styleable.MutiProgress_processingLineColor, DEFAULT_LINE_COLOR);
+        currNodeState = mTypedArray.getInt(R.styleable.MutiProgress_currNodeState, 1);
+        currNodeNO = mTypedArray.getInt(R.styleable.MutiProgress_currNodeNO, 1);
+
+    }
+
+    public  void  setCurrNodeNO(int  i){
+        currNodeNO=i-1;
+        DrawProgerss();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        mWidth = getMeasuredWidth();
+        mHeight = getMeasuredHeight();
+
+        mBitmap = Bitmap.createBitmap(mWidth, mHeight, Config.ARGB_8888);
+        mPaint = new Paint();
+        mPaint.setColor(processingLineColor);
+        mPaint.setAntiAlias(true);
+        mPaint.setStrokeJoin(Paint.Join.ROUND); // 圆角
+        mPaint.setStrokeCap(Paint.Cap.ROUND); // 圆角
+        mCanvas = new Canvas(mBitmap);
+
+        nodes = new ArrayList<MutiProgress.Node>();
+        float nodeWidth = ((float)mWidth)/(nodesNum-1);
+        for(int i=0;i<nodesNum;i++)
+        {
+            Node node = new Node();
+            if(i==0)
+                node.mPoint = new Point(((int)nodeWidth*i),mHeight/2-nodeRadius);
+            else if(i==(nodesNum-1))
+                node.mPoint = new Point(((int)nodeWidth*i)-nodeRadius*2,mHeight/2-nodeRadius);
+            else
+                node.mPoint = new Point(((int)nodeWidth*i)-nodeRadius,mHeight/2-nodeRadius);
+            if(currNodeNO == i)
+                node.type = 1;  //当前进度所到达的节点
+            else
+                node.type = 0; //已完成
+            nodes.add(node);
+        }
+    }
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        DrawProgerss();
+        Log.v("ondraw", "mBitmap="+mBitmap);
+        if(mBitmap!=null)
+        {
+            canvas.drawBitmap(mBitmap, new Rect(0,0,mBitmap.getWidth(),mBitmap.getHeight()), new Rect(0,0,mBitmap.getWidth(),mBitmap.getHeight()), mPaint);
+        }
+        for(int i=0;i<nodes.size();i++)
+        {
+            Node node = nodes.get(i);
+            Log.v("ondraw", node.mPoint.x +";y="+node.mPoint.y);
+            if(i<currNodeNO)  //已完成的进度节点
+            {
+                progressingDrawable.setBounds(node.mPoint.x,  node.mPoint.y , node.mPoint.x + nodeRadius*2,node.mPoint.y + nodeRadius*2);
+                progressingDrawable.draw(canvas);
+            }
+            else if(i==currNodeNO)  //当前所到达的进度节点（终点）
+            {
+                if(currNodeState == 1) //判断是成功还是失败  0 :失败  1：成功
+                {
+                    progresSuccDrawable.setBounds(node.mPoint.x,  node.mPoint.y , node.mPoint.x + nodeRadius*2,node.mPoint.y + nodeRadius*2);
+                    progresSuccDrawable.draw(canvas);
+                }
+                else
+                {
+                    progresFailDrawable.setBounds(node.mPoint.x,  node.mPoint.y , node.mPoint.x + nodeRadius*2,node.mPoint.y + nodeRadius*2);
+                    progresFailDrawable.draw(canvas);
+                }
+            }
+            else   //未完成的进度节点
+            {
+                unprogressingDrawable.setBounds(node.mPoint.x,  node.mPoint.y , node.mPoint.x + nodeRadius*2,node.mPoint.y + nodeRadius*2);
+                unprogressingDrawable.draw(canvas);
+            }
+        }
+    }
+    private void DrawProgerss()
+    {
+        //先画背景
+        Paint bgPaint = new Paint();
+        bgPaint.setColor(Color.parseColor("#f0f0f0"));
+        mCanvas.drawRect(0, 0, mWidth, mHeight, bgPaint);
+        //先画线段，线段的高度为nodeRadius/2
+        mPaint.setStrokeWidth(nodeRadius/2);
+        //前半截线段
+//        mCanvas.drawLine(nodeRadius, mHeight/2, mWidth-nodeRadius, mHeight/2, mPaint);  //线段2端去掉nodeRadius
+        mCanvas.drawLine(nodeRadius, mHeight/2, nodes.get(currNodeNO).mPoint.x + nodeRadius, nodes.get(currNodeNO).mPoint.y + nodeRadius, mPaint);  //线段2端去掉nodeRadius
+        //后半截线段
+        mPaint.setColor(Color.parseColor("#dddddd"));
+        mCanvas.drawLine(nodes.get(currNodeNO).mPoint.x +nodeRadius, nodes.get(currNodeNO).mPoint.y + nodeRadius, mWidth-nodeRadius, mHeight/2, mPaint);  //线段2端去掉nodeRadius
+    }
+    class Node
+    {
+        Point mPoint;
+        int type; //0:已完成  1:当前到达的进度节点
+    }
+}

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

@@ -37,7 +37,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/sheep"/>
+        android:src="@drawable/icon_sheep"/>
 
     <LinearLayout
         android:id="@+id/ll_info_right"

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

@@ -0,0 +1,258 @@
+<?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">
+
+    <include
+        layout="@layout/title"/>
+
+
+     <LinearLayout
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:id="@+id/ll_1"
+         android:orientation="vertical"
+         >
+         <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:orientation="horizontal"
+             android:layout_marginRight="10dp"
+             >
+
+         <LinearLayout
+             android:layout_width="0dp"
+             android:layout_height="wrap_content"
+             android:layout_weight="1"
+             android:orientation="horizontal"
+             >
+
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="微信号 ："
+              android:layout_marginLeft="5dp"
+              />
+         <android.support.design.widget.TextInputEditText
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:id="@+id/et_account_1"
+             />
+
+         </LinearLayout>
+
+             <LinearLayout
+                 android:layout_width="0dp"
+                 android:layout_height="wrap_content"
+                 android:layout_weight="1"
+                 android:orientation="horizontal"
+                 android:layout_marginLeft="10dp"
+                 >
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="密 码 ："
+                     />
+         <android.support.design.widget.TextInputEditText
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:inputType="textPassword"
+             android:id="@+id/et_pwd_1"
+             />
+</LinearLayout>
+         </LinearLayout>
+
+     </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/ll_2"
+        android:orientation="vertical"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginRight="10dp"
+            >
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="微信号 ："
+                    android:layout_marginLeft="5dp"
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/et_account_2"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:layout_marginLeft="10dp"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="密 码 ："
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:id="@+id/et_pwd_2"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/ll_3"
+        android:orientation="vertical"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginRight="10dp"
+            >
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="微信号 ："
+                    android:layout_marginLeft="5dp"
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/et_account_3"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:layout_marginLeft="10dp"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="密 码 ："
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:id="@+id/et_pwd_3"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/ll_4"
+        android:orientation="vertical"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginRight="10dp"
+            >
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="微信号 ："
+                    android:layout_marginLeft="5dp"
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/et_account_4"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal"
+                android:layout_marginLeft="10dp"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="密 码 ："
+                    />
+                <android.support.design.widget.TextInputEditText
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textPassword"
+                    android:id="@+id/et_pwd_4"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+
+    <TextView
+        android:id="@+id/tv_wx"
+        android:layout_width="200dp"
+        android:layout_height="35dp"
+        android:layout_margin="30dp"
+        android:background="@drawable/text_backgroud"
+        android:layout_gravity="center_horizontal"
+        android:text="提交"
+        android:gravity="center"
+        android:textColor="@drawable/text_color"
+        android:textSize="16sp"/>
+
+
+</LinearLayout>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
     <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:id="@+id/tasks"
         android:layout_width="match_parent"

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

@@ -0,0 +1,64 @@
+<?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/black_dark"
+            android:textSize="14sp"/>
+
+        <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_des"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:padding="3dp"
+            android:textColor="@color/black_dark"
+            android:textSize="12dp"/>
+
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/line_h_1px_black"/>
+
+
+</LinearLayout>

app/src/main/res/layout/money_histroy_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"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ListView>
+
+</LinearLayout>

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

@@ -1,8 +1,9 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -117,15 +118,51 @@
                 android:textSize="12sp"/>
         </LinearLayout>
     </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:id="@+id/ll_new_task"
+
+        >
+        <TextView
+            android:text="新手专享"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:textColor="@color/black_light"
+            />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:layout_marginTop="10dp"
+            android:background="@color/backgroud"
+            android:id="@+id/ll_progress"
+            android:orientation="horizontal">
+
+            <com.sheep.jiuyan.samllsheep.page.weight.MutiProgress
+                android:id="@+id/mp_1"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                app:nodesNum="4"
+                app:nodeRadius="10dp"
+                android:layout_margin="5dp"
+                app:processingLineColor="#7B68EE"
+                app:unprogressingDrawable="@drawable/ic_round_ddd"
+                app:progressingDrawable="@drawable/ic_completed"
+                app:progresFailDrawable="@drawable/ic_error"
+                app:progresSuccDrawable="@drawable/ic_checked"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
     <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"
@@ -137,6 +174,9 @@
             layout="@layout/task_item"/>
     </LinearLayout>
 
+
+
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -146,4 +186,5 @@
         android:text="发布中"
         android:textColor="@color/black_light"/>
 
+
 </LinearLayout>

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

@@ -79,7 +79,22 @@
             android:gravity="center"
             android:text="立即提现"
             android:textColor="@color/white"
-            android:textSize="12sp"/>
+            android:textSize="10sp"/>
+
+
+        <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:gravity="center"
+            android:text="微信账户"
+            android:layout_toLeftOf="@id/tv_withdraw"
+            android:textColor="@color/white"
+            android:textSize="10sp"/>
     </RelativeLayout>
 
     <include
@@ -100,7 +115,7 @@
         <TextView
             android:id="@+id/tv_task"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="50dp"
             android:layout_marginLeft="5dp"
             android:gravity="center_vertical"
             android:text="任务记录"
@@ -118,6 +133,39 @@
         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/withdraw"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            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"/>
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
         android:paddingLeft="5dp">
 
         <ImageView
@@ -128,7 +176,7 @@
         <TextView
             android:id="@+id/tv_withdraw_hostroy"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="50dp"
             android:layout_marginLeft="5dp"
             android:gravity="center_vertical"
             android:text="提现记录"
@@ -137,8 +185,8 @@
 
     </LinearLayout>
 
-
     <include
         layout="@layout/line_h_1px"/>
 
+
 </LinearLayout>

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

@@ -0,0 +1,54 @@
+<?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"/>
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/line_h_1px"/>
+
+    <ListView
+        android:id="@+id/lv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ListView>
+
+</LinearLayout>

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

@@ -0,0 +1,61 @@
+<?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_account"
+            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"/>
+
+         <RelativeLayout
+             android:layout_width="0dp"
+             android:layout_height="wrap_content"
+             android:layout_weight="1"
+             android:orientation="horizontal"
+             >
+             <TextView
+                 android:id="@+id/tv_status"
+                 android:layout_width="60dp"
+                 android:layout_height="wrap_content"
+                 android:gravity="center"
+                 android:layout_centerInParent="true"
+                 android:textColor="@color/black_dark"
+                 android:textSize="12sp"/>
+
+         </RelativeLayout>
+
+
+        <TextView
+            android:id="@+id/tv_desc"
+            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>
+
+    <include
+        layout="@layout/line_h_1px_black"/>
+
+
+</LinearLayout>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="MutiProgress">
+        <attr name="nodesNum" format="integer"/> <!-- 节点数量 -->
+        <attr name="nodeRadius" format="dimension"/>
+        <attr name="progressingDrawable" format="reference"></attr>
+        <attr name="unprogressingDrawable" format="reference" />  <!-- 未完成的节点图标 -->
+        <attr name="progresFailDrawable" format="reference" />
+        <attr name="progresSuccDrawable" format="reference" />
+
+        <attr name="processingLineColor" format="color"></attr>
+        <attr name="currNodeNO" format="integer"></attr>   <!-- 当前所到达的节点编号  0开始计算-->
+        <attr name="currNodeState" format="integer"></attr>   <!-- 当前所到达的节点状态，0：失败  1：成功 -->
+    </declare-styleable>
+</resources>