一些bug修改，任务刷新界面问题修改等

app/src/main/AndroidManifest.xml

@@ -183,10 +183,8 @@
             android:name="com.sheep.gamegroup.view.activity.FriendAndRewardAct"
             android:screenOrientation="portrait">
         </activity>
-
-
         <activity
-            android:name="com.sheep.gamegroup.view.activity.AccountAndSecurityAct"
+            android:name="com.sheep.gamegroup.view.activity.PersionInfoAct"
             android:screenOrientation="portrait">
         </activity>
 

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -19,4 +19,5 @@ public enum EventTypes {
     SKIP_PAGE_COUNT,//首页的第一个Tab栏的viewpager跳转到第几个pager,others为第几页\
     GO_FiRST , //任务功能  登录后 点击返回键 只能返回第一个界面
     ONFRESH_FGT_FAMLLSHEEP , //刷新fgtSmallSheep数据
+    ONFRESH_TRYMAKEMANY_PAGE , //刷新TryMakeMoneyact数据
 }

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -23,6 +23,16 @@ public class TaskEty implements Serializable{
     private String package_size;
     private int release_task_id;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    private String name;
+
     public int getRelease_task_id() {
         return release_task_id;
     }

app/src/main/java/com/sheep/gamegroup/model/entity/TaskState.java

@@ -0,0 +1,30 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ * 任务状态列表
+ * Created by ljy on 2018/3/25.
+ */
+
+public class TaskState implements Serializable {
+
+    private String name;//"下载游戏",
+    private int status;//1;完成，  2:未完成
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -58,6 +58,11 @@ public class Jump2View {
     }
 
 
+    /**
+     * 跳到安全中兴
+     * @param context
+     * @param o
+     */
     public void goAccountAndSecurit(Context context, Object o){
         Intent intent = new Intent(context, AccountAndSecurityAct.class);
         context.startActivity(intent);

app/src/main/java/com/sheep/gamegroup/view/activity/DialogActivity.java

@@ -9,6 +9,7 @@ import android.preference.DialogPreference;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,17 +24,22 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.utils.dlg.DeviceUtils;
 import com.sheep.gamegroup.di.components.DaggerTaskDialogComponent;
 import com.sheep.gamegroup.di.modules.TaskDialogModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskState;
 import com.sheep.gamegroup.presenter.TaskDialogContract;
 import com.sheep.gamegroup.presenter.TaskDialogPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
 import com.sheep.gamegroup.view.customview.SProgress;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -48,6 +54,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
+import org.greenrobot.eventbus.EventBus;
 import org.xutils.HttpManager;
 import org.xutils.common.Callback;
 import org.xutils.common.task.PriorityExecutor;
@@ -57,6 +64,8 @@ import org.xutils.http.RequestParams;
 import org.xutils.x;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -88,6 +97,8 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @BindView(R.id.listview)
     ListView listview;
     private TaskEty task_entity;
+    private List<TaskState> stateList = new ArrayList<>();//状态列表
+    private TaskStateAdapter stateAdapter;
 
     private DownloadManager downloadManager;
     DownloadInfo downloadInfo;
@@ -112,6 +123,14 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     task_entity.setRunTask(1);
                     setBtnState();
                     break;
+                case 1:
+                    Bundle bundle = msg.getData();
+                    long total = bundle.getLong("total");
+                    long current = bundle.getLong("current");
+
+                    startStaskSprogress.setProgress((int) (current*100/total));
+                    start_task_tv.setText((int) (current*100/total));
+                    break;
             }
         }
     };
@@ -135,7 +154,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                 .placeholder(R.mipmap.ic_launcher)
                 .dontAnimate()
                 .into(dialogItemIconIv);
-        dialogItemNameTv.setText(task_entity.getTask_name());
+        dialogItemNameTv.setText(task_entity.getName());
         dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
         isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
         //Todo ok
@@ -172,94 +191,10 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             }
         });
 
-        listview.setAdapter(new BaseAdapter(){
-            @Override
-            public int getCount() {
-                return 0;
-            }
-
-            @Override
-            public Object getItem(int position) {
-                return null;
-            }
-
-            @Override
-            public long getItemId(int position) {
-                return 0;
-            }
-
-            @NonNull
-            @Override
-            public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-                convertView = LayoutInflater.from(activity).inflate(R.layout.try_makemoney_item, null);
-                return convertView;
-            }
-
-        });
-        /**
-         * 下载
-         */
-        ClassFileHelper.getInstance().createSDDirection();
-        File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
-        if (!mApkPath.exists()) {
-            try {
-                downloadInfo = DownloadManager.getInstance().startDownloadOne(task_entity.getPackage_names(),
-                        task_entity.getDownload_link(), task_entity.getTask_name(),
-                        mApkPath.getAbsolutePath(), task_entity.getIcon(), true, false, null);
-//                    new DownloadItemViewHolder(null, downloadInfo);
-                startStaskSprogress.setProgress(downloadInfo.getProgress());
-            } catch (DbException e) {
-                e.printStackTrace();
-            }
-        } else {
-            PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
-        }
-        String fileSavePath = new File(mApkPath.getAbsolutePath()).getAbsolutePath();
-        DownloadInfo downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
-        //设置请求参数
-        RequestParams params = new RequestParams(task_entity.getDownload_link());
-        params.setAutoResume(true);//设置是否在下载是自动断点续传
-        params.setAutoRename(false);//设置是否根据头信息自动命名文件
-        params.setSaveFilePath("/sdcard/xutils/xUtils_1.avi");
-        params.setExecutor(new PriorityExecutor(2, true));//自定义线程池,有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
-        params.setCancelFast(true);//是否可以被立即停止.
-        cancelable = x.http().get(params, new Callback.ProgressCallback<File>(){
-
-            @Override
-            public void onSuccess(File file) {
-
-            }
-
-            @Override
-            public void onError(Throwable throwable, boolean b) {
-
-            }
-
-            @Override
-            public void onCancelled(CancelledException e) {
-
-            }
-
-            @Override
-            public void onFinished() {
-
-            }
-
-            @Override
-            public void onWaiting() {
-
-            }
-
-            @Override
-            public void onStarted() {
-
-            }
-
-            @Override
-            public void onLoading(long l, long l1, boolean b) {
+        stateAdapter = new TaskStateAdapter(activity, stateList);
+        listview.setAdapter(stateAdapter);
+        stateAdapter.notifyDataSetChanged();
 
-            }
-        });
     }
 
     @OnClick({R.id.doalog_item_get_rewards_tv, R.id.dialog_item_x, R.id.start_task_tv, R.id.start_stask_sprogress})
@@ -329,18 +264,114 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
             ClassFileHelper.getInstance().createSDDirection();
             File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
             if (!mApkPath.exists()) {
-                try {
-                    downloadInfo = DownloadManager.getInstance().startDownloadOne(task_entity.getPackage_names(),
-                            task_entity.getDownload_link(), task_entity.getTask_name(),
-                            mApkPath.getAbsolutePath(), task_entity.getIcon(), true, false, null);
-//                    new DownloadItemViewHolder(null, downloadInfo);
-                    startStaskSprogress.setProgress(downloadInfo.getProgress());
-                } catch (DbException e) {
-                    e.printStackTrace();
+//                new File(mApkPath.getAbsolutePath());
+                DownloadInfo downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
+                if(downloadInfo == null){
+                    downloadInfo = new DownloadInfo();
+                    downloadInfo.setUrl(task_entity.getDownload_link());
+                    downloadInfo.setAutoRename(false);
+                    downloadInfo.setAutoResume(true);
+                    downloadInfo.setLabel(task_entity.getTask_name());
+                    downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
+                    downloadInfo.setIcon(task_entity.getIcon());
+                    downloadInfo.setState(DownloadState.STARTED);
+                    downloadInfo.setPkgName(task_entity.getPackage_names());
+                    MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
                 }
+
+
+                //设置请求参数
+                RequestParams params = new RequestParams(task_entity.getDownload_link());
+                params.setAutoResume(true);//设置是否在下载是自动断点续传
+                params.setAutoRename(false);//设置是否根据头信息自动命名文件
+                params.setSaveFilePath(mApkPath.getAbsolutePath());
+                params.setExecutor(new PriorityExecutor(2, true));//自定义线程池,有效的值范围[1, 3], 设置为3时, 可能阻塞图片加载.
+                params.setCancelFast(true);//是否可以被立即停止.
+                cancelable = x.http().get(params, new Callback.ProgressCallback<File>(){
+
+                    @Override
+                    public void onSuccess(File file) {
+                        Log.e("-----下载","onSuccess");
+                        PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable, boolean b) {
+                        Log.e("-----下载","onError--"+"throwable:"+throwable.getMessage()+",b:"+b);
+
+                    }
+
+                    @Override
+                    public void onCancelled(CancelledException e) {
+                        Log.e("-----下载","onCancelled");
+
+                    }
+
+                    @Override
+                    public void onFinished() {
+                        Log.e("-----下载","onFinished");
+
+                    }
+
+                    @Override
+                    public void onWaiting() {
+                        Log.e("-----下载","onWaiting");
+
+                    }
+
+                    @Override
+                    public void onStarted() {
+                        Log.e("-----下载","onStarted");
+
+                    }
+
+                    @Override
+                    public void onLoading(long total, long current, boolean b) {
+                        Log.e("-----下载","onLoading--total:"+total+",current:"+current+",b:"+b);
+                        Message message = new Message();
+                        message.what = 1;
+                        Bundle bundle = new Bundle();
+                        bundle.putLong("total", total);
+                        bundle.putLong("current", current);
+                        message.setData(bundle);
+                        handler.sendMessage(message);
+                    }
+                });
             } else {
                 PackageUtil.installApk(getApplicationContext(), mApkPath.getAbsolutePath());
             }
+
+
+        }
+        /**
+         * 下载
+         */
+
+    }
+    /**
+     * 判断apk是否下载过
+     */
+    private void isHave(){
+        if (task_entity != null) {
+            ClassFileHelper.getInstance().createSDDirection();
+            File mApkPath = new File(ClassFileHelper.DIR, task_entity.getTask_name() + ClassFileHelper.FILE_SUFFIX);
+            if (!mApkPath.exists()) {
+                DownloadInfo downloadInfo = MyDbManager.getInstance().dbFindDownLoad(task_entity.getTask_name(), mApkPath.getAbsolutePath());
+                if (downloadInfo == null) {
+                    downloadInfo = new DownloadInfo();
+                    downloadInfo.setUrl(task_entity.getDownload_link());
+                    downloadInfo.setAutoRename(false);
+                    downloadInfo.setAutoResume(true);
+                    downloadInfo.setLabel(task_entity.getTask_name());
+                    downloadInfo.setFileSavePath(mApkPath.getAbsolutePath());
+                    downloadInfo.setIcon(task_entity.getIcon());
+                    downloadInfo.setState(DownloadState.STARTED);
+                    downloadInfo.setPkgName(task_entity.getPackage_names());
+                    MyDbManager.getInstance().saveOrUpdateUser(downloadInfo);//保存到数据库
+                }else{
+                    start_task_tv.setText("继续下载");
+                }
+            }
         }
     }
     /**
@@ -397,6 +428,23 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     @Override
     public void getStateSuccess(Object o) {
 
+        if(o == null){
+            return;
+        }
+        BaseMessage baseMessage = (BaseMessage) o;
+
+        List<TaskState> stateList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData() +""), TaskState.class);
+
+        if(stateList != null && stateList.size()>0){
+            this.stateList.clear();
+            this.stateList.addAll(stateList);
+
+            stateAdapter.notifyDataSetChanged();
+
+            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_TRYMAKEMANY_PAGE));
+        }
+
+
     }
 
     @Override
@@ -404,4 +452,11 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(cancelable != null){
+            cancelable.cancel();
+        }
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java

@@ -22,6 +22,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
 
@@ -78,6 +79,9 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 .personalCenterModule(new PersonalCenterModule(this))
                 .build()
                 .inject(this);
+        TitleBarUtils.getInstance()
+                .setTitle(this, "个人中心")
+                .setTitleFinish(this);
 
     }
 
@@ -102,12 +106,13 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 Jump2View.getInstance().goWithdrawal(activity, null);
                 break;
             case R.id.account_safe_layout:
-                Intent i=new  Intent(PersonalCenterAct.this,AccountAndSecurityAct.class);
-                startActivity(i);
+                Jump2View.getInstance().goAccountAndSecurit(activity, null);
                 break;
-            case R.id.account_task_layout:
+            case R.id.account_task_layout://任务记录
+                Jump2View.getInstance().goTaskList2View(activity, null);
                 break;
-            case R.id.account_detail_layout:
+            case R.id.account_detail_layout://提现明细
+                Jump2View.getInstance().goWithdrawallistView(activity, null);
                 break;
         }
     }

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -10,6 +10,7 @@ import android.support.v7.widget.RecyclerView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.di.components.DaggerTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -28,6 +29,8 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.List;
 
 import javax.inject.Inject;
@@ -36,6 +39,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
+ * 试着赚钱页面
  * Created by ljy on 2018/3/10.
  */
 
@@ -55,8 +59,9 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
 
-            tryMakeMoneyAdp.notifyDataSetChanged();
             tryMakeMoneyAdp.notifyItemInserted(tryMakeMoneyAdp.getItemCount());
+            recyclerview.smoothScrollToPosition(0);//滚动到底部
+            tryMakeMoneyAdp.notifyDataSetChanged();
         }
     };
 
@@ -113,7 +118,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
     @Override
     public void initData() {
-
+        tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addHaveTask(false);
         presenter.returnTask(null);
         presenter.releaseTask(null);
@@ -174,7 +179,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
             tryMakeMoneyAdp.addPresenter(presenter);
             tryMakeMoneyAdp.addHaveTask(true);
-            tryMakeMoneyAdp.notifyItemChanged(0);
+//            tryMakeMoneyAdp.notifyItemChanged(0);
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
@@ -212,7 +217,7 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
 
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyList),1);
-            tryMakeMoneyAdp.notifyItemChanged(1);
+//            tryMakeMoneyAdp.notifyItemChanged(1);
             mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
@@ -224,4 +229,13 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
 
         hideProgress();
     }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event){
+        switch (event.getEventTypes()){
+            case ONFRESH_TRYMAKEMANY_PAGE:
+                initData();
+                break;
+        }
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -53,6 +53,7 @@ public class TaskListItemAdp extends BaseAdapter {
             holder.date_tv = convertView.findViewById(R.id.date_tv);
             holder.price_tv = convertView.findViewById(R.id.price_tv);
             holder.icon_iv = convertView.findViewById(R.id.icon_iv);
+            convertView.setTag(holder);
         }else {
             holder = (ViewHolder) convertView.getTag();
         }

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskStateAdapter.java

@@ -0,0 +1,81 @@
+package com.sheep.gamegroup.view.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.model.entity.TaskState;
+import com.sheep.jiuyan.samllsheep.R;
+
+import java.util.List;
+
+/**
+ * Created by ljy on 2018/3/25.
+ */
+
+public class TaskStateAdapter extends BaseAdapter {
+    private Context context;
+    private List<TaskState> stateList;
+
+    public TaskStateAdapter(Context context, List<TaskState> stateList) {
+        this.context = context;
+        this.stateList = stateList;
+    }
+
+    @Override
+    public int getCount() {
+        return stateList.size();
+    }
+
+    @Override
+    public TaskState getItem(int position) {
+        return stateList.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @SuppressLint("ResourceAsColor")
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if(holder == null){
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.task_state_item, null);
+            holder.line_view = convertView.findViewById(R.id.line_view);
+            holder.name_tv = convertView.findViewById(R.id.name_tv);
+            holder.point_iv = convertView.findViewById(R.id.point_iv);
+            convertView.setTag(holder);
+        }else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        holder.name_tv.setText(getItem(position).getName()+"");
+        if(getItem(position).getStatus() == 2){
+
+            holder.point_iv.setImageResource(R.mipmap.tast_state_piont_ok_img);
+            holder.line_view.setBackgroundColor(R.color.yellow2_end);
+            holder.name_tv.setTextColor(R.color.yellow2_end);
+        }else {
+
+            holder.point_iv.setImageResource(R.mipmap.tast_state_piont_ok_img);
+            holder.line_view.setBackgroundColor(R.color.txt_black_9e9c9c);
+            holder.name_tv.setTextColor(R.color.black);
+        }
+
+        return convertView;
+    }
+
+    class ViewHolder{
+        ImageView point_iv;
+        View line_view;
+        TextView name_tv;
+    }
+}

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -151,6 +151,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         TaskEty taskEty = etyList.get(i).getTask();
                         taskEty.setRunTask(0);
                         taskEty.setRelease_task_id(etyList.get(i).getId());
+                        taskEty.setName(etyList.get(i).getName());
                         Jump2View.getInstance().goDialogActivityView(context, taskEty);
                     }
                 });
@@ -193,6 +194,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 TaskEty taskEty = acceptedEty.getRelease_task().getTask();
                 taskEty.setRunTask(1);
                 taskEty.setRelease_task_id(acceptedEty.getRelease_task().getId());
+                taskEty.setName(acceptedEty.getRelease_task().getName());
                 Jump2View.getInstance().goDialogActivityView(context, taskEty);
             }
         });

app/src/main/java/com/sheep/gamegroup/view/adapter/WithdrawalListAdp.java

@@ -53,6 +53,7 @@ public class WithdrawalListAdp extends BaseAdapter {
             holder.date_tv = convertView.findViewById(R.id.date_tv);
             holder.price_tv = convertView.findViewById(R.id.price_tv);
             holder.state_tv = convertView.findViewById(R.id.state_tv);
+            convertView.setTag(holder);
         }else {
             holder = (ViewHolder) convertView.getTag();
         }

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

@@ -0,0 +1,34 @@
+<?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="horizontal">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/point_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/tast_state_piont_ok_img"/>
+        <View
+            android:id="@+id/line_view"
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/yellow2_end"
+            android:layout_below="@+id/point_iv"
+            android:layout_centerHorizontal="true"/>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text=""
+        android:textSize="@dimen/text_size_12"
+        android:textColor="@color/yellow2_end"/>
+
+</LinearLayout>

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

@@ -29,10 +29,11 @@
             android:layout_height="wrap_content"
             android:text="取消任务"
             android:minWidth="@dimen/view_size_80"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="15dp"
             android:gravity="center"
             android:layout_marginBottom="13dp"
+            android:padding="@dimen/content_padding_3"
             android:background="@drawable/sp_bg_gradient_rectangle_blue"/>
     </LinearLayout>