修复合并错误

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

@@ -7,7 +7,7 @@ package com.sheep.gamegroup.model.entity;
 public class FindAppReservation {
     private int UserId;
 
-    private int Type;//1:预约 2：下载--------------实际上效果是反的
+    private int Type;//2:预约 1：下载
 
     private int UpdatedAt;
 

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

@@ -966,6 +966,31 @@ public class CommonUtil {
                 });
     }
 
+    /**
+     * 获取任务信息
+     */
+    public void getTaskAllDetail(int id, final Action1<BaseMessage> action1){
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .getAcceptedTaskDetail(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if(action1 != null)
+                            action1.call(baseMessage);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                        if(action1 != null)
+                            action1.call(baseMessage);
+                    }
+                });
+    }
 
     public void updateUserInfo(final Action1<UserEntity> action1) {
         SheepApp.get(SheepApp.getInstance())