修复任务记录中任务状态不对的bug

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

@@ -133,4 +133,11 @@ public class TaskAcceptedEty implements Serializable{
         return obj instanceof TaskAcceptedEty &&
                 (((TaskAcceptedEty) obj).id == id || ( release_task != null && release_task.equals(((TaskAcceptedEty) obj).getRelease_task())));
     }
+
+
+
+
+    public boolean isIs_running() {
+        return status == 1 || status == 2;
+    }
 }

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

@@ -285,7 +285,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         bottom_btn_layout.setVisibility(View.VISIBLE);
         btnTaskItem.setVisibility(View.VISIBLE);
         btnUpImag.setVisibility(View.VISIBLE);
-        if (taskReleaseEty.isIs_running() || game_id != null) {//已经领取任务
+        if ((gettaskAcceptedEty != null && gettaskAcceptedEty.isIs_running()) || taskReleaseEty.isIs_running() || game_id != null) {//已经领取任务
             switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务
                 case 4://h5业务
                     type = 10;
@@ -1169,27 +1169,38 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
-     * 接受任务详情
+     * 获取接受的任务详情
      */
-    private void accepteTaskDetail(int releaseTaskId){
-        gettaskAcceptedEty = DataUtil.getInstance().getTaskAcceptedTaskByReleaseTaskId(releaseTaskId);
-        if(gettaskAcceptedEty == null){//不是正在进行的任务
-            taskReleaseEty = DataUtil.getInstance().getCacheResult(ApiKey.releaseTaskDesc(releaseTaskId), TaskReleaseEty.class);
-            if(taskReleaseEty == null) {//没有缓存的任务详情
-                showProgress();
-                presenter.taskDesc(releaseTaskId);
-            } else {//获取到缓存的任务详情
-                empty_view.setVisibility(View.GONE);
-                initWigget();
-                isGetTaskDesc = false;
-            }
-        } else {//是正在运行的任务
-            taskReleaseEty = gettaskAcceptedEty.getRelease_task();
-            taskReleaseEty.setIs_running(true);
-            empty_view.setVisibility(View.GONE);
-            initWigget();
-            isGetTaskDesc = false;
-        }
+    private void accepteTaskDetail(final int releaseTaskId){
+        showProgress();
+        CommonUtil.getInstance().getTaskAllDetail(releaseTaskId, new Action1<BaseMessage>() {
+                    @Override
+                    public void call(BaseMessage baseMessage) {
+                        try{
+                            if(baseMessage.getCode() == 0)
+                                gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                        if(gettaskAcceptedEty == null || gettaskAcceptedEty.getRelease_task() == null){//不是正在进行的任务
+                            taskReleaseEty = DataUtil.getInstance().getCacheResult(ApiKey.releaseTaskDesc(releaseTaskId), TaskReleaseEty.class);
+                            if(taskReleaseEty == null) {//没有缓存的任务详情
+                                presenter.taskDesc(releaseTaskId);
+                            } else {//获取到缓存的任务详情
+                                hideProgress();
+                                empty_view.setVisibility(View.GONE);
+                                initWigget();
+                                isGetTaskDesc = false;
+                            }
+                        } else {//是正在运行的任务
+                            hideProgress();
+                            taskReleaseEty = gettaskAcceptedEty.getRelease_task();
+                            empty_view.setVisibility(View.GONE);
+                            initWigget();
+                            isGetTaskDesc = false;
+                        }
+                    }
+                });
     }
 
     @Override

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

@@ -53,7 +53,8 @@
     </LinearLayout>
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        style="@style/style_tab"/>
+        style="@style/style_tab"
+        android:layout_marginTop="-7dp"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"