Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

# Conflicts:
#	app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -468,6 +468,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {
                     TestUtil.test(getActivity());
+//                    Jump2View.getInstance().testIntent(activity);
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -550,7 +550,7 @@ public interface ApiService {
      * 再次充值 或 放弃充值
      * @return
      */
-    @GET("app/game_consumption/order/{id}")
+    @PUT("app/game_consumption/order/{id}")
     Observable<BaseMessage> gameTaskPayOrGiveUp(@Path("id") int id, @Body JSONObject jsonObject);
 
     /**
@@ -559,6 +559,12 @@ public interface ApiService {
      */
     @GET("app/version/new_version")
     Observable<BaseMessage> getNewVersion(@Query("type") int type);
+    /**
+     * 获取接收任务详情
+     * @return
+     */
+    @GET("app/accepted_task/detail/{id}")
+    Observable<BaseMessage> getAcceptedTaskDetail(@Path("id") int id);
 
     /**
      * 用户统计分析--id事件

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

@@ -37,6 +37,15 @@ public class OrienteeringDetail implements Serializable{
     private String download_url;
 
     private int task_id;
+    private int release_task_id;
+
+    public int getRelease_task_id() {
+        return release_task_id;
+    }
+
+    public void setRelease_task_id(int release_task_id) {
+        this.release_task_id = release_task_id;
+    }
 
     public void setName(String name){
         this.name = name;

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

@@ -10,6 +10,15 @@ import java.io.Serializable;
 public class TaskDescEntity implements Serializable {
     private String step;
     private String desc;
+    private String img;
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
 
     public String getDesc() {
         return desc;

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

@@ -21,7 +21,7 @@ public class TaskReleaseEty implements Serializable{
     private String online_type;// 0,
     private String release_num;// 0,
     private String remarks;//private String string",
-    private int status;// 0,
+    private int status;// 1手动上线　2自动上线 　3手动下线　4自动下线 5等待上线',
     private String submit_num;// 0,
     private String task_id;// 0,
     private String unaudited_num;// 0,

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

@@ -609,7 +609,41 @@ public class CommonUtil {
     }
     public void bindDataTaskDetailSonStep(TaskDescEntity taskDescEntity, TextView textView, int i){
 
-        textView.setText(Html.fromHtml("<font color='#FF53BBF2'>" + "第" + taskDescEntity.getStep() + "步：" +"</font>") + taskDescEntity.getDesc() + " ");
+        String state = "";
+        switch (i+1){
+            case 1:
+            default:
+                state = "一";
+                break;
+            case 2:
+                state = "二";
+                break;
+            case 3:
+                state = "三";
+                break;
+            case 4:
+                state = "四";
+                break;
+            case 5:
+                state = "五";
+                break;
+            case 6:
+                state = "六";
+                break;
+            case 7:
+                state = "七";
+                break;
+            case 8:
+                state = "八";
+                break;
+            case 9:
+                state = "九";
+                break;
+            case 10:
+                state = "十";
+                break;
+        }
+        textView.setText(Html.fromHtml("<font color='#2EC2F7'>" + "第" + state + "步：" +"</font>" + taskDescEntity.getDesc() + " "));
     }
 
     /**

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

@@ -499,7 +499,7 @@ public class Jump2View {
             intent.putExtra("task_id", (Integer) o);
         }
         if(b instanceof Integer){
-            intent.putExtra("game_id", (Integer) o);
+            intent.putExtra("game_id", (Integer) b);
         }else
         if(b instanceof Boolean){
             intent.putExtra("btn_show", (Boolean) b);
@@ -1206,4 +1206,7 @@ public class Jump2View {
         Intent intent = new Intent(activity, GameTaskOrderListAct.class);
         activity.startActivity(intent);
     }
+    public void testIntent(Context activity){
+        activity.startActivity(new Intent(activity.getPackageName()));
+    }
 }

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

@@ -11,6 +11,7 @@ import java.util.Locale;
 public class TimeUtil {
 
     public static String FORMAT = "yyyy/MM/dd HH:mm";
+    public static String FORMAT_DD = "yyyy/MM/dd";
 
     public static long getCurrentSeconds(){
         long ls = System.currentTimeMillis()/1000;

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

@@ -20,6 +20,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
@@ -43,8 +44,10 @@ import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.Ext;
+import com.sheep.gamegroup.model.entity.ScreenshotsEntity;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
+import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
@@ -61,7 +64,6 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -183,11 +185,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     //通过task_id找
     private TaskReleaseEty taskReleaseEty;
     private TaskAcceptedEty taskAcceptedEty;
+    //接口获取
+    private TaskAcceptedEty gettaskAcceptedEty;
 
     private int taskId = -1;
     private int game_id = -1;
 
-    private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5
+    private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
 
     private boolean isFromTaskList = false;//是否是从任务记录界面过来
 
@@ -237,7 +241,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     public void initData() {
         if (taskId != -1 && !isGetTaskDesc) {
             isGetTaskDesc = true;
-            presenter.taskDesc(taskId);
+            accepteTaskDetail(taskId);
             return;
         }
         if (taskAcceptedEty == null) {
@@ -278,7 +282,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         webText.loadDataWithBaseURL(null, sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
         nameTv.setText(taskReleaseEty.getName() + "");
         priceTv.setText("+" + taskReleaseEty.getBonus() + "元");
-        dateTv.setText("截至日期："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+        if(!taskReleaseEty.getDeadline().equals("永久")){
+            dateTv.setText("截至日期："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline())) + "");
+        }else {
+            dateTv.setText("截至日期："+taskReleaseEty.getDeadline());
+        }
         num_tv.setText("剩" + taskReleaseEty.getLast_num() + "份");
 
 
@@ -300,6 +308,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         if (taskAcceptedEty != null) {
+            detailTaskTv.setVisibility(View.VISIBLE);
+            detail_item_layout_2.setVisibility(View.VISIBLE);
+            detail_item_layout_3.setVisibility(View.VISIBLE);
             checkAcceptedTask();
             return;
         }
@@ -322,16 +333,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         public void call(Object o) {
                             if(o instanceof Integer){
                                 type = (int) o;
-                                if(type == 1002 ||type == 1003){
-                                    btnTaskItem.setVisibility(View.GONE);
-                                    btnUpImag.setVisibility(View.VISIBLE);
-                                    if(game_id > 0){
-                                        btnTaskItem.setVisibility(View.VISIBLE);
-                                        btnUpImag.setVisibility(View.GONE);
-                                        btnTaskItem.setText("去充值");
-                                    }
-                                    return;
-                                }
                             } else if( o instanceof String){
                                 btnTaskItem.setText((String) o);
                             } else if( o instanceof Boolean){
@@ -364,9 +365,18 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
         if(taskEty.getInspect_type() == 3 ||taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){//应用自动审核任务
             btnUpImag.setText("领取奖励");
+//            type =100;
         }
         if (type == DownloadTaskService.STATUS_INSTALLED) {
             btnUpImag.setVisibility(View.VISIBLE);
+            if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
+                btnTaskItem.setVisibility(View.GONE);
+                //奖励领取是否
+                if(gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3){
+                    btnUpImag.setText("充值游戏");
+                    type = 101;
+                }
+            }
         } else {
             btnUpImag.setVisibility(View.GONE);
         }
@@ -377,6 +387,14 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         if(btn_show)
             bottom_btn_layout.setVisibility(View.GONE);
         setSonVuewShow();
+
+
+
+        //任务已经下线
+        if(taskReleaseEty.getStatus() == 3 || taskReleaseEty.getStatus() == 4){
+            bottom_btn_layout.setVisibility(View.GONE);
+        }
+
     }
 
     private void checkAcceptedTask() {
@@ -447,10 +465,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             } else {//应用
                 buttonStr = CommonUtil.OPEN_APPLY;
             }
-//            if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
-//                action1.call(taskEty.getTask_type());
-//                return;
-//            }
         } else {
             action1.call(DownloadTaskService.STATUS_INIT);
             if (taskEty.getDownload_link() == null || !taskEty.getDownload_link().startsWith("http")) {
@@ -515,10 +529,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case R.id.ll_infos:
                     break;
                 case R.id.btn_task_item:
-                    if((game_id > 0 && (btnTaskItem.getText() + "").equals("去充值"))){
-                        ViewUtil.showGamePayAccount(activity, game_id);
-                        return;
-                    }
                     switch (type) {
                         case -1:
                             if (taskReleaseEty.getAccepted_task_id() > 0) {
@@ -547,8 +557,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 task.cancel(true);
                                 task.removeRecord();
                             } else {
-    //                            task.setFilePath(filePath);
-    //                            task.start();
+                                //                            task.setFilePath(filePath);
+                                //                            task.start();
                                 mDownloadTaskService.start(downLoadInfo);
                             }
                             new Thread(new Runnable() {
@@ -579,6 +589,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                     break;
                 case R.id.btn_up_imag:
+                    if(type == 101){
+                        if(game_id > 0){
+                            ViewUtil.showGamePayAccount((Activity) activity, game_id);
+                            return;
+                        }
+                    }else
                     if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
                         accepteReceiveAward();
                     }else
@@ -595,8 +611,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     break;
                 case R.id.detail_share_friend_tv:
                     try{
+                        StringBuffer stringBuffer = new StringBuffer();
+                        stringBuffer.append(SpUtils.getTaskDetailsUrl(activity)+"?");
+                        stringBuffer.append("authorization="+ SpUtils.getOpenId(activity));
+                        stringBuffer.append("&task_id="+taskId);
+                        stringBuffer.append("&invitation_code="+MyDbManager.getInstance().dbFindValue());
                         CommonUtil.getInstance()
-                                .popShare(activity, TestUtil.getShareUrl(taskId) +"", "all");
+                                .popShare(activity, stringBuffer.toString() +"", "all");
                     }catch (Exception e){
                         e.printStackTrace();
                     }
@@ -742,6 +763,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     @Override
     public void taskDescSuccess(BaseMessage baseMessage) {
+        hideProgress();
         empty_view.setVisibility(View.GONE);
         taskReleaseEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
         initWigget();
@@ -750,6 +772,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     @Override
     public void taskDescFaile(BaseMessage baseMessage) {
+        hideProgress();
         G.showToast(baseMessage.getMsg() + "");
         isGetTaskDesc = false;
         empty_view.setVisibility(View.VISIBLE);
@@ -942,6 +965,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         if (task.getKey().equals(taskEty.getDownload_link())) {
             //在这里处理任务完成的状态
             btnTaskItem.setText(CommonUtil.START_INSTALL);
+            onResume();
         }
     }
 
@@ -952,7 +976,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         super.onResume();
         if (taskId != -1 && !isGetTaskDesc && !isFresh) {
             isGetTaskDesc = true;
-            presenter.taskDesc(taskId);
+            accepteTaskDetail(taskId);
         }
     }
 
@@ -961,6 +985,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      */
     TaskdetailSonListviewAdp sonListviewAdp;
     private void setSonVuewShow(){
+        boolean isSuccession = false;
         item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
@@ -981,7 +1006,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     detail_task_recyclerview.setAdapter(sonListviewAdp);
                 }
 
-                return;
+                isSuccession = true;
+                break;
             case 1002:
             case 1003://游戏任务
                 ems_game_layout.setVisibility(View.VISIBLE);
@@ -998,11 +1024,27 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //fuck
-        if(taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size()>0){
+        if(!isSuccession && taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size()>0){
             List<TaskChild> descEntityArrayList = new ArrayList<>();
             TaskChild taskChild = new TaskChild();
             taskChild.setDescEntityList(taskEty.getDescEntityList());
-            taskChild.setScreenshotsList(taskEty.getScreenshotsList());
+            List<ScreenshotsEntity> listS = new ArrayList<>();
+            if(taskEty.getDescEntityList() != null && taskEty.getDescEntityList().size() > 0){
+                listS.clear();
+                for(TaskDescEntity descEntity: taskEty.getDescEntityList()){
+                    if(descEntity.getImg() != null){
+                        ScreenshotsEntity screenshotsEntity = new ScreenshotsEntity();
+                        screenshotsEntity.setImg(descEntity.getImg());
+                        listS.add(screenshotsEntity);
+                    }
+                }
+            }
+            if(listS != null && listS.size() > 0){
+                taskChild.setScreenshotsList(listS);
+            }else {
+                taskChild.setScreenshotsList(taskEty.getScreenshotsList());
+            }
+
             descEntityArrayList.add(taskChild);
             detail_task_recyclerview.setVisibility(View.VISIBLE);
             detail_item_layout_2.setVisibility(View.GONE);
@@ -1013,7 +1055,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //自动审核
-        if(taskEty.getInspect_type() == 3){
+        //todo 暂时不要
+        if(false && taskEty.getInspect_type() == 3){
             taskdetail_user_use_layout.setVisibility(View.VISIBLE);
 
             start_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
@@ -1051,7 +1094,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //截至时间
-        if(taskReleaseEty != null && taskReleaseEty.getDemo_time() > 0){
+        if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getDemo_time() > 0){
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
@@ -1064,6 +1107,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             end_of_time_tv.setVisibility(View.GONE);
         }
 
+
     }
 
     /**
@@ -1089,8 +1133,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         hideProgress();
 //                        G.showToast(taskReleaseEty.getBonus() + "元");
                         ViewUtil.showMsgDialog(activity,
-                                "提示",
                                 "恭喜你获得"+taskReleaseEty.getBonus() + "元奖励",
+                                "提示",
                                 true);
 //                        finish();
 //                        initData();
@@ -1100,6 +1144,36 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 });
     }
 
+    /**
+     * 接受任务详情
+     */
+    private void accepteTaskDetail(int id){
+        showProgress();
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getAcceptedTaskDetail(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        presenter.taskDesc(taskId);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        presenter.taskDesc(taskId);
+                        try{
+                            gettaskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                });
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -136,7 +136,11 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
         webText.loadDataWithBaseURL(null, sHead + taskEty.getDesc() + "</body></html>", "text/html", "utf-8", null);
         nameTv.setText(taskReleaseEty.getName());
         priceTv.setText(String.format(Locale.CHINA, "+%s元", taskReleaseEty.getBonus()));
-        dateTv.setText(TimeUtil.TimeStamp2Date(Long.valueOf(taskReleaseEty.getDeadline()), "yyyy/MM/dd HH:mm"));
+        if(!taskReleaseEty.getDeadline().equals("永久")){
+            dateTv.setText(TimeUtil.TimeStamp2Date(Long.valueOf(taskReleaseEty.getDeadline()), "yyyy/MM/dd HH:mm"));
+        }else {
+            dateTv.setText("截至日期："+taskReleaseEty.getDeadline());
+        }
 
 
         Glide.with(SheepApp.mContext)

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

@@ -106,7 +106,7 @@ public class TryMakeMoneyact extends BaseActivity {
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
         mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
-        mAdapter.add(FgtTryMakeMoney.newInstance(2), titles[1]);
+//        mAdapter.add(FgtTryMakeMoney.newInstance(2), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 
@@ -132,6 +132,10 @@ public class TryMakeMoneyact extends BaseActivity {
 
             }
         });
+        /**
+         * v2.6
+         */
+        indicator.setVisibility(View.GONE);
     }
 
     @Override

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

@@ -79,18 +79,25 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         String payType = "";
         if(gameTaskOrderEnty.getUser_amount() > 0){
             payType = "绵羊币(" + gameTaskOrderEnty.getUser_amount() +")";
+        }else {
+            payType = "";
         }
         if(gameTaskOrderEnty.getPay_type() == 1){
-            if(TextUtils.isEmpty(payType)){
+            if(!TextUtils.isEmpty(payType)){
                 payType  += ",";
+            }else {
+                payType  += "";
             }
             payType  += "支付宝(" + gameTaskOrderEnty.getThird_amount() + ")";
+        }else {//3
+            payType = "绵羊币(" + gameTaskOrderEnty.getAmount() +")";
         }
         holder.pay_type_tv.setText("支付方式：" + payType);
         holder.date_tv.setText("提交时间："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(gameTaskOrderEnty.getCreate_time()))+"");
         holder.price_tv.setText("提交金额："+gameTaskOrderEnty.getAmount());
         holder.order_type_tv.setText("订单状态：");
         holder.order_end_time_tv.setText("订单剩余时间："+(gameTaskOrderEnty.getCreate_time() == 0? 0:TimeUtil.getHours(gameTaskOrderEnty.getCreate_time()*1000))+"");
+        holder.order_end_time_tv.setVisibility(View.GONE);
 
         holder.pay_layout.setVisibility(View.GONE);
         holder.pay_tyoe_show_tv.setVisibility(View.VISIBLE);

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

@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.ScreenshotsEntity;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
@@ -37,10 +38,12 @@ import me.iwf.photopicker.PhotoPreview;
 public class TaskdetailSonListviewAdp extends BaseAdapter {
     private List<TaskChild> descEntityArrayList;
     private Context context;
+    int with = 300;
 
     public TaskdetailSonListviewAdp(List<TaskChild> descEntityArrayList, Context context) {
         this.descEntityArrayList = descEntityArrayList;
         this.context = context;
+        with = G.WIDTH > G.HEIGHT ? G.HEIGHT / 3 - 50 :G.WIDTH / 3 - 50;
     }
 
     @Override
@@ -75,6 +78,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             holder.item_detail_listview = convertView.findViewById(R.id.item_detail_listview);
             holder.item_show_layout = convertView.findViewById(R.id.item_show_layout);
             holder.title_item_price_tv = convertView.findViewById(R.id.title_item_price_tv);
+            holder.item_detail_show_layout = convertView.findViewById(R.id.item_detail_show_layout);
             convertView.setTag(holder);
         }else {
             holder = (ViewHolder) convertView.getTag();
@@ -85,7 +89,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
         if(TextUtils.isEmpty(descEntity.getAmount())){
             holder.title_item_layout.setVisibility(View.GONE);
             holder.item_show_layout.setPadding(10,3,3,3);
-            holder.item_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
+            holder.item_detail_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
         }else {
             holder.title_item_layout.setVisibility(View.VISIBLE);
             holder.num_item_textview.setText(position + 1+"");
@@ -101,7 +105,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                 holder.item_show_layout.setVisibility(View.GONE);
                 holder.title_item_layout.setBackgroundResource(R.drawable.sp_bg_blue_91bdd6_radius);
             }
-            holder.item_show_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_bottom);
+            holder.item_detail_show_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_bottom);
         }
 
 
@@ -113,19 +117,21 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
 
         /**
          * 任务详情
+         * 2.6不显示
          */
-        if(descEntity.getDemo_time() > 0){
-            CommonUtil.getInstance().getHashMap(holder.item_remaining_time_tv);
-
-            holder.item_remaining_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), holder.item_remaining_time_tv, "剩余试玩时间：");
-            selfCountDownTimer.reset(descEntity.getDemo_time());
-            selfCountDownTimer.start();
-
-            CommonUtil.getInstance().addTimerHashMap(holder.item_remaining_time_tv, selfCountDownTimer);
-        }else {
-            holder.item_remaining_time_tv.setVisibility(View.GONE);
-        }
+        holder.item_remaining_time_tv.setVisibility(View.GONE);
+//        if(descEntity.getDemo_time() > 0){
+//            CommonUtil.getInstance().getHashMap(holder.item_remaining_time_tv);
+//
+//            holder.item_remaining_time_tv.setVisibility(View.VISIBLE);
+//            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(descEntity.getDemo_time(), holder.item_remaining_time_tv, "剩余试玩时间：");
+//            selfCountDownTimer.reset(descEntity.getDemo_time());
+//            selfCountDownTimer.start();
+//
+//            CommonUtil.getInstance().addTimerHashMap(holder.item_remaining_time_tv, selfCountDownTimer);
+//        }else {
+//            holder.item_remaining_time_tv.setVisibility(View.GONE);
+//        }
 
         /**
          *
@@ -141,7 +147,6 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                     TextView textView = convertView.findViewById(R.id.textview);
                     CommonUtil.getInstance()
                             .bindDataTaskDetailSonStep(taskDescEntity, textView, position);
-//                    textView.setText(taskDescEntity.getStep() + "、" + taskDescEntity.getDesc());
                     return true;
                 }
 
@@ -190,7 +195,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
             holder.recycler_screenshot_view.setHasFixedSize(true);
             holder.recycler_screenshot_view.setLayoutManager(layoutManager);
-            holder.recycler_screenshot_view.addItemDecoration(new SpaceItemDecoration(30));
+//            holder.recycler_screenshot_view.addItemDecoration(new SpaceItemDecoration(5));
             holder.recycler_screenshot_view.setAdapter(new RecyclerView.Adapter() {
                 @NonNull
                 @Override
@@ -207,31 +212,25 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                 }
 
                 @Override
-                public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+                public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
                     ScreenshotsEntity taskDescEntity = descEntity.getScreenshotsList().get(i);
                     ImageView screens_iv = viewHolder.itemView.findViewById(R.id.screens_iv);
                     TextView screens_tv = viewHolder.itemView.findViewById(R.id.screens_tv);
+                    screens_iv.setAdjustViewBounds(true);
+                    screens_iv.setScaleType(ImageView.ScaleType.FIT_XY);
 
-                    screens_iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
-                    int size = 1;
-                    switch (descEntity.getScreenshotsList().size()){
-                        case 1:
-                        case 2:
-                            size = descEntity.getScreenshotsList().size();
-                            break;
-                        case 3:
-                        default:
-                            size = 3;
-                            break;
+                    screens_iv.setLayoutParams(new LinearLayout.LayoutParams(with, with));
 
+                    if(TextUtils.isEmpty(taskDescEntity.getDesc())){
+                        screens_tv.setVisibility(View.GONE);
+                    }else {
+                        screens_tv.setVisibility(View.VISIBLE);
+                        screens_tv.setText("" + taskDescEntity.getDesc());
                     }
-                    int with = G.WIDTH / 3 - 50;
-                    int heigth = G.WIDTH / 3 ;
-                    viewHolder.itemView.setLayoutParams(new RecyclerView.LayoutParams(with, heigth));
 
-                    screens_tv.setText("" + taskDescEntity.getDesc());
                     Glide.with(context)
                             .load(taskDescEntity.getImg())
+                            .apply(new RequestOptions().override(with, with))
                             .into(screens_iv);
                     screens_iv.setOnClickListener(new View.OnClickListener() {
                         @Override
@@ -240,7 +239,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                                 if(imgListStr != null && imgListStr.size()>0){
                                     PhotoPreview.builder()
                                             .setPhotos(imgListStr)
-                                            .setCurrentItem(position)
+                                            .setCurrentItem(i)
                                             .setShowDeleteButton(false)
                                             .start((Activity) context, 101);
                                 }
@@ -285,7 +284,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
     class ViewHolder{
         TextView  title_item_tv, item_remaining_time_tv, title_item_price_tv, num_item_textview;
         ImageView select_tab_iv;
-        LinearLayout title_item_layout, taskdetail_screenshot_layout, item_show_layout;
+        LinearLayout title_item_layout, taskdetail_screenshot_layout, item_show_layout, item_detail_show_layout;
         MyListview item_detail_listview;
         RecyclerView recycler_screenshot_view;
     }

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

@@ -96,13 +96,13 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
         switch (recyleObj.getRecyleType()){
             case RELEASE_TASK:
-                bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
+                bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj(), 0);
                 break;
             case RUN_TASK:
                 bindRunTask(holder, (List<TaskAcceptedEty>) recyleObj.getDataObj());
                 break;
             case BEGIN_TASK://即将开始
-                bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
+                bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj(), 1);
                 break;
             case GAME_TASK://我的游戏
                 bindGameTask(holder, (List<OrienteeringDetail>) recyleObj.getDataObj());
@@ -174,16 +174,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
-                if(i == 0){
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
-                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
-                    String titleStr = "可接取";
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr+"");
+                viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
+                viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
 
-                }else{
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
-                }
                 if(i == getItemCount()-1){
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
                 }else {
@@ -192,7 +185,20 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 detail_task_tv.setText("去充值");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                         "可定向消费:" + etyList.get(i).getBalance() +"元");
+                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setTextColor(context.getResources().getColor(R.color.red_fd2d54));
+                viewHolder.itemView.findViewById(R.id.item_date_question_img).setVisibility(View.VISIBLE);
+                viewHolder.itemView.findViewById(R.id.item_date_question_img).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
 
+                        ViewUtil.showMsgDialog(context,
+                                "游戏总金额"+ etyList.get(i).getBalance() +"元，按比例"+ etyList.get(i).getRatio() +"%进行消费，最低消费"+ etyList.get(i).getMin_amount() +"元。\n" +
+                                        "\n" +
+                                        "例如（消费100元可用10元小绵羊定向消费金额）",
+                                "定向消费详情",
+                                false);
+                    }
+                });
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
                 //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
@@ -255,9 +261,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         if(item == null){
                             return;
                         }
+                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id());
                         UMConfigUtils.IdEvent.TASK.commit(item.getId());
 
-                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getTask_id(), etyList.get(i).getGame_id());
                     }
                 });
 //                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
@@ -273,7 +279,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     /**
      * 获取已发布的
      */
-    private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList){
+    private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList, final int isBegin){
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -302,27 +308,33 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 if(i == 0){
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
                     viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
-                    String titleStr = "推荐";
+                    String titleStr = "可接取";
                     int resourceId = R.mipmap.task_hot_icon;
-                    switch (type){
-                        case 0:
-                            titleStr = "推荐";
-                            break;
-                        case 1:
-                            titleStr = "热门任务";
-                            viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.VISIBLE);
-                            Glide.with(context)
-                                    .load(resourceId)
-                                    .apply(new RequestOptions().placeholder(resourceId))
-                                    .into((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv));
-                            break;
-                        case 2:
-                            titleStr = "即将开始";
-                            break;
-                        default:
-                            titleStr = "推荐";
-                            break;
+                    if(isBegin == 1){
+
+                        titleStr = "即将开始";
+                    }else {
+                        switch (type){
+                            case 0:
+                                titleStr = "可接取";
+                                break;
+                            case 1:
+                                titleStr = "热门任务";
+                                viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.VISIBLE);
+                                Glide.with(context)
+                                        .load(resourceId)
+                                        .apply(new RequestOptions().placeholder(resourceId))
+                                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv));
+                                break;
+                            case 2:
+                                titleStr = "即将开始";
+                                break;
+                            default:
+                                titleStr = "可接取";
+                                break;
+                        }
                     }
+
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr+"");
 
                 }else{
@@ -339,27 +351,36 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
                     detail_task_tv.setEnabled(false);
                     viewHolder.itemView.setEnabled(false);
-                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                            "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                    if(!etyList.get(i).getDeadline().equals("永久")){
+                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                    }else {
+                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "截止时间:" + etyList.get(i).getDeadline());
+                    }
                 }else {
-                    switch (type){
-                        case 2://即将开始
-                            detail_task_tv.setText("即将开始");
-                            detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                            detail_task_tv.setEnabled(false);
-                            viewHolder.itemView.setEnabled(false);
+                    if(isBegin == 1 || type == 2){//即将开始
+                        detail_task_tv.setText("即将开始");
+                        detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                        detail_task_tv.setEnabled(false);
+                        viewHolder.itemView.setEnabled(false);
+                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getOnline_time()))+"");
+                    }else {
+
+                        detail_task_tv.setText("领取任务");
+                        detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
+                        detail_task_tv.setEnabled(true);
+                        viewHolder.itemView.setEnabled(true);
+                        if(!etyList.get(i).getDeadline().equals("永久")){
                             ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                    "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getOnline_time()))+"");
-                            break;
-                        default:
-                            detail_task_tv.setText("领取任务");
-                            detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
-                            detail_task_tv.setEnabled(true);
-                            viewHolder.itemView.setEnabled(true);
+                                    "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                        }else {
                             ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                    "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
-                            break;
+                                    "截止时间:" + etyList.get(i).getDeadline());
+                        }
                     }
+
                 }
 
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
@@ -368,16 +389,17 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getName()+"");
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
                 //设置标签颜色task_type_tv
-                if(!TextUtils.isEmpty(etyList.get(i).getChild_task_name())){
-                    task_type_tv.setVisibility(View.VISIBLE);
-                    task_type_tv.setText(etyList.get(i).getChild_task_name() + "");
-                    CommonUtil.getInstance()
-                            .setViewBackground(
-                                    task_type_tv,
-                                    etyList.get(i).getLabel_color()+"");
-                }else {
-                    task_type_tv.setVisibility(View.INVISIBLE);
-                }
+                //Todo 2.6又不需要了
+//                if(!TextUtils.isEmpty(etyList.get(i).getChild_task_name())){
+//                    task_type_tv.setVisibility(View.VISIBLE);
+//                    task_type_tv.setText(etyList.get(i).getChild_task_name() + "");
+//                    CommonUtil.getInstance()
+//                            .setViewBackground(
+//                                    task_type_tv,
+//                                    etyList.get(i).getLabel_color()+"");
+//                }else {
+//                    task_type_tv.setVisibility(View.INVISIBLE);
+//                }
 
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
@@ -487,8 +509,13 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getRelease_task().getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getRelease_task().getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getRelease_task().getBonus() +"元");
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                        "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
+                if(!etyList.get(i).getRelease_task().getDeadline().equals("永久")){
+                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                            "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(etyList.get(i).getRelease_task().getDeadline()))+"");
+                }else {
+                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                            "截止时间:" + etyList.get(i).getRelease_task().getDeadline());
+                }
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
 
@@ -507,16 +534,17 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
 
                 //设置标签颜色task_type_tv
-                if(!TextUtils.isEmpty(etyList.get(i).getRelease_task().getChild_task_name())){
-                    task_type_tv.setVisibility(View.VISIBLE);
-                    task_type_tv.setText(etyList.get(i).getRelease_task().getChild_task_name() + "");
-                    CommonUtil.getInstance()
-                            .setViewBackground(
-                                    task_type_tv,
-                                    etyList.get(i).getRelease_task().getLabel_color()+"");
-                }else {
-                    task_type_tv.setVisibility(View.INVISIBLE);
-                }
+                //Todo 2.6又不需要了
+//                if(!TextUtils.isEmpty(etyList.get(i).getRelease_task().getChild_task_name())){
+//                    task_type_tv.setVisibility(View.VISIBLE);
+//                    task_type_tv.setText(etyList.get(i).getRelease_task().getChild_task_name() + "");
+//                    CommonUtil.getInstance()
+//                            .setViewBackground(
+//                                    task_type_tv,
+//                                    etyList.get(i).getRelease_task().getLabel_color()+"");
+//                }else {
+//                    task_type_tv.setVisibility(View.INVISIBLE);
+//                }
                 viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -555,7 +583,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 /**
                  * 倒计时
                  */
-                final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.countdown_tv);
+                final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.end_of_time_tv);
                 if(etyList.get(i).getEnd_time() > 0){
                     SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
                     if(scTimer != null){
@@ -564,7 +592,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     }
 
                     countdown_tv.setVisibility(View.VISIBLE);
-                    String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
+                    String sr = "<font color='#ff2d4b'><small>" + "" + "</small></font>";
                     countdown_tv.setText(sr+"");
                     SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000, etyList.get(i).getRelease_task().getCancel_duration()) {
                         @Override
@@ -574,7 +602,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                         @Override
                         public void onTimerTick(long millisUntilFinished, int counTime) {
-                            countdown_tv.setText(Html.fromHtml(CommonUtil.getInstance().assemblyString(TimeUtil.getHours(millisUntilFinished))+""));
+                            countdown_tv.setText(Html.fromHtml(CommonUtil.getInstance().assemblyStrings(TimeUtil.getHours(millisUntilFinished), "")+""));
                         }
 
                         @Override

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -64,6 +64,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private int position = 0;
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
+    private List<TaskReleaseEty> releaseEtyListsBegin = new ArrayList<>();
     private int type = 0;
     private GridViewEntity gridViewEntity;//选中的
     private int is_succession;//0:一般任务 1:连续任务
@@ -76,11 +77,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
     private void notifyDataSetChanged(){
         checkAndInitView();
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
         tryMakeMoneyAdp.refreshAdapter();
-        if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty()){
+        if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty()){
 
             empty_view.setVisibility(View.VISIBLE);
+        }else {
+            empty_view.setVisibility(View.GONE);
         }
         refresh.setRefreshing(false);
     }
@@ -180,6 +182,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void initData() {
         empty_view.setVisibility(View.GONE);
         position = 0;
+        type = 0;
         releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(type);
@@ -189,18 +192,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         gridViewEntity = ((TryMakeMoneyact)getActivity()).getTabValue();
-        RequestParameEty parameEty = new RequestParameEty();
-        parameEty.setHashMap(
-                CommonUtil.getInstance()
-                        .setHashMap(1,
-                                100,
-                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
-                                0,
-                                0,
-                                type==2 ? 1 : type,
-                                gridViewEntity == null ? -1+"" :gridViewEntity.getId()+"",
-                                ((TryMakeMoneyact)getActivity()).getIsSuccession()));
-        presenter.releaseTask(parameEty);
+        if(getActivity() instanceof  TryMakeMoneyact)
+            CommonUtil.getInstance().getRunTask(presenter,((TryMakeMoneyact)getActivity()).getIsSuccession());
     }
 
     @Override
@@ -265,17 +258,17 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void returnTaskTaskUpdataView(Object o) {
 
         try{
-            position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
             if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
+                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
                 tryMakeMoneyAdp.addPresenter(presenter);
                 position ++;
             }
         }catch (Exception e){
             e.printStackTrace();
         }
+        getNetWork(type);
         notifyDataSetChanged();
     }
 
@@ -295,6 +288,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             e.printStackTrace();
             G.showToast(" 网络错误！");
         }
+        getNetWork(type);
         notifyDataSetChanged();
     }
 
@@ -305,35 +299,46 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void releaseTaskTaskUpdataView(Object o) {
         try{
-            position = 0;
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-            if(releaseEtyList != null){
-                releaseEtyLists.addAll(releaseEtyList);
+            if(type == 0){
+                type = 1;
+
+
+                BaseMessage baseMessage = (BaseMessage) o;
+                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+                if(releaseEtyList != null){
+                    releaseEtyLists.addAll(releaseEtyList);
+                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
+                    position++;
+                }
+
+                getNetWork(type);
+            }else if(type == 1){
+                BaseMessage baseMessage = (BaseMessage) o;
+                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+                if(releaseEtyList != null){
+                    releaseEtyListsBegin.clear();
+                    releaseEtyListsBegin.addAll(releaseEtyList);
+                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin),position);
+                    position++;
+                }
             }
 
-//            mhandler.sendEmptyMessage(0);
         }catch (Exception e){
             e.printStackTrace();
         }
-        if(type == 2){
-            notifyDataSetChanged();
-        }else {
-            if(getActivity() instanceof  TryMakeMoneyact)
-                CommonUtil.getInstance().getRunTask(presenter,((TryMakeMoneyact)getActivity()).getIsSuccession());
-        }
+        notifyDataSetChanged();
 
     }
 
     @Override
     public void failReleaseTask2View(Object o) {
 
-        if(type == 2){
-            notifyDataSetChanged();
-        }else {
-            if(getActivity() instanceof  TryMakeMoneyact)
-                CommonUtil.getInstance().getRunTask(presenter,((TryMakeMoneyact)getActivity()).getIsSuccession());
+
+        if(type == 0){
+            type = 1;
+            getNetWork(type);
         }
+        notifyDataSetChanged();
     }
 
     @Subscribe
@@ -413,4 +418,26 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             e.printStackTrace();
         }
     }
+    /**
+     * 即将开始
+     * type: 0 1
+     */
+    private void getNetWork(int type){
+        if(type > 1){
+            return;
+        }
+
+        RequestParameEty parameEty = new RequestParameEty();
+        parameEty.setHashMap(
+                CommonUtil.getInstance()
+                        .setHashMap(1,
+                                100,
+                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
+                                0,
+                                0,
+                                type,
+                                -1+"",
+                                ((TryMakeMoneyact)getActivity()).getIsSuccession()));
+        presenter.releaseTask(parameEty);
+    }
 }

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

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

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

@@ -30,15 +30,16 @@
         android:id="@+id/order_end_time_tv"
         style="@style/style_nomal_tv"
         android:text="订单剩余时间："
-        app:layout_constraintTop_toBottomOf="@+id/order_type_tv"/>
+        app:layout_constraintTop_toBottomOf="@+id/order_type_tv"
+        android:visibility="gone"/>
 
 
     <TextView
         android:id="@+id/pay_tyoe_show_tv"
         style="@style/style_nomal_tv"
         android:text="支付失败"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/date_tv"
+        app:layout_constraintBottom_toBottomOf="@+id/order_type_tv"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginRight="@dimen/content_padding_10"/>
     <LinearLayout
@@ -46,17 +47,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/date_tv"
+        app:layout_constraintBottom_toBottomOf="@+id/order_type_tv"
         app:layout_constraintEnd_toEndOf="parent">
         <TextView
             android:id="@+id/pay_cancel_tv"
-            style="@style/style_button"
+            style="@style/style_button_show_1"
             android:layout_height="30dp"
             android:text="取消支付"/>
         <TextView
             android:id="@+id/pay_tv"
-            style="@style/style_button"
+            style="@style/style_button_show_1"
             android:layout_height="30dp"
             android:text="立即支付"/>
     </LinearLayout>

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

@@ -129,7 +129,7 @@
         android:background="@color/white_bg_line"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
-        android:visibility="gone"/>
+        android:visibility="visible"/>
 
     <RelativeLayout
         android:id="@+id/order_layout"

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

@@ -44,7 +44,10 @@
                         android:ems="2"
                         android:textColor="#D3AF57"
                         android:background="@drawable/sp_bg_black_radius"
-                        android:padding="@dimen/content_padding_10"
+                        android:paddingTop="@dimen/content_padding_10"
+                        android:paddingBottom="@dimen/content_padding_10"
+                        android:paddingLeft="@dimen/content_padding_8"
+                        android:paddingRight="@dimen/content_padding_8"
                         android:layout_marginRight="@dimen/common_margin_10"
                         android:layout_marginBottom="@dimen/content_padding_20"
                         android:layout_centerVertical="true"/>
@@ -88,7 +91,8 @@
                             android:id="@+id/icon_layout"
                             android:layout_width="@dimen/view_size_65"
                             android:layout_height="@dimen/view_size_65"
-                            android:layout_centerVertical="true">
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/sp_bg_transparent_radius_transparent">
                             <ImageView
                                 android:id="@+id/icon_iv"
                                 android:layout_width="@dimen/view_size_65"
@@ -99,9 +103,11 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentBottom="true"
-                                android:background="#66FFFFFF"
+                                android:background="#99FFFFFF"
                                 android:lines="1"
-                                android:visibility="gone"/>
+                                android:text=""
+                                android:gravity="center"
+                                android:visibility="visible"/>
                         </RelativeLayout>
 
                         <RelativeLayout

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

@@ -2,17 +2,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:layout_margin="@dimen/content_padding_3">
 
     <ImageView
         android:id="@+id/screens_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        android:src="@mipmap/icon"
+        android:layout_gravity="center"/>
     <TextView
         android:id="@+id/screens_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:visibility="gone"/>
+        android:layout_gravity="center"
+        android:text=""
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:visibility="visible"/>
 </LinearLayout>

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

@@ -8,7 +8,8 @@
     android:paddingRight="@dimen/content_padding_small"
     android:paddingTop="@dimen/content_padding_small"
     android:paddingBottom="@dimen/content_padding_15"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:visibility="gone">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -9,7 +9,8 @@
     android:paddingRight="@dimen/content_padding_small"
     android:paddingTop="@dimen/content_padding_small"
     android:paddingBottom="@dimen/content_padding_15"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:visibility="gone">
 
     <TextView
         android:layout_width="4dp"

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

@@ -56,6 +56,7 @@
         android:orientation="vertical"
         android:paddingTop="@dimen/content_padding_12">
         <LinearLayout
+            android:id="@+id/item_detail_show_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"

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

@@ -3,12 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:layout_marginBottom="@dimen/content_padding_big">
+    android:layout_marginBottom="@dimen/content_padding_12">
 
     <TextView
         android:id="@+id/textview"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/content_padding_small">
 
     </TextView>
     <TextView

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

@@ -54,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="取消任务"
-            android:minWidth="@dimen/view_size_60"
+            android:minWidth="@dimen/view_size_80"
             android:textColor="@color/white"
             android:textSize="@dimen/text_size_12"
             android:gravity="center"
@@ -63,13 +63,29 @@
             android:padding="@dimen/content_padding_3"
             android:background="@drawable/sp_bg_gradient_rectangle_blue_change"
             android:visibility="invisible"/>
-        <ImageView
-            android:id="@+id/item_icon_iv"
+
+        <RelativeLayout
+            android:id="@+id/icon_layout"
             android:layout_width="@dimen/view_size_65"
             android:layout_height="@dimen/view_size_65"
-            android:src="@drawable/icon_lj"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:background="@drawable/sp_bg_transparent_radius_transparent">
+            <ImageView
+                android:id="@+id/item_icon_iv"
+                android:layout_width="@dimen/view_size_65"
+                android:layout_height="@dimen/view_size_65"
+                android:src="@drawable/icon_lj"/>
+            <TextView
+                android:id="@+id/end_of_time_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:background="#66FFFFFF"
+                android:gravity="center"
+                android:lines="1"
+                android:visibility="gone"/>
+        </RelativeLayout>
         <TextView
             android:id="@+id/item_money"
             android:layout_width="wrap_content"
@@ -77,7 +93,7 @@
             android:text=""
             android:textSize="20dp"
             android:textColor="@color/txt_red"
-            android:layout_marginTop="@dimen/content_padding_10"
+            android:layout_marginBottom="@dimen/content_padding_3"
             app:layout_constraintTop_toBottomOf="@+id/item_anem_tv"
             app:layout_constraintBottom_toTopOf="@+id/item_anem_tv"
             app:layout_constraintEnd_toEndOf="parent"/>
@@ -90,7 +106,7 @@
             android:gravity="start"
             android:ellipsize="middle"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
+            app:layout_constraintStart_toEndOf="@+id/icon_layout"
             app:layout_constraintRight_toLeftOf="@+id/task_type_tv"
             android:layout_marginStart="15dp"
             style="@style/txt_style_15"/>
@@ -104,16 +120,37 @@
             android:layout_marginBottom="@dimen/content_padding_2"
             android:textSize="@dimen/text_size_12"
             android:textColor="@color/txt_black_8e8e8e"/>
-        <TextView
-            android:id="@+id/item_date_tv"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/item_date_layout"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text=""
+            android:orientation="horizontal"
             app:layout_constraintTop_toBottomOf="@+id/item_num_tv"
-            app:layout_constraintStart_toStartOf="@+id/item_num_tv"
+            app:layout_constraintStart_toEndOf="@+id/icon_layout"
+            app:layout_constraintEnd_toStartOf="@+id/detail_task_tv"
+            app:layout_constraintStart_toStartOf="@+id/item_anem_tv"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:textColor="@color/txt_black_8e8e8e"
-            android:textSize="@dimen/text_size_12" />
+            android:layout_marginRight="@dimen/content_padding_8">
+
+            <TextView
+                android:id="@+id/item_date_tv"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text=""
+                android:lines="1"
+                android:textColor="@color/txt_black_8e8e8e"
+                android:textSize="@dimen/text_size_12" />
+
+            <ImageView
+                android:id="@+id/item_date_question_img"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                app:layout_constraintStart_toEndOf="@+id/item_date_tv"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:src="@mipmap/task_game_qustion_icon"
+                android:visibility="gone"/>
+        </LinearLayout>
         <TextView
             android:id="@+id/detail_task_tv"
             android:layout_width="wrap_content"
@@ -126,8 +163,8 @@
             android:padding="@dimen/content_padding_3"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBaseline_toBaselineOf="@+id/item_date_tv"
             android:layout_marginTop="@dimen/content_padding_small"
-            android:layout_marginBottom="@dimen/content_padding_10"
             android:background="@drawable/sp_bg_gradient_rectangle_blue"/>
     </android.support.constraint.ConstraintLayout>
 

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

@@ -31,6 +31,15 @@
         <item name="android:textColor">@color/btn_color_main</item>
         <item name="android:textSize">@dimen/text_size_2</item>
     </style>
+    <style name="style_button_show_1" parent="button">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/selector_button_full_main</item>
+        <item name="android:textColor">@color/btn_color_main</item>
+        <item name="android:layout_margin">@dimen/content_padding_small</item>
+        <item name="android:textSize">@dimen/text_size_2</item>
+    </style>
 
     <style name="style_button_stroke" parent="button">
         <item name="android:layout_width">match_parent</item>