模块移植到项目

Signed-off-by: 刁铃刚 <315096953@qq.com>

.idea/modules.xml

@@ -3,8 +3,10 @@
   <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://D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\.idea\modules\app\app.iml" />
+      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\app\app.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\app\app.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
+      <module fileurl="file://D:\Dlg\AndroidStudioProjects\small_sheep_android\small_sheep_android.iml" filepath="D:\Dlg\AndroidStudioProjects\small_sheep_android\small_sheep_android.iml" />
     </modules>
   </component>
 </project>

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

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

app/src/main/java/com/sheep/jiuyan/samllsheep/base/AppActivity.java

@@ -0,0 +1,56 @@
+package com.sheep.jiuyan.samllsheep.base;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.event.FloatMsg;
+
+import org.greenrobot.eventbus.EventBus;
+
+/**
+ * Created by Administrator on 2018/1/7.
+ */
+
+public class AppActivity extends AppCompatActivity{
+    private String mName;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mName = this.getClass().getSimpleName();
+        SheepApp.mActivitys.put(mName, this);
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (SheepApp.mSheepApp.mActivityAount > 0) {
+            FloatMsg floatMsg = new FloatMsg();
+            floatMsg.shouldShow = false;
+            EventBus.getDefault().post(floatMsg);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        SheepApp.mActivitys.remove(mName);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (SheepApp.mSheepApp.mActivityAount <= 0) {
+            FloatMsg floatMsg = new FloatMsg();
+            floatMsg.shouldShow = true;
+            EventBus.getDefault().post(floatMsg);
+        }
+    }
+
+
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -17,10 +17,7 @@ import org.greenrobot.eventbus.EventBus;
  * Created by kemllor on 2017/12/15.
  */
 
-public abstract class BaseActivity extends Activity {
-
-    private String mName;
-
+public abstract class BaseActivity extends AppActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,8 +25,7 @@ public abstract class BaseActivity extends Activity {
         initView();
         initListener();
         initData();
-        mName = this.getClass().getSimpleName();
-        SheepApp.mActivitys.put(mName, this);
+
     }
 
     @Override
@@ -51,34 +47,5 @@ public abstract class BaseActivity extends Activity {
 
     public abstract void initData();
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (SheepApp.mSheepApp.mActivityAount > 0) {
-            FloatMsg floatMsg = new FloatMsg();
-            floatMsg.shouldShow = false;
-            EventBus.getDefault().post(floatMsg);
-        }
-    }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        SheepApp.mActivitys.remove(mName);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (SheepApp.mSheepApp.mActivityAount <= 0) {
-            FloatMsg floatMsg = new FloatMsg();
-            floatMsg.shouldShow = true;
-            EventBus.getDefault().post(floatMsg);
-        }
-    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/floatwindow/FloatService.java

@@ -23,6 +23,7 @@ import com.sheep.jiuyan.samllsheep.page.MainActivity;
 import com.sheep.jiuyan.samllsheep.page.ShotScreenActivity;
 import com.sheep.jiuyan.samllsheep.utils.DeviceInfo;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
+import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -76,11 +77,11 @@ public class FloatService extends Service implements View.OnClickListener {
         //设置窗口初始停靠位置.
         params.gravity = Gravity.LEFT | Gravity.TOP;
         params.x = 0;
-        params.y = 0;
+        params.y = DeviceInfo.dip2px(getApplicationContext(), 25);
 
         //设置悬浮窗口长宽数据.
         params.width = -2;
-        params.height = DeviceInfo.dip2px(this, 40f);
+        params.height = DeviceInfo.dip2px(getApplicationContext(), 40f);
 
         LayoutInflater inflater = LayoutInflater.from(getApplication());
         //获取浮动窗口视图所在布局.
@@ -120,8 +121,8 @@ public class FloatService extends Service implements View.OnClickListener {
         floaticon.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                params.x = (int) event.getRawX() - 25;
-                params.y = (int) event.getRawY() - 25 - statusBarHeight;
+                params.x = (int) event.getRawX() - 20;
+                params.y = (int) event.getRawY() - 20 - statusBarHeight;
                 mWm.updateViewLayout(mFloatwindow, params);
                 switch (event.getAction()) {
                     case MotionEvent.ACTION_UP:
@@ -151,45 +152,48 @@ public class FloatService extends Service implements View.OnClickListener {
     @Override
     public void onClick(View v) {
         Intent intent;
-        switch (v.getId()) {
-            case R.id.img_commit_left:
-            case R.id.img_commit_right:
-                mLeft.setVisibility(View.GONE);
-                mRight.setVisibility(View.GONE);
-                closeActivitys();
-                String pkg = PackageUtil.getLauncherTopApp(getApplicationContext());
-                intent = new Intent(FloatService.this, ShotScreenActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                intent.putExtra("pkg", pkg);
-                startActivity(intent);
-                break;
-            case R.id.img_open_left:
-            case R.id.img_open_right:
-                mLeft.setVisibility(View.GONE);
-                mRight.setVisibility(View.GONE);
-                intent = new Intent(FloatService.this, MainActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-                break;
-            case R.id.floate_icon:
-                int[] ints = new int[2];
-                v.getLocationOnScreen(ints);
-                if (ints[0] > mSize.x / 2) {
-                    if (mLeft.getVisibility() == View.GONE) {
-                        mLeft.setVisibility(View.VISIBLE);
-                        mRight.setVisibility(View.GONE);
-                    } else {
-                        mLeft.setVisibility(View.GONE);
-                    }
+        int i = v.getId();
+        if (i == R.id.img_commit_left || i == R.id.img_commit_right) {
+            mLeft.setVisibility(View.GONE);
+            mRight.setVisibility(View.GONE);
+            closeActivitys();
+            if(!PremissUtils.hasPermission(getApplicationContext())){
+                PremissUtils.openUsageAccessPage(getApplicationContext());
+                return;
+            }
+            String pkg = PackageUtil.getLauncherTopApp(getApplicationContext());
+            intent = new Intent(FloatService.this, ShotScreenActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("pkg", pkg);
+            startActivity(intent);
+
+        } else if (i == R.id.img_open_left || i == R.id.img_open_right) {
+            mLeft.setVisibility(View.GONE);
+            mRight.setVisibility(View.GONE);
+            intent = new Intent();
+            intent.setClassName(FloatService.this,"com.kfzs.duanduan.view.MainActivity");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+
+        } else if (i == R.id.floate_icon) {
+            int[] ints = new int[2];
+            v.getLocationOnScreen(ints);
+            if (ints[0] > mSize.x / 2) {
+                if (mLeft.getVisibility() == View.GONE) {
+                    mLeft.setVisibility(View.VISIBLE);
+                    mRight.setVisibility(View.GONE);
+                } else {
+                    mLeft.setVisibility(View.GONE);
+                }
+            } else {
+                if (mRight.getVisibility() == View.GONE) {
+                    mRight.setVisibility(View.VISIBLE);
+                    mLeft.setVisibility(View.GONE);
                 } else {
-                    if (mRight.getVisibility() == View.GONE) {
-                        mRight.setVisibility(View.VISIBLE);
-                        mLeft.setVisibility(View.GONE);
-                    } else {
-                        mRight.setVisibility(View.GONE);
-                    }
+                    mRight.setVisibility(View.GONE);
                 }
-                break;
+            }
+
         }
     }
 

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

@@ -0,0 +1,35 @@
+package com.sheep.jiuyan.samllsheep.net;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.View;
+
+import com.sheep.jiuyan.samllsheep.page.entry.BindUserEntiey;
+import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
+import java.util.HashMap;
+
+/**
+ * Created by Administrator on 2018/1/7.
+ */
+
+public class BindUser {
+    public static void  myBind(final Activity context, String token){
+        final HashMap<String, String> map = new HashMap<>();
+        map.put("token",token );
+        NetManager.get(Url.BINGACCOUNT, map, context, new SheepCallback<BindUserEntiey>(context) {
+
+            @Override
+            public void success(BindUserEntiey bindUser) {
+              SpUtils.login(context,bindUser.getOpenId());
+            }
+        });
+
+
+
+
+    }
+
+
+}

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

@@ -6,7 +6,6 @@ import android.widget.Toast;
 
 import com.google.gson.internal.$Gson$Types;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.page.LoginActivity;
 import com.sheep.jiuyan.samllsheep.utils.GsonUtil;
 
 import java.io.IOException;
@@ -57,14 +56,6 @@ public abstract class SheepCallback<T> implements Callback {
             });
 
         } else if (code == 401) {
-            mActivity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Intent intent = new Intent(mActivity, LoginActivity.class);
-                    intent.putExtra("come", "other");
-                    mActivity.startActivity(intent);
-                }
-            });
         } else {
             mActivity.runOnUiThread(new Runnable() {
                 @Override

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

@@ -22,7 +22,8 @@ public class Url {
     public static String MONEYRECORD=Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
 
     public static String WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/userChildWxList";
+    public static String COMMIT_WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/commitWx";
 
-
+    public static String BINGACCOUNT=Config.instance().mBaseUrl + "/v1/user/register";
 
 }

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

@@ -31,11 +31,11 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void initView() {
-        mEtWx = findViewById(R.id.et_wx);
-        mTvWx = findViewById(R.id.tv_wx);
-        mBack = findViewById(R.id.img_back);
-        mTitle = findViewById(R.id.tv_title);
-        mRobot = findViewById(R.id.tv_robot);
+        mEtWx =(TextInputEditText) findViewById(R.id.et_wx);
+        mTvWx = (TextView) findViewById(R.id.tv_wx);
+        mBack = (ImageView) findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.tv_title);
+        mRobot = (TextView) findViewById(R.id.tv_robot);
         mTitle.setText("绑定微信");
     }
 
@@ -59,13 +59,13 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.img_back:
-                finish();
-                break;
-            case R.id.tv_wx:
-                bindWx();
-                break;
+        int i = v.getId();
+        if (i == R.id.img_back) {
+            finish();
+
+        } else if (i == R.id.tv_wx) {
+            bindWx();
+
         }
     }
 
@@ -73,7 +73,7 @@ public class BindWxActivity extends BaseActivity implements View.OnClickListener
         String wxId = mEtWx.getText().toString().trim();
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (TextUtils.isEmpty(openId)) {
-            startActivity(new Intent(this, LoginActivity.class));
+//            startActivity(new Intent(this, LoginActivity.class));
         } else {
             HashMap<String, String> map = new HashMap<>();
             map.put("wx_id", wxId);

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.support.design.widget.TextInputEditText;
 import android.support.v7.widget.AppCompatButton;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -44,6 +45,8 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
 
 
     private TextView mTitle;
+    private ImageView img_back;
+
     @Override
     protected int getLayoutId() {
         return R.layout.input_wx_account_activity;
@@ -58,6 +61,9 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
         mLl3=(LinearLayout)findViewById(R.id.ll_3);
         mLl4=(LinearLayout)findViewById(R.id.ll_4);
 
+
+        img_back=(ImageView) findViewById(R.id.img_back);
+
         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);
@@ -74,6 +80,7 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
     @Override
     public void initListener() {
         tv_wx.setOnClickListener(this);
+        img_back.setOnClickListener(this);
     }
 
     @Override
@@ -84,25 +91,28 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
 
         switch (count){
             case 0:
-                mLl1.setVisibility(View.GONE);
-                mLl2.setVisibility(View.GONE);
-                mLl3.setVisibility(View.GONE);
-                mLl4.setVisibility(View.GONE);
+                mLl1.setVisibility(View.VISIBLE);
+                mLl2.setVisibility(View.VISIBLE);
+                mLl3.setVisibility(View.VISIBLE);
+                mLl4.setVisibility(View.VISIBLE);
                 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:
+                mLl2.setVisibility(View.GONE);
+                mLl3.setVisibility(View.GONE);
                 mLl4.setVisibility(View.GONE);
                 break;
             case 4:
+                mLl1.setVisibility(View.GONE);
+                mLl2.setVisibility(View.GONE);
+                mLl3.setVisibility(View.GONE);
+                mLl4.setVisibility(View.GONE);
                 break;
         }
     }
@@ -119,7 +129,7 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
         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) {
+        NetManager.get(Url.COMMIT_WXACCOUNT, map, getApplicationContext(), new SheepCallback<String>(this) {
 
 
             @Override
@@ -131,12 +141,12 @@ public class InputWXAccountActivity extends BaseActivity implements View.OnClick
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
-            case R.id.tv_wx:
-                upload();
-                break;
-
+        int i = view.getId();
+        if (i == R.id.tv_wx) {
+            upload();
 
+        }else if(i==R.id.img_back){
+            finish();
         }
 
 

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

@@ -15,6 +15,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -23,6 +25,7 @@ import com.jcodecraeer.xrecyclerview.XRecyclerView;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
 import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
@@ -61,7 +64,6 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private TextView mTvWithdraw;
     private TextView mTitle;
     private TextView mMoney;
-    private TextView mHostry;
     private TextView mToday;
     private ImageView mDown;
     private AlertDialog mDialog;
@@ -72,28 +74,83 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     private TextView mTvTime;
     private TextView mTvCount;
     private TextView mTvMoney;
+    private TextView mTvBouns;
     private TextView mTvGuide;
     private LinearLayout mTlDoing;
 
 
-    private  LinearLayout mLlNewTask;
+    private LinearLayout mLlNewTask;
 
-    private  LinearLayout mll_progress;
+    private RelativeLayout mll_progress;
 
 
-    private MutiProgress mMp1;
+    private ProgressBar mMp1;
 
-    private  WXTask  mWXTask;
+    private WXTask mWXTask;
+    private TextView mNewTaskTitle;
+    private TextView mTvNewTaskDesc;
+    private TextView mTvNewTaskMoney;
+    private TextView mTvNewTaskBouns;
+    private final int INTENT_GET_PERMISSION = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestPermission();
-        Intent intent = new Intent(MainActivity.this, FloatWindow.class);
+        Intent intent = new Intent(this, FloatWindow.class);
         startActivity(intent);
 
+        getSA();
     }
 
+
+    /**
+     * 申请读写权限6.0
+     */
+    private void getSA() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return;
+        }
+        boolean has = PremissUtils.hasPermission(this);
+        if (!has) {
+            PremissUtils.openUsageAccessPage(this);
+        }
+        List<String> sa = new ArrayList<>();
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE)
+                != PackageManager.PERMISSION_GRANTED) {
+            sa.add(Manifest.permission.READ_PHONE_STATE);
+        }
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.SYSTEM_ALERT_WINDOW)
+                != PackageManager.PERMISSION_GRANTED) {
+            sa.add(Manifest.permission.READ_PHONE_STATE);
+        }
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            sa.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+        }
+        if (sa.size() < 1) {//如果都已经授权了，不能空列表去请求，否则报异常
+            return;
+        }
+        ActivityCompat.requestPermissions(this, sa.toArray(new String[]{}), INTENT_GET_PERMISSION);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == INTENT_GET_PERMISSION) {
+            boolean isOk = true;
+            for (int result : grantResults) {
+                if (result == PackageManager.PERMISSION_DENIED) {
+                    isOk = false;
+                    break;//只要有一个拒绝，就退出并提示
+                }
+            }
+            if (!isOk) {
+                Toast.makeText(MainActivity.this, "权限获取失败，部分功能可能无法正常工作。", Toast.LENGTH_SHORT).show();
+            }
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+
     @Override
     protected int getLayoutId() {
         return R.layout.main_activity;
@@ -107,31 +164,33 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     }
 
 
-
-
-
     @Override
     public void initData() {
+        requestNewPeopleTask();
         HashMap<String, String> map = new HashMap<>();
         map.put("wx_open_id", SpUtils.getOpenId(this));
         NetManager.get(Url.PUBLISH_TASKS, map, getApplicationContext(), new SheepCallback<List<TaskPublish>>(this) {
             @Override
             public void success(List<TaskPublish> tasks) {
-                mAdapter.setData(tasks);
-                mAdapter.notifyDataSetChanged();
+                if (tasks != null && tasks.size() > 0) {
+                    mAdapter.setData(tasks);
+                    mAdapter.notifyDataSetChanged();
+                }
             }
         });
         NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
             @Override
             public void success(User user) {
-                mMoney.setText(user.getBalance());
-                if (!MainActivity.this.isDestroyed())
-                    Glide.with(MainActivity.this)
-                            .load(user.getIcon())
-                            .placeholder(R.drawable.icon)
-                            .dontAnimate()
-                            .into(mImgUser);
-                mToday.setText(String.format("今日收入：%s", user.getToday()));
+                if (user != null) {
+                    mMoney.setText(user.getBalance());
+                    if (!MainActivity.this.isDestroyed())
+                        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) {
@@ -157,6 +216,15 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                             }
                         });
                     }
+                    mTvBouns.setText(taskPublish.getTask().getBonus());
+                    mTvGuide.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent intent = new Intent(MainActivity.this, WebActivity.class);
+                            intent.putExtra("url", taskPublish.getTask().getGuide());
+                            startActivity(intent);
+                        }
+                    });
                 } else {
                     mTlDoing.setVisibility(View.GONE);
                 }
@@ -261,26 +329,15 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                         intent.putExtra("task", mClickItem.getTask());
                         startActivity(intent);
                     }
-            }
-        });
-    }
 
-    private void requestPermission() {
-        boolean has = PremissUtils.hasPermission(this);
-        if (!has) {
-            PremissUtils.openUsageAccessPage(this);
-        }
-        if (Build.VERSION.SDK_INT >= 23)
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
             }
+        });
     }
 
     private void findViewHead(View head) {
         mTvWithdraw = (TextView) head.findViewById(R.id.tv_withdraw);
         mTitle = (TextView) head.findViewById(R.id.title);
         mMoney = (TextView) head.findViewById(R.id.money);
-        mHostry = (TextView) head.findViewById(R.id.hostry);
         mToday = (TextView) head.findViewById(R.id.today);
         mDown = head.findViewById(R.id.img_down);
 
@@ -289,48 +346,43 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         mTvTime = (TextView) head.findViewById(R.id.tv_time);
         mTvCount = (TextView) head.findViewById(R.id.tv_count);
         mTvMoney = (TextView) head.findViewById(R.id.tv_money);
+        mTvBouns = (TextView) head.findViewById(R.id.tv_bouns);
         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);
+        mMp1 = (ProgressBar) head.findViewById(R.id.pb_commit);
+        mNewTaskTitle = head.findViewById(R.id.tv_new_title);
+        mTvNewTaskDesc = head.findViewById(R.id.tv_new_desc);
+        mTvNewTaskMoney = head.findViewById(R.id.tv_new_money);
+        mTvNewTaskBouns = head.findViewById(R.id.tv_new_bouns);
+        mLlNewTask = (LinearLayout) head.findViewById(R.id.ll_new_task);
+        mll_progress = 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());
-
+                //             if(mMp1)
+                mWXTask = o;
+                mLlNewTask.setVisibility(View.VISIBLE);
+                mMp1.setProgress((int) (((float) mWXTask.getCommitCount()) / 4 * 100));
+                mNewTaskTitle.setText(mWXTask.getTitle());
+                mTvNewTaskBouns.setText(mWXTask.getBonus());
+                mTvNewTaskDesc.setText(mWXTask.getTaskDesc());
+                mTvNewTaskMoney.setText(mWXTask.getPrice());
             }
+
             @Override
             public void otherCode(int code, String string) {
-
-                mMp1.setVisibility(View.GONE);
-
-
+                mLlNewTask.setVisibility(View.GONE);
             }
-
         });
-
-
-
     }
 
-
-
-
-
     private void findviews() {
         mRecyclerView = (XRecyclerView) findViewById(R.id.tasks);
     }
@@ -359,43 +411,20 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     @Override
     public void onClick(View v) {
         Intent intent;
-        switch (v.getId()) {
-            case R.id.tv_withdraw:
-                if (SpUtils.isLogin(getApplicationContext())) {
-                    intent = new Intent(MainActivity.this, WithdrawActivity.class);
-                } else {
-                    intent = new Intent(MainActivity.this, LoginActivity.class);
-                }
-                startActivity(intent);
-                break;
-            case R.id.img_down:
-                if (SpUtils.isLogin(getApplicationContext())) {
-                    intent = new Intent(MainActivity.this, DownloadActivity.class);
-                } else {
-                    intent = new Intent(MainActivity.this, LoginActivity.class);
-                }
-                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;
-
-            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;
+        int i = v.getId();
+        if (i == R.id.tv_withdraw) {
+            intent = new Intent(MainActivity.this, WithdrawActivity.class);
+            startActivity(intent);
+        } else if (i == R.id.img_down) {
+            intent = new Intent(MainActivity.this, DownloadActivity.class);
+            startActivity(intent);
+        } else if (i == R.id.img_user) {
+            intent = new Intent(MainActivity.this, UserCenterActivity.class);
+            startActivity(intent);
+        } else if (i == R.id.ll_progress) {
+            intent = new Intent(MainActivity.this, InputWXAccountActivity.class);
+            intent.putExtra("count", mWXTask.getCommitCount());
+            startActivity(intent);
         }
     }
 }

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

@@ -12,7 +12,6 @@ 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;
@@ -38,8 +37,8 @@ public class MoneyHistroyActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = findViewById(R.id.tv_title);
-        mImgBack = findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.tv_title);
+        mImgBack = (ImageView) findViewById(R.id.img_back);
 
     }
 
@@ -57,7 +56,7 @@ public class MoneyHistroyActivity extends BaseActivity {
             @Override
             protected void convert(ViewHolder viewHolder, MoneyHistroy item, int position) {
 
-                viewHolder.setText(R.id.tv_time, item.getCreateTime());
+                viewHolder.setText(R.id.tv_time, item.getCreateTime().replace(" ","\n"));
                 viewHolder.setText(R.id.tv_blacne, item.getBalance());
                 viewHolder.setText(R.id.tv_des, item.getDesc());
                 if(!TextUtils.isEmpty(item.getMoney())){
@@ -67,7 +66,7 @@ public class MoneyHistroyActivity extends BaseActivity {
                         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.setTextColor(R.id.tv_money,getResources().getColor(R.color.sheep_red));
                         viewHolder.setText(R.id.tv_money, str);
                     }
                 }

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

@@ -46,9 +46,9 @@ public class TaskRecordActivity extends BaseActivity {
 
     @Override
     public void initView() {
-        mLvTask = findViewById(R.id.lv_task);
+        mLvTask = (ListView) findViewById(R.id.lv_task);
         mLvTask.setDividerHeight(0);
-        mTvTitle = findViewById(R.id.tv_title);
+        mTvTitle = (TextView) findViewById(R.id.tv_title);
         mBack = findViewById(R.id.img_back);
 
     }
@@ -215,7 +215,7 @@ public class TaskRecordActivity extends BaseActivity {
                                     break;
                                 case 3:
                                     view.setText("未通过");
-                                    view.setBackgroundResource(R.color.red);
+                                    view.setBackgroundResource(R.color.sheep_red);
                                     break;
                             }
                         }

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

@@ -42,14 +42,15 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     private TextView mTvNick;
     private TextView mTvLevel;
     private TextView mTvMoney;
+    private TextView mTvCode;
     private TextView mTvWithdraw;
     private TextView mTvTask;
     private TextView mTvWithdrawHostroy;
     private User mUser;
 
-    private LinearLayout  mLlMoneyHostroy;
+    private LinearLayout mLlMoneyHostroy;
 
-    private  TextView  tv_wx_aacount;
+    private TextView tv_wx_aacount;
 
 
     @Override
@@ -84,6 +85,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                 mTvNick.setText(user.getNickName());
                 mTvLevel.setText(user.getWxId());
                 mTvMoney.setText(user.getBalance());
+                mTvCode.setText("我的邀请码  " + user.getInvitationCode());
                 Glide.with(getApplicationContext()).load(user.getIcon()).placeholder(R.drawable.icon).dontAnimate().into(mImgIcon);
             }
         });
@@ -91,79 +93,77 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void initView() {
-        mImgIcon = findViewById(R.id.img_icon);
+        mImgIcon = (CircleImageView) findViewById(R.id.img_icon);
         mTvNick = (TextView) findViewById(R.id.tv_nick);
         mTvLevel = (TextView) findViewById(R.id.tv_level);
         mTvMoney = (TextView) findViewById(R.id.tv_money);
+        mTvCode = (TextView) findViewById(R.id.tv_invitation_code);
         mTvWithdraw = (TextView) findViewById(R.id.tv_withdraw);
         mTvTask = (TextView) findViewById(R.id.tv_task);
         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);
+        tv_wx_aacount = (TextView) findViewById(R.id.tv_wx_aacount);
 
-        mLlMoneyHostroy=(LinearLayout)findViewById(R.id.ll_money_hostroy);
+        mLlMoneyHostroy = (LinearLayout) findViewById(R.id.ll_money_hostroy);
     }
 
     @Override
     public void onClick(View v) {
         Intent intent;
-        switch (v.getId()) {
-            case R.id.tv_withdraw:
-                if (checkLogin()) {
-                    intent = new Intent(UserCenterActivity.this, WithdrawActivity.class);
-                    intent.putExtra("money", mUser.getBalance());
-                    startActivity(intent);
-                } else {
-                    toLogin();
-                }
-                break;
-            case R.id.tv_withdraw_hostroy:
-                if (checkLogin()) {
-                    intent = new Intent(UserCenterActivity.this, WithdrawRecordActivity.class);
-                    startActivity(intent);
-                } else {
-                    toLogin();
-                }
-                break;
-            case R.id.tv_task:
-                if (checkLogin()) {
-                    intent = new Intent(UserCenterActivity.this, TaskRecordActivity.class);
-                    startActivity(intent);
-                } else {
-                    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;
+        int i = v.getId();
+        if (i == R.id.tv_withdraw) {
+            if (checkLogin()) {
+                intent = new Intent(UserCenterActivity.this, WithdrawActivity.class);
+                intent.putExtra("money", mUser.getBalance());
+                startActivity(intent);
+            } else {
+                toLogin();
+            }
+
+        } else if (i == R.id.tv_withdraw_hostroy) {
+            if (checkLogin()) {
+                intent = new Intent(UserCenterActivity.this, WithdrawRecordActivity.class);
+                startActivity(intent);
+            } else {
+                toLogin();
+            }
+
+        } else if (i == R.id.tv_task) {
+            if (checkLogin()) {
+                intent = new Intent(UserCenterActivity.this, TaskRecordActivity.class);
+                startActivity(intent);
+            } else {
+                toLogin();
+            }
+
+        } else if (i == R.id.ll_money_hostroy) {
+            if (checkLogin()) {
+                intent = new Intent(UserCenterActivity.this, MoneyHistroyActivity.class);
+                startActivity(intent);
+            } else {
+                toLogin();
+            }
+
+
+        } else if (i == R.id.tv_wx_aacount) {
+            if (checkLogin()) {
+                intent = new Intent(UserCenterActivity.this, WXAccountActivity.class);
+                startActivity(intent);
+            } else {
+                toLogin();
+            }
+
+
+        } else if (i == R.id.img_back) {
+            finish();
+
         }
     }
 
     private void toLogin() {
-        Intent intent = new Intent(UserCenterActivity.this, LoginActivity.class);
-        startActivity(intent);
+        //        Intent intent = new Intent(UserCenterActivity.this, LoginActivity.class);
+        //        startActivity(intent);
     }
 
     private boolean checkLogin() {

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

@@ -1,6 +1,5 @@
 package com.sheep.jiuyan.samllsheep.page;
 
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -11,7 +10,6 @@ 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;
@@ -38,8 +36,8 @@ public class WXAccountActivity extends BaseActivity {
     @Override
     public void initView() {
         mLv = (ListView) findViewById(R.id.lv);
-        mTitle = findViewById(R.id.tv_title);
-        mImgBack = findViewById(R.id.img_back);
+        mTitle = (TextView) findViewById(R.id.tv_title);
+        mImgBack = (ImageView) findViewById(R.id.img_back);
 
     }
 
@@ -60,7 +58,6 @@ public class WXAccountActivity extends BaseActivity {
                 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());
 
 
@@ -68,17 +65,17 @@ public class WXAccountActivity extends BaseActivity {
 
             private void getState(TextView view, int state) {
                 switch (state) {
-                    case 1:
+                    case 0:
                         view.setText("未审核");
                         view.setBackgroundResource(R.color.theme);
                         break;
-                    case 2:
+                    case 1:
                         view.setText("正常");
                         view.setBackgroundResource(R.color.green);
                         break;
-                    case 3:
+                    case 2:
                         view.setText("异常");
-                        view.setBackgroundResource(R.color.red);
+                        view.setBackgroundResource(R.color.sheep_red);
                         break;
                 }
             }

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

@@ -30,12 +30,13 @@ public class WebActivity extends BaseActivity {
 
     @Override
     public void initView() {
-        mWeb = findViewById(R.id.web);
-        mTitle = findViewById(R.id.tv_title);
+        mWeb = (WebView) findViewById(R.id.web);
+        mTitle = (TextView) findViewById(R.id.tv_title);
         mBack = findViewById(R.id.img_back);
         mWeb.setWebChromeClient(new WebChromeClient() {
 
         });
+        mWeb.getSettings().setJavaScriptEnabled(true);
         mWeb.setWebViewClient(new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
@@ -43,6 +44,7 @@ public class WebActivity extends BaseActivity {
                 return true;
             }
         });
+
     }
 
     @Override

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

@@ -54,20 +54,14 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void initData() {
-        Intent intent = getIntent();
-        String money = intent.getStringExtra("money");
-        if (!TextUtils.isEmpty(money)) {
-            mMoney.setText(String.format("账户余额：%s", money));
-        } else {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("wx_open_id", SpUtils.getOpenId(this));
-            NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
-                @Override
-                public void success(User user) {
-                    mMoney.setText(String.format("账户余额：%s", user.getBalance()));
-                }
-            });
-        }
+        HashMap<String, String> map = new HashMap<>();
+        map.put("wx_open_id", SpUtils.getOpenId(this));
+        NetManager.get(Url.USER_INFO, map, getApplicationContext(), new SheepCallback<User>(this) {
+            @Override
+            public void success(User user) {
+                mMoney.setText(String.format("账户余额：%s", user.getBalance()));
+            }
+        });
     }
 
     @Override
@@ -84,20 +78,20 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.img_back:
-                finish();
-                break;
-            case R.id.tv_wx:
-                commit();
-                break;
+        int i = v.getId();
+        if (i == R.id.img_back) {
+            finish();
+
+        } else if (i == R.id.tv_wx) {
+            commit();
+
         }
     }
 
     //提现
     private void commit() {
         if (!SpUtils.isLogin(getApplicationContext())) {
-            startActivity(new Intent(this, LoginActivity.class));
+            //            startActivity(new Intent(this, LoginActivity.class));
         } else {
             if (mAdapter.checked == -1) {
                 Toast.makeText(this, "请选择提现金额", Toast.LENGTH_SHORT).show();

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

@@ -37,8 +37,8 @@ public class WithdrawRecordActivity extends BaseActivity {
     @Override
     public void initView() {
         mLvRecord = (ListView) findViewById(R.id.lv_record);
-        mTvTitle = findViewById(R.id.tv_title);
-        mImgBack = findViewById(R.id.img_back);
+        mTvTitle = (TextView) findViewById(R.id.tv_title);
+        mImgBack = (ImageView) findViewById(R.id.img_back);
     }
 
     @Override
@@ -88,7 +88,7 @@ public class WithdrawRecordActivity extends BaseActivity {
                                 break;
                             case 3:
                                 view.setText("付款异常");
-                                view.setBackgroundResource(R.color.red);
+                                view.setBackgroundResource(R.color.sheep_red);
                                 break;
                         }
                     }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/TaskAdapter.java

@@ -59,6 +59,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
         viewHolder.mTvCount.setText(datas.get(position).getSurplusCount() + "/" + datas.get(position).getTotalCouont());
         viewHolder.mTvTime.setText(String.format("截止日期：%s", datas.get(position).getOverTime()));
         viewHolder.mTvMoney.setText(datas.get(position).getTask().getPrice());
+        viewHolder.mTvBouns.setText(datas.get(position).getTask().getBonus());
         Glide.with(mActivity)
                 .load(datas.get(position).getTask().getIcon())
                 .placeholder(R.drawable.sheep)
@@ -99,6 +100,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
         public TextView mTvCount;
         public TextView mTvGuide;
         public TextView mTvMoney;
+        public TextView mTvBouns;
         public View mRootView;
 
         public ViewHolder(View view) {
@@ -110,6 +112,7 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
             mTvCount = (TextView) view.findViewById(R.id.tv_count);
             mTvGuide = (TextView) view.findViewById(R.id.tv_guide);
             mTvMoney = (TextView) view.findViewById(R.id.tv_money);
+            mTvBouns = (TextView) view.findViewById(R.id.tv_bouns);
         }
     }
 }

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

@@ -0,0 +1,17 @@
+package com.sheep.jiuyan.samllsheep.page.entry;
+
+/**
+ * Created by Administrator on 2018/1/7.
+ */
+
+public class BindUserEntiey {
+    private  String  OpenId;
+
+    public String getOpenId() {
+        return OpenId;
+    }
+
+    public void setOpenId(String openId) {
+        OpenId = openId;
+    }
+}

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

@@ -27,8 +27,17 @@ public  class Task implements Serializable {
     private String Icon;
     private String Title;
     private String Price;
+    private String Bonus;
     private String Pkg;
 
+    public String getBonus() {
+        return Bonus;
+    }
+
+    public void setBonus(String bonus) {
+        Bonus = bonus;
+    }
+
     public int getId() {
         return Id;
     }

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

@@ -30,6 +30,15 @@ public class User implements Serializable {
     private String Hostroy;
     private String Today;
     private String Balance;
+    private String InvitationCode;
+
+    public String getInvitationCode() {
+        return InvitationCode;
+    }
+
+    public void setInvitationCode(String invitationCode) {
+        InvitationCode = invitationCode;
+    }
 
     public String getOpenId() {
         return WxOpenId;

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

@@ -10,9 +10,18 @@ public class WXTask {
     private String Title;
     private String Bonus;
     private  String Status;
+    private  String Price;
     private int CommitCount;
 
 
+    public String getPrice() {
+        return Price;
+    }
+
+    public void setPrice(String price) {
+        Price = price;
+    }
+
     public int getId() {
         return Id;
     }

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

@@ -72,7 +72,13 @@ public class MutiProgress extends View{
     }
 
     public  void  setCurrNodeNO(int  i){
-        currNodeNO=i-1;
+        if(i>0) {
+            currNodeNO = i - 1;
+
+        }else{
+            currNodeNO=0;
+        }
+
         DrawProgerss();
     }
 
@@ -151,6 +157,10 @@ public class MutiProgress extends View{
         //先画背景
         Paint bgPaint = new Paint();
         bgPaint.setColor(Color.parseColor("#f0f0f0"));
+
+        if(mCanvas==null){
+            return;
+        }
         mCanvas.drawRect(0, 0, mWidth, mHeight, bgPaint);
         //先画线段，线段的高度为nodeRadius/2
         mPaint.setStrokeWidth(nodeRadius/2);

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/PremissUtils.java

@@ -24,12 +24,12 @@ public class PremissUtils {
         return checkOpNoThrow == 0;
     }
 
-    public static boolean openUsageAccessPage(Activity activity) {
-        if (activity == null) {
+    public static boolean openUsageAccessPage(Context context) {
+        if (context == null) {
             return false;
         }
         try {
-            activity.startActivityForResult(new Intent("android.settings.USAGE_ACCESS_SETTINGS"), MY_PERMISSIONS_REQUEST_PACKAGE_USAGE_STATS);
+            context.startActivity(new Intent("android.settings.USAGE_ACCESS_SETTINGS"));
             return true;
         } catch (Exception e) {
             return false;

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

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

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

@@ -5,9 +5,9 @@
         android:bottomRightRadius="25dp"
         android:topRightRadius="25dp"
         />
-    <stroke android:color="@color/blue"
+    <stroke android:color="@color/white"
         android:width="1px"/>
 
-    <solid android:color="@color/theme"/>
+    <solid android:color="@color/theme_sheep_dark"/>
 
 </shape>

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

@@ -5,9 +5,9 @@
         android:bottomLeftRadius="25dp"
         android:topLeftRadius="25dp"
         />
-    <stroke android:color="@color/blue"
+    <stroke android:color="@color/white"
         android:width="1px"/>
 
-    <solid android:color="@color/theme"/>
+    <solid android:color="@color/theme_sheep_dark"/>
 
 </shape>

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

@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="15dp"
-        android:hint="请输入登录使用的微信号"
+        android:hint="请输入提现的微信号"
         android:textColor="@color/black_dark"
         android:textColorHint="@color/theme"
         android:textSize="14sp"/>
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="15dp"
         android:text="注：填入的微信帐号为佣金接收号，必须和登录帐号一致。\n        帐号一经绑定不能修改"
-        android:textColor="@color/red"
+        android:textColor="@color/sheep_red"
         android:textSize="12sp"/>
 
     <TextView

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

@@ -1,9 +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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="10dp"
-            android:text="我的羊毛"
+            android:text="我的奖金"
             android:textColor="@color/white"
             />
 
@@ -73,7 +73,7 @@
             android:gravity="center"
             android:paddingLeft="15dp"
             android:paddingRight="15dp"
-            android:textColor="@color/red"
+            android:textColor="@color/sheep_red"
             android:textSize="25dp"
             />
 
@@ -86,24 +86,6 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/hostry"
-                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:textSize="12sp"/>
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="10dp"
-                android:layout_gravity="center"
-                android:background="@color/white"/>
 
             <TextView
                 android:id="@+id/today"
@@ -118,51 +100,107 @@
                 android:textSize="12sp"/>
         </LinearLayout>
     </RelativeLayout>
+
     <LinearLayout
+        android:id="@+id/ll_new_task"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         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:paddingLeft="5dp"
+            android:text="新手专享"
             android:textColor="@color/black_light"
             />
 
-        <LinearLayout
+        <RelativeLayout
+            android:id="@+id/ll_progress"
             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"
+            <TextView
+                android:id="@+id/tv_new_title"
                 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"/>
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:paddingLeft="10dp"
+                android:text="微信任务"
+                android:textColor="@color/black_dark"/>
 
-        </LinearLayout>
+            <TextView
+                android:id="@+id/tv_new_bouns"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
+                android:text="5.00"
+                android:textColor="@color/sheep_red"
+                android:textSize="22sp"/>
+
+            <TextView
+                android:id="@+id/tv_text1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/tv_new_bouns"
+                android:layout_marginBottom="3dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="3dp"
+                android:layout_toLeftOf="@id/tv_new_bouns"
+                android:text="+"
+                android:textColor="@color/black_light"
+                android:textSize="12sp"/>
+
+            <TextView
+                android:id="@+id/tv_new_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_toLeftOf="@id/tv_text1"
+                android:text="5.00"
+                android:textColor="@color/sheep_red"
+                android:textSize="22sp"/>
+
+            <TextView
+                android:id="@+id/tv_new_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_new_title"
+                android:layout_marginTop="5dp"
+                android:layout_toLeftOf="@id/tv_new_money"
+                android:paddingLeft="10dp"
+                android:text="提交闲置微信号，每日获取租金"
+                android:textColor="@color/black_light"
+                android:textSize="12dp"/>
+
+            <ProgressBar
+                android:id="@+id/pb_commit"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_margin="5dp"
+                />
+        </RelativeLayout>
 
     </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"
@@ -175,8 +213,6 @@
     </LinearLayout>
 
 
-
-
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -20,11 +20,11 @@
             android:src="@drawable/icon"/>
 
         <LinearLayout
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:layout_marginBottom="5dp"
             android:layout_marginLeft="10dp"
+            android:layout_marginTop="5dp"
             android:layout_toRightOf="@id/img_icon"
             android:orientation="vertical">
 
@@ -66,17 +66,41 @@
 
 
         <TextView
-            android:id="@+id/tv_money"
+            android:id="@+id/tv_bouns"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@id/img_icon"
             android:layout_marginRight="10dp"
             android:text="5.00"
-            android:textColor="@color/red"
+            android:textColor="@color/sheep_red"
+            android:textSize="22sp"/>
+
+        <TextView
+            android:id="@+id/tv_text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/tv_money"
+            android:layout_marginBottom="3dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="3dp"
+            android:layout_toLeftOf="@id/tv_bouns"
+            android:text="+"
+            android:textColor="@color/black_light"
+            android:textSize="12sp"/>
+
+        <TextView
+            android:id="@+id/tv_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/img_icon"
+            android:layout_toLeftOf="@id/tv_text1"
+            android:text="5.00"
+            android:textColor="@color/sheep_red"
             android:textSize="22sp"/>
 
         <TextView
+            android:padding="5dp"
             android:id="@+id/tv_guide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginTop="5dp"
-                android:textColor="@color/red"
+                android:textColor="@color/sheep_red"
                 android:textSize="10dp"
                 android:visibility="gone"/>
 

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="35dp"
-                android:background="@color/theme"
+                android:background="@color/theme_bule"
                 android:orientation="vertical">
 
     <ImageView

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

@@ -27,7 +27,6 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="15dp"
             android:layout_toRightOf="@id/img_icon"
-            android:text="asdasd"
             android:textColor="@color/black_dark"
             android:textSize="14sp"/>
 
@@ -38,7 +37,6 @@
             android:layout_alignBottom="@id/img_icon"
             android:layout_marginLeft="15dp"
             android:layout_toRightOf="@id/img_icon"
-            android:text="asdasd"
             android:textColor="@color/black_light"
             android:textSize="12sp"/>
 
@@ -61,7 +59,7 @@
                 android:id="@+id/tv_money"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/red"
+                android:textColor="@color/sheep_red"
                 android:textSize="30sp"/>
 
         </LinearLayout>
@@ -79,7 +77,7 @@
             android:gravity="center"
             android:text="立即提现"
             android:textColor="@color/white"
-            android:textSize="10sp"/>
+            android:textSize="12sp"/>
 
 
         <TextView
@@ -94,7 +92,7 @@
             android:text="微信账户"
             android:layout_toLeftOf="@id/tv_withdraw"
             android:textColor="@color/white"
-            android:textSize="10sp"/>
+            android:textSize="12sp"/>
     </RelativeLayout>
 
     <include
@@ -139,7 +137,7 @@
         <ImageView
             android:layout_width="15dp"
             android:layout_height="15dp"
-            android:src="@drawable/withdraw"/>
+            android:src="@drawable/sell_icon"/>
 
         <TextView
             android:layout_width="match_parent"
@@ -187,6 +185,32 @@
 
     <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
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:src="@drawable/withdraw"/>
+
+        <TextView
+            android:id="@+id/tv_invitation_code"
+            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>

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/red"
+        android:textColor="@color/sheep_red"
         android:textSize="14sp"/>
 
     <GridView

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

@@ -37,7 +37,7 @@
                  android:layout_height="wrap_content"
                  android:gravity="center"
                  android:layout_centerInParent="true"
-                 android:textColor="@color/black_dark"
+                 android:textColor="@color/white"
                  android:textSize="12sp"/>
 
          </RelativeLayout>

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

@@ -3,9 +3,11 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#ff842c</color>
-    <color name="theme_bule">#ff842c</color>
-    <color name="theme">#add6ff</color>
-    <color name="theme_light">#d1e8ff</color>
+    <color name="theme_bule">@color/theme_app_dark</color>
+    <color name="theme_app_dark">#e15920</color>
+    <color name="theme_sheep_dark">#b73701</color>
+    <color name="theme">@color/theme_bule</color>
+    <color name="theme_light">@color/theme_app_dark</color>
     <color name="translate">#00ffffff</color>
     <color name="white">#ffffff</color>
     <color name="white_red">#fffbf9</color>
@@ -13,6 +15,7 @@
     <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>
+    <color name="sheep_red">#f00</color>
+    <color name="blue">@color/theme_bule</color>
+    <color name="colorControlHighlight">@color/theme_bule</color>
 </resources>

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

@@ -32,4 +32,17 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
+
+    <!-- Base application theme. -->
+    <style name="XMYTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/colorControlHighlight</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+    </style>
+
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.didi.virtualapk:gradle:0.9.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip