首页修改任务列表

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

@@ -20,6 +20,7 @@ public class Url {
     public static String USER_WITHDRAW=Config.instance().mBaseUrl + "/v1/withDraw/withDraw";
     public static String WXTASK=Config.instance().mBaseUrl + "/v1/task_publish/getWxTask";
     public static String MONEYRECORD=Config.instance().mBaseUrl + "/v1/user/getMoneyRecord";
+    public static String GET_TASK_COUNT=Config.instance().mBaseUrl + "/v1/user/getTaskCount";
 
     public static String WXACCOUNT=Config.instance().mBaseUrl + "/v1/user/userChildWxList";
     public static String TASK_LIST=Config.instance().mBaseUrl + "/v1/user/getChildTaskList";

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

@@ -1,7 +1,16 @@
 package com.sheep.jiuyan.samllsheep.page;
 
+import android.view.View;
+import android.webkit.WebView;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 /**
  * Created by kemllor on 2018/1/16.
@@ -9,6 +18,10 @@ import com.sheep.jiuyan.samllsheep.base.BaseActivity;
  */
 
 public class GameDetailActivity extends BaseActivity {
+
+    private TextView mTvTitle;
+    private View mBack;
+
     @Override
     protected int getLayoutId() {
         return R.layout.game_detail_activity;
@@ -16,9 +29,38 @@ public class GameDetailActivity extends BaseActivity {
 
     @Override
     public void initView() {
+        findViews();
+    }
+
+    private RelativeLayout mDingwei1;
+    private ImageView mImgIcon;
+    private TextView mTxtBaseactivityTitle;
+    private TextView mTvCount;
+    private TextView mTvTime;
+    private TextView mTvBouns;
+    private TextView mTvText1;
+    private TextView mTvMoney;
+    private Button mBtnTaskItem;
+    private WebView mWebText;
+    private LinearLayout mLlInfos;
 
+    private void findViews() {
+        mDingwei1 = (RelativeLayout) findViewById(R.id.dingwei1);
+        mImgIcon = (ImageView) findViewById(R.id.img_icon);
+        mTxtBaseactivityTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mTvCount = (TextView) findViewById(R.id.tv_count);
+        mTvTime = (TextView) findViewById(R.id.tv_time);
+        mTvBouns = (TextView) findViewById(R.id.tv_bouns);
+        mTvText1 = (TextView) findViewById(R.id.tv_text1);
+        mTvMoney = (TextView) findViewById(R.id.tv_money);
+        mBtnTaskItem = (Button) findViewById(R.id.btn_task_item);
+        mWebText = (WebView) findViewById(R.id.web_text);
+        mLlInfos = (LinearLayout) findViewById(R.id.ll_infos);
+        TitleBarUtils.getInstance().setTitle(this, "任务详情")
+                .setTitleFinish(this);
     }
 
+
     @Override
     public void initListener() {
 

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

@@ -108,7 +108,7 @@ public class LoginActivity extends BaseActivity {
         req.state = "small_sheep_auther";
         SheepApp.mWxapi.sendReq(req);*/
 
-        SpUtils.login(this, "5e640a54730f5bec1e2fa6dc53200a20");
+        SpUtils.login(this, "529e87ad4e1b49ebfffbd673fff48e01");
     }
 
 

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

@@ -198,6 +198,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     public void initView() {
+        ((TextView) findViewById(R.id.txt_baseactivity_title)).setText("我的奖金");
         mRappTabLayout = (RappTabLayout) findViewById(R.id.tab_main_activity);
         mViewPager = (ViewPager) findViewById(R.id.viewpager_main_activity);
         mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_main_activity);
@@ -219,12 +220,12 @@ public class MainActivity extends BaseActivity {
 
         TitleBarUtils.getInstance()
                 .setTitleFinish(this);
-//                .setRightImgBotton(this, R.drawable.set, new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View view) {
-//                        G.showToast("点设置");
-//                    }
-//                });
+        //                .setRightImgBotton(this, R.drawable.set, new View.OnClickListener() {
+        //                    @Override
+        //                    public void onClick(View view) {
+        //                        G.showToast("点设置");
+        //                    }
+        //                });
     }
 
     @Override

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

@@ -5,4 +5,28 @@ package com.sheep.jiuyan.samllsheep.page.entry;
  */
 
 public class TaskCount {
+
+    /**
+     * TaskCount : 0
+     * TodayCount : 0
+     */
+
+    private int TaskCount;
+    private int TodayCount;
+
+    public int getTaskCount() {
+        return TaskCount;
+    }
+
+    public void setTaskCount(int TaskCount) {
+        this.TaskCount = TaskCount;
+    }
+
+    public int getTodayCount() {
+        return TodayCount;
+    }
+
+    public void setTodayCount(int TodayCount) {
+        this.TodayCount = TodayCount;
+    }
 }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageOffline.java

@@ -82,7 +82,7 @@ public class FgtMainPageOffline extends BaseFragment {
             @Override
             public void success(List<WXAccount> wxAccounts) {
                 if (!isLoadMore) {
-//                    mAdpTaskList.clear();//暂时没有分页功能，就这样吧。
+                    //                    mAdpTaskList.clear();//暂时没有分页功能，就这样吧。
                 }
                 mAdpTaskList.clear();
                 mAdpTaskList.add(new WXAccount());
@@ -104,6 +104,11 @@ public class FgtMainPageOffline extends BaseFragment {
                 mRecyleViewLoadMoreUtils.setmIsLoading(true);
                 reFreshView();
             }
+
+            @Override
+            public void otherCode(int code, String string) {
+
+            }
         });
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

@@ -7,9 +7,13 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
@@ -18,7 +22,9 @@ import com.sheep.jiuyan.samllsheep.net.Url;
 import com.sheep.jiuyan.samllsheep.page.DownloadActivity;
 import com.sheep.jiuyan.samllsheep.page.MoneyHistroyActivity;
 import com.sheep.jiuyan.samllsheep.page.TaskRecordActivity;
+import com.sheep.jiuyan.samllsheep.page.WebActivity;
 import com.sheep.jiuyan.samllsheep.page.adapter.AdpMainActivity;
+import com.sheep.jiuyan.samllsheep.page.entry.TaskCount;
 import com.sheep.jiuyan.samllsheep.page.entry.TaskPublish;
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.page.entry.WXTask;
@@ -51,6 +57,18 @@ public class FgtMainPageTask extends BaseFragment {
     private RecyclerView mRecyclerView;
     private RecyleViewLoadMoreUtils mRecyleViewLoadMoreUtils;
     private int mIntLastPage = 0;
+    private View mTlDoing;
+    private ImageView mImgIcon;
+    private TextView mTvTitle;
+    private TextView mTvCount;
+    private TextView mTvTime;
+    private TextView mTvBouns;
+    private TextView mTaskSucc;
+    private TextView mTaskHistory;
+    private View mImgComp;
+    private TextView mTvMoney;
+    private TextView mTvGuide;
+    private Button mBtnTask;
 
 
     @Override
@@ -60,6 +78,7 @@ public class FgtMainPageTask extends BaseFragment {
 
     @Override
     public void onViewCreated() {
+        findViews();
         mAdapter = new AdpMainActivity(getActivity());
         mAdapter.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -68,6 +87,7 @@ public class FgtMainPageTask extends BaseFragment {
                 checkUserTask();
             }
         });
+        mTlDoing = findViewById(R.id.ll_doing);
         mRecyclerView = findViewById(R.id.recy_fgt_main_page_task, RecyclerView.class);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mRecyclerView.setAdapter(mAdapter);
@@ -88,7 +108,7 @@ public class FgtMainPageTask extends BaseFragment {
                         startActivity(intent);
                     }
                 });
-        View.OnClickListener onClickListener=new View.OnClickListener() {
+        View.OnClickListener onClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Intent intent = new Intent(getActivity(), TaskRecordActivity.class);
@@ -99,6 +119,7 @@ public class FgtMainPageTask extends BaseFragment {
                 .setOnClickListener(onClickListener);
         findViewById(R.id.view_history_record)
                 .setOnClickListener(onClickListener);
+
     }
 
 
@@ -169,22 +190,36 @@ public class FgtMainPageTask extends BaseFragment {
         NetManager.get(Url.WXTASK, map, getActivity(), new SheepCallback<WXTask>(getActivity()) {
             @Override
             public void success(WXTask o) {
-//                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());
+                //                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) {
-//                mLlNewTask.setVisibility(View.GONE);
+                //                mLlNewTask.setVisibility(View.GONE);
             }
         });
     }
 
+    private void findViews() {
+        mImgIcon = (ImageView) findViewById(R.id.img_icon);
+        mTvTitle = (TextView) findViewById(R.id.txt_baseactivity_title);
+        mTvCount = (TextView) findViewById(R.id.tv_count);
+        mTvTime = (TextView) findViewById(R.id.tv_time);
+        mTvBouns = (TextView) findViewById(R.id.tv_bouns);
+        mTvMoney = (TextView) findViewById(R.id.tv_money);
+        mTvGuide = (TextView) findViewById(R.id.tv_guide);
+        mBtnTask = (Button) findViewById(R.id.btn_task_item);
+        mTaskSucc = (TextView) findViewById(R.id.txt_fgt_main_page_task_succ);
+        mTaskHistory = (TextView) findViewById(R.id.txt_fgt_main_page_task_history);
+        mImgComp = findViewById(R.id.img_task_item_iscomplete);
+    }
+
 
     public void initData(final boolean isLoadMore) {
         //TODO 这里不知道怎么设计分页，自己添加吧。小刁写
@@ -195,9 +230,6 @@ public class FgtMainPageTask extends BaseFragment {
         NetManager.get(Url.PUBLISH_TASKS, map, getActivity(), new SheepCallback<List<TaskPublish>>(getActivity()) {
             @Override
             public void success(List<TaskPublish> tasks) {
-                if (!isLoadMore) {
-//                    mAdapter.clear();//暂时没有分页功能
-                }
                 mAdapter.clear();
                 if (tasks != null && tasks.size() > 0) {
                     mAdapter.addAll(tasks);
@@ -207,13 +239,6 @@ public class FgtMainPageTask extends BaseFragment {
                 mRecyleViewLoadMoreUtils.setmIsLoading(tasks.size() != 10);
             }
 
-            //TODO 你的框架不知道哪个是失败必须执行的，要添加拒绝加载更多等
-            @Override
-            public void onFailure(Call call, IOException e) {
-                super.onFailure(call, e);
-                mRecyleViewLoadMoreUtils.setmIsLoading(true);
-            }
-
             @Override
             public void failure(IOException e) {
                 super.failure(e);
@@ -240,42 +265,55 @@ public class FgtMainPageTask extends BaseFragment {
             @Override
             public void success(final TaskPublish taskPublish) {
                 if (taskPublish != null) {
-//                    mTlDoing.setVisibility(View.VISIBLE);
-//                    if (!getActivity().isDestroyed())
-//                        Glide.with(getActivity())
-//                                .load(taskPublish.getTask().getIcon())
-//                                .placeholder(R.drawable.icon)
-//                                .dontAnimate()
-//                                .into(mImgIcon);
-//                    mTvTitle.setText(taskPublish.getTask().getTitle());
-//                    mTvTime.setText("截止日期：" + taskPublish.getOverTime());
-//                    mTvCount.setText(taskPublish.getSurplusCount() + "/" + taskPublish.getTotalCouont());
-//                    mTvMoney.setText(taskPublish.getTask().getPrice());
-//                    if (!TextUtils.isEmpty(taskPublish.getTask().getPkg())) {
-//                        mTlDoing.setOnClickListener(new View.OnClickListener() {
-//                            @Override
-//                            public void onClick(View v) {
-//                                PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
-//                            }
-//                        });
-//                    }
-//                    mTvBouns.setText(taskPublish.getTask().getBonus());
-//                    mTvGuide.setOnClickListener(new View.OnClickListener() {
-//                        @Override
-//                        public void onClick(View v) {
-//                            Intent intent = new Intent(getActivity(), WebActivity.class);
-//                            intent.putExtra("url", taskPublish.getTask().getGuide());
-//                            startActivity(intent);
-//                        }
-//                    });
-//                } else {
-//                    mTlDoing.setVisibility(View.GONE);
+                    mImgComp.setVisibility(View.VISIBLE);
+                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskPublish.getTask().getPkg())) {
+                        mBtnTask.setText("开始游戏");
+                    } else {
+                        mBtnTask.setText("下载游戏");
+                    }
+                    mTlDoing.setVisibility(View.VISIBLE);
+                    if (!getActivity().isDestroyed())
+                        Glide.with(getActivity())
+                                .load(taskPublish.getTask().getIcon())
+                                .placeholder(R.drawable.icon)
+                                .dontAnimate()
+                                .into(mImgIcon);
+                    mTvTitle.setText(taskPublish.getTask().getTitle());
+                    mTvTime.setText("截止日期：" + taskPublish.getOverTime());
+                    mTvCount.setText(taskPublish.getSurplusCount() + "/" + taskPublish.getTotalCouont());
+                    mTvMoney.setText(taskPublish.getTask().getPrice());
+                    if (!TextUtils.isEmpty(taskPublish.getTask().getPkg())) {
+                        mTlDoing.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                PackageUtil.startApp(SheepApp.mContext, taskPublish.getTask().getPkg());
+                            }
+                        });
+                    }
+                    mTvBouns.setText(taskPublish.getTask().getBonus());
+                    mTvGuide.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent intent = new Intent(getActivity(), WebActivity.class);
+                            intent.putExtra("url", taskPublish.getTask().getGuide());
+                            startActivity(intent);
+                        }
+                    });
+                } else {
+                    mTlDoing.setVisibility(View.GONE);
                 }
             }
 
             @Override
             public void otherCode(int code, String string) {
-//                mTlDoing.setVisibility(View.GONE);
+                mTlDoing.setVisibility(View.GONE);
+            }
+        });
+        NetManager.get(Url.GET_TASK_COUNT, map, getActivity(), new SheepCallback<TaskCount>(getActivity()) {
+            @Override
+            public void success(TaskCount count) {
+                mTaskHistory.setText(count.getTaskCount() + "");
+                mTaskSucc.setText(count.getTodayCount() + "");
             }
         });
     }

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
+              android:layout_height="match_parent"
+              android:background="@color/white"
+              android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_succ"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
 
         <TextView
@@ -35,7 +35,7 @@
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_income"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_remain"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
             android:id="@+id/txt_fgt_main_page_task_remain"
@@ -48,7 +48,7 @@
             android:visibility="gone"
             app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_succ"
             app:layout_constraintRight_toLeftOf="@+id/txt_fgt_main_page_task_history"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
             android:id="@+id/txt_fgt_main_page_task_history"
@@ -60,7 +60,7 @@
             android:textSize="@dimen/text_size_3"
             app:layout_constraintLeft_toRightOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
 
         <TextView
@@ -72,7 +72,7 @@
             android:textSize="@dimen/text_size_2"
             app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_income"
             app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_income"
-            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -83,7 +83,7 @@
             android:textSize="@dimen/text_size_2"
             app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_succ"
             app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_succ"
-            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -95,7 +95,7 @@
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_remain"
             app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_remain"
-            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -106,55 +106,56 @@
             android:textSize="@dimen/text_size_2"
             app:layout_constraintLeft_toLeftOf="@+id/txt_fgt_main_page_task_history"
             app:layout_constraintRight_toRightOf="@+id/txt_fgt_main_page_task_history"
-            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income" />
+            app:layout_constraintTop_toBottomOf="@+id/txt_fgt_main_page_task_income"/>
 
         <LinearLayout
-            android:layout_width="8dp"
-            android:layout_height="48dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:layout_editor_absoluteX="8dp">
+           >
 
             <View
                 android:id="@+id/view_income_today"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1" />
+                android:layout_weight="1"/>
 
             <View
                 android:layout_width="1px"
                 android:layout_height="25dp"
-                android:background="@color/sheep_red" />
+                android:visibility="gone"
+                android:background="@color/sheep_red"/>
 
             <View
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <View
                 android:layout_width="1px"
                 android:layout_height="25dp"
-                android:background="@color/sheep_red" />
+                android:background="@color/sheep_red"/>
 
             <View
                 android:id="@+id/view_complete_today"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1" />
+                android:layout_weight="1"/>
 
             <View
                 android:layout_width="1px"
                 android:layout_height="25dp"
-                android:background="@color/sheep_red" />
+                android:background="@color/sheep_red"/>
 
             <View
                 android:id="@+id/view_history_record"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1" />
+                android:layout_weight="1"/>
 
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>
@@ -162,7 +163,18 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/content_padding"
-        android:background="@color/background_light_gray" />
+        android:background="@color/background_light_gray"/>
+
+    <LinearLayout
+        android:id="@+id/ll_doing"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+
+        <include
+            layout="@layout/task_item"/>
+    </LinearLayout>
+
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recy_fgt_main_page_task"

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

@@ -7,137 +7,183 @@
     <include
         layout="@layout/title"/>
 
-    <RelativeLayout
-        android:id="@+id/dingwei1"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_margin="@dimen/content_padding"
-        android:background="@color/backgroud">
-
-        <ImageView
-            android:id="@+id/img_icon"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/content_padding"
-            android:src="@drawable/icon"/>
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/content_padding_small"
-            android:layout_marginLeft="@dimen/content_padding_small"
-            android:layout_marginTop="@dimen/content_padding_small"
-            android:layout_toRightOf="@id/img_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/txt_baseactivity_title"
+            <RelativeLayout
+                android:id="@+id/dingwei1"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_margin="@dimen/content_padding"
+                android:background="@color/backgroud">
+
+                <ImageView
+                    android:id="@+id/img_icon"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="@dimen/content_padding"
+                    android:src="@drawable/icon"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_small"
+                    android:layout_marginTop="@dimen/content_padding_small"
+                    android:layout_toRightOf="@id/img_icon"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/txt_baseactivity_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:text="title"
+                        android:textColor="@color/black_text_deep"
+                        android:textSize="@dimen/text_size_4"/>
+
+
+                    <TextView
+                        android:id="@+id/tv_count"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/content_padding_small"
+                        android:gravity="center_vertical"
+                        android:text="250/250"
+                        android:textColor="@color/black_text_gray"
+                        android:textSize="@dimen/text_size_2"/>
+
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/content_padding_small"
+                        android:gravity="center_vertical"
+                        android:text="截止时间：2018-1-1"
+                        android:textColor="@color/black_text_gray"
+                        android:textSize="@dimen/text_size_2"/>
+                </LinearLayout>
+
+
+                <TextView
+                    android:id="@+id/tv_bouns"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="@dimen/content_padding"
+                    android:layout_marginRight="10dp"
+                    android:text="5.00"
+                    android:textColor="@color/orange_text_light"
+                    android:textSize="@dimen/text_size_5"
+                    android:textStyle="bold"
+                    />
+
+                <TextView
+                    android:id="@+id/tv_text1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@+id/tv_money"
+                    android:layout_centerVertical="true"
+                    android:layout_marginBottom="3dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="3dp"
+                    android:layout_toLeftOf="@id/tv_bouns"
+                    android:gravity="bottom"
+                    android:text="+"
+                    android:textColor="@color/orange_text_light"
+                    android:textSize="@dimen/text_size_4"/>
+
+                <TextView
+                    android:id="@+id/tv_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginBottom="@dimen/content_padding"
+                    android:layout_toStartOf="@+id/tv_text1"
+                    android:text="5.00"
+                    android:textColor="@color/orange_text_light"
+                    android:textSize="@dimen/text_size_5"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_above="@id/tv_money"
+                    android:layout_alignRight="@id/tv_money"
+                    android:text="任务\n奖励"
+                    android:textColor="@color/black_text_gray"
+                    android:textSize="@dimen/text_size_2"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_above="@id/tv_money"
+                    android:layout_alignRight="@id/tv_bouns"
+                    android:text="邀请\n奖励"
+                    android:textColor="@color/black_text_gray"
+                    android:textSize="@dimen/text_size_2"/>
+
+            </RelativeLayout>
+
+            <Button
+                android:id="@+id/btn_task_item"
+                style="@style/style_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="title"
-                android:textColor="@color/black_text_deep"
-                android:textSize="@dimen/text_size_4"/>
+                android:layout_gravity="right"
+                android:layout_marginBottom="20dp"
+                android:layout_marginRight="@dimen/content_padding"
+                android:text="下载游戏"/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/content_padding"
+                android:layout_below="@id/btn_task_item"
+                android:background="@color/background_light_gray"/>
 
             <TextView
-                android:id="@+id/tv_count"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_small"
-                android:gravity="center_vertical"
-                android:text="250/250"
-                android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2"/>
+                android:layout_margin="@dimen/content_padding"
+                android:text="任务说明"
+                android:textColor="@color/black_text_deep"
+                android:textSize="@dimen/text_size_4"/>
+
+            <WebView
+                android:id="@+id/web_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </WebView>
 
             <TextView
-                android:id="@+id/tv_time"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_small"
-                android:gravity="center_vertical"
-                android:text="截止时间：2018-1-1"
-                android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2"/>
-        </LinearLayout>
+                android:layout_margin="@dimen/content_padding"
+                android:text="任务进度"
+                android:textColor="@color/black_text_deep"
+                android:textSize="@dimen/text_size_4"/>
 
+            <LinearLayout
+                android:id="@+id/ll_infos"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_bouns"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:text="5.00"
-            android:textColor="@color/orange_text_light"
-            android:textSize="@dimen/text_size_5"
-            android:textStyle="bold"
-            />
-
-        <TextView
-            android:id="@+id/tv_text1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/tv_money"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="3dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="3dp"
-            android:layout_toLeftOf="@id/tv_bouns"
-            android:gravity="bottom"
-            android:text="+"
-            android:textColor="@color/orange_text_light"
-            android:textSize="@dimen/text_size_4"/>
-
-        <TextView
-            android:id="@+id/tv_money"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/tv_text1"
-            android:text="5.00"
-            android:textColor="@color/orange_text_light"
-            android:textSize="@dimen/text_size_5"
-            android:textStyle="bold"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/tv_money"
-            android:layout_alignRight="@id/tv_money"
-            android:text="任务\n奖励"
-            android:textColor="@color/black_text_gray"
-            android:textSize="@dimen/text_size_2"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/tv_money"
-            android:layout_alignRight="@id/tv_bouns"
-            android:text="邀请\n奖励"
-            android:textColor="@color/black_text_gray"
-            android:textSize="@dimen/text_size_2"/>
-
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/btn_task_item"
-        style="@style/style_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:layout_marginBottom="20dp"
-        android:layout_marginRight="@dimen/content_padding"
-        android:text="下载游戏"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding"
-        android:layout_below="@id/btn_task_item"
-        android:background="@color/background_light_gray"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
 
 </LinearLayout>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/dingwei1"
@@ -19,7 +19,7 @@
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/content_padding"
-            android:src="@drawable/icon"/>
+            android:src="@drawable/icon" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -37,7 +37,7 @@
                 android:gravity="center_vertical"
                 android:text="title"
                 android:textColor="@color/black_text_deep"
-                android:textSize="@dimen/text_size_4"/>
+                android:textSize="@dimen/text_size_4" />
 
 
             <TextView
@@ -48,7 +48,7 @@
                 android:gravity="center_vertical"
                 android:text="250/250"
                 android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2"/>
+                android:textSize="@dimen/text_size_2" />
 
             <TextView
                 android:id="@+id/tv_time"
@@ -58,7 +58,7 @@
                 android:gravity="center_vertical"
                 android:text="截止时间：2018-1-1"
                 android:textColor="@color/black_text_gray"
-                android:textSize="@dimen/text_size_2"/>
+                android:textSize="@dimen/text_size_2" />
         </LinearLayout>
 
 
@@ -73,7 +73,7 @@
             android:text="5.00"
             android:textColor="@color/orange_text_light"
             android:textSize="@dimen/text_size_5"
-            android:textStyle="bold"/>
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/tv_text1"
@@ -88,7 +88,7 @@
             android:gravity="bottom"
             android:text="+"
             android:textColor="@color/orange_text_light"
-            android:textSize="@dimen/text_size_4"/>
+            android:textSize="@dimen/text_size_4" />
 
         <TextView
             android:id="@+id/tv_money"
@@ -110,7 +110,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/content_padding_small"
         android:layout_marginTop="@dimen/content_padding_small"
-        android:src="@drawable/received"/>
+        android:src="@drawable/received"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/tv_guide"

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

@@ -0,0 +1,40 @@
+<?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:gravity="center_vertical"
+              android:orientation="horizontal">
+
+
+    <ImageView
+        android:id="@+id/img_tab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/content_padding"
+        android:src="@drawable/garden_green"/>
+
+    <TextView
+        android:id="@+id/tv_step"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="领取任务"
+        android:textColor="@color/green"
+        android:textSize="@dimen/text_size_3"/>
+
+    <include
+        layout="@layout/line_h_1px"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/content_padding"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/content_padding"
+        android:text="已完成"
+        android:textColor="@color/green"
+        android:textSize="@dimen/text_size_3"/>
+
+</LinearLayout>

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

@@ -12,7 +12,7 @@
     <color name="black_dark">#d7363636</color>
     <color name="black_light">#999999</color>
     <color name="backgroud">#f4f4f9</color>
-    <color name="green">#358400</color>
+    <color name="green">#4cd117</color>
     <color name="sheep_red">#f00</color>
     <color name="blue">@color/theme_bule</color>
     <color name="colorControlHighlight">@color/theme_bule</color>