Merge remote-tracking branch 'origin/sheep_develop' into sheep_tinker

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

@@ -112,7 +112,6 @@ public class FgtFriendExtractPage extends BaseFragment {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage);
                         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty(), true);
                         isLoadding = false;
                     }

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

@@ -211,7 +211,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        showRedPackageAfterInvitation(getActivity(), getView(), baseMessage);
+                        showRedPackageAfterInvitation(activity, getView(), baseMessage);
                         if (popupWindow.isShowing()) {
                             popupWindow.dismiss();
                         }
@@ -227,6 +227,9 @@ public class FgtPersonalCenter extends BaseCompatFragment {
      * @param mActivity 当前Activity
      */
     public void showRedPackageAfterInvitation(final Activity mActivity, View viewAnchor, BaseMessage baseMessage) {
+        if(viewAnchor == null){
+            return;
+        }
         View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
         TextView tvMoney = view.findViewById(R.id.tv_money);
@@ -241,10 +244,13 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        RedPackageMoney redPackageMoney = baseMessage.getData(RedPackageMoney.class);
-        tvMoney.setText("" + 1);
+        tvMoney.setText("1");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -15,6 +15,7 @@ import android.os.Message;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
@@ -32,7 +33,6 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.Gson;
@@ -73,7 +73,6 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.util.NestedScrollView;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -184,6 +183,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     TextView homepage_item_juan_tv;
     @BindView(R.id.recyclerview_line)
     View recyclerview_line;
+    @BindView(R.id.bottom_line_text)
+    TextView bottom_line_text;
 
 
     @Inject
@@ -223,7 +224,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 case 1:
                     tryMakeMoneyAdp.clear();
                     if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
-                        recyclerview_line.setVisibility(View.VISIBLE);
+                        if(recyclerview_line != null)
+                            recyclerview_line.setVisibility(View.VISIBLE);
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
                     if(!ListUtil.isEmpty(releaseEtyLists)) {
@@ -239,12 +241,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
+                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
                     isShowRedPackages(activity);
-                    LogUtil.logI("handle message");
                     break;
             }
 
@@ -301,6 +302,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
         isShowRedPackage();
+        bottom_line_text.setText("我是有底线的，双占我回到顶部");
     }
 
 
@@ -369,8 +371,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
 
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
     @SuppressLint("ClickableViewAccessibility")
     public void initListener() {
         scrollView.setOnTouchListener(new View.OnTouchListener() {
@@ -403,31 +403,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
 
-        scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
-            @Override
-            public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
-
-//                try {
-//                    tabLayout.post(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            int count = mViewPager.getChildCount();
-//                            if(count > 0){
-//                                toolBarPositionY = tabLayout.getHeight();
-////                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-//                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-//                                params.height = G.getRealPix(count * 50);
-//                                mViewPager.setLayoutParams(params);
-//                                LogUtil.logE("--------"+count+";height:"+mViewPager.getHeight()+","+mViewPager.getMeasuredHeight());
-//                            }
-//
-//                        }
-//                    });
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-            }
-        });
 
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -619,12 +594,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if(null ==  homeListEntitysGridview.get(position)){
+                HomeListEntity homeListEntity= ListUtil.getItem(homeListEntitysGridview, position);
+                if(homeListEntity == null){
                     return;
                 }
-                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if(homeListEntity.getJump().equals("-2")){
+                if("-2".equals(homeListEntity.getJump())){
                     setValueList(!homeListEntity.isSelect());
                 }else {
                     CommonUtil.getInstance()
@@ -652,8 +627,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
 
-    @OnClick({R.id.recharge, R.id.withdrawal,
-            R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout
+    @OnClick({R.id.recharge, R.id.withdrawal, R.id.view_rob_duty,
+            R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout,
+            R.id.bottom_line
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -676,6 +652,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.recharge://充值
                 Jump2View.getInstance().goRechargeAct(activity, "首页");
                 break;
+            case R.id.view_rob_duty://抢任务弹框
+                ViewUtil.showRobDutyDialog(getActivity(), getView());
+                break;
+            case R.id.bottom_line://我是有底线的，双占我回到顶部
+                scrollView.fullScroll(NestedScrollView.FOCUS_UP);
+                break;
         }
     }
 
@@ -918,13 +900,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
-
-        viewRobDuty.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ViewUtil.showRobDutyDialog(getActivity(), getView());
-            }
-        });
     }
 
 
@@ -1161,11 +1136,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      */
     private void inviteNotice(final List<BulletinEnty> bulletinEntyList) {
         homepageItemNoticeLayout.setVisibility(View.GONE);
-//        List<String> infoList = new ArrayList<>();
-//        for(BulletinEnty bulletinEnty: bulletinEntyList){
-//            infoList.add(bulletinEnty.getContent()+"");
-//        }
-//        homepageItemNoticeMv.startWithList(infoList, R.anim.anim_left_in,R.anim.anim_right_out);
         homepageItemNoticeMv.removeAllViews();
         for (final BulletinEnty entity : bulletinEntyList) {
             StringBuilder sb = new StringBuilder();
@@ -1258,7 +1228,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
         tvMoney.setText("1.8");
         tvNew.setText("新人红包");

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

@@ -505,7 +505,7 @@ public class TaskEty implements Serializable, IDownload {
     public @interface STATUS {
     }
     /**
-     * 根据状态获取当前第一个可提交子任务的already_accepted_task_id
+     * 根据状态获取当前第一个子任务
      *
      1、 任务未开启时——即将开启
      2、 任务未领取时——可领取
@@ -516,15 +516,15 @@ public class TaskEty implements Serializable, IDownload {
      7、任务已过期未完成——已过期
      * @return
      */
-    public int getCanCommitChildRelease_task_id(@STATUS int status) {
+    public TaskChild getCanCommitChild(@STATUS int status) {
         if(!ListUtil.isEmpty(child)){
             for (TaskChild taskChild : child) {
                 if(status == taskChild.getStatus()){
-                    return taskChild.getAlready_accepted_task_id();
+                    return taskChild;
                 }
             }
         }
-        return -1;
+        return null;
     }
     /**
      * 获取当前第一个可提交子任务的already_accepted_task_id
@@ -540,12 +540,12 @@ public class TaskEty implements Serializable, IDownload {
      */
     public int getCanCommitChildRelease_task_id() {
         //先找审核失败的子任务
-        int commitScreenShotTaskId = getCanCommitChildRelease_task_id(TaskEty.STATUS_FAIL);
+        TaskChild commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_FAIL);
+        if(commitScreenShotTask == null){
         //再找进行中的子任务
-        if(commitScreenShotTaskId < 1){
-            commitScreenShotTaskId = getCanCommitChildRelease_task_id(TaskEty.STATUS_RUNNING);
+            commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_RUNNING);
         }
-        return commitScreenShotTaskId;
+        return commitScreenShotTask == null ? -1 : commitScreenShotTask.getAlready_accepted_task_id();
     }
 
     /**

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

@@ -124,6 +124,8 @@ public class CommonUtil {
     public static String GAME_DOWNLOAD = "下载游戏";
     public static String GAME_INSTALL = "安装游戏";
     public static String GAME_OPEN = "开始试玩";
+    public static String GAME_RESERVATION = "预约游戏";
+    public static String TASK_OFFLINE = "任务已下线";
     private static CommonUtil commonUtil;
 
     public static CommonUtil getInstance() {

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

@@ -154,16 +154,6 @@ public class MyDbManager {
         return appUsage == null ? 0 : appUsage.getTotalTimeInForeground();
     }
 
-    /**
-     * @param packageName  ,
-     *                     不出意外的话，把时间设置为0
-     */
-    public void retAppUsageTime(String packageName){
-        AppUsage appUsage = getAppUsage(packageName);
-        if (appUsage != null){
-            appUsage.setTotalTimeInForeground(0);
-        }
-    }
     public AppUsage getAppUsage(String packageName){
         try{
             return db.selector(AppUsage.class)

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

@@ -87,6 +87,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Random;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -247,9 +248,9 @@ public class ViewUtil {
         ImageView ivClose = view.findViewById(R.id.iv_close);
         final TextView tvTitel = view.findViewById(R.id.tv_duty_title);
         final TextView tvDutyMoney = view.findViewById(R.id.tv_robduty_money);
+        ViewUtil.setDefaultText(tvTitel);
+        ViewUtil.setDefaultText(tvDutyMoney);
         mRobTask = getTask(ivIcon, tvTitel, tvDutyMoney);
-        /**
-         * */
         final PopupWindow popupWindow = new PopupWindow(mActivity);
         popupWindow.setContentView(view);
         popupWindow.setAnimationStyle(R.style.Rising);
@@ -260,7 +261,11 @@ public class ViewUtil {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.5f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         //更换任务
         ivChangeOne.setOnClickListener(new View.OnClickListener() {
@@ -297,6 +302,20 @@ public class ViewUtil {
 
     }
 
+    /**
+     * 设置默认方块文本
+     * @param textView
+     */
+    public static void setDefaultText(TextView textView) {
+        String text = textView.getText().toString();
+        int length = TextUtils.isEmpty(text) ? Math.abs(new Random().nextInt(7)) : text.length();
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            stringBuilder.append("\u2588");
+        }
+        textView.setText(stringBuilder);
+    }
+
 
     /**
      * 兑换红包弹窗
@@ -318,7 +337,11 @@ public class ViewUtil {
         popupWindow.setOutsideTouchable(false);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         tvTitle.setText("兑换");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
@@ -390,7 +413,11 @@ public class ViewUtil {
         popupWindow.setFocusable(true);
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         backgroundAlpha(0.5f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.BOTTOM, 0, 0);
+        try {
+            popupWindow.showAtLocation(viewAnchor, Gravity.BOTTOM, 0, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -9,6 +9,7 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.sheep.gamegroup.util.TestUtil;
 import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebView;
@@ -57,7 +58,6 @@ import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LocationUtils;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
@@ -190,15 +190,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     private int releaseTaskId = -1;
 
-    private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
+    private int type;
 
 
     private AdpTaskDetailChildListview adpTaskDetailChildListview;
     private List<TaskChild> taskChildList = new ArrayList<>();
 
-    //2.6
-    private boolean btn_show;//true:不显示按钮
-
     //是否需要在onResume中刷新页面
     private boolean isFresh = false;
 
@@ -212,7 +209,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     @Override
     public void initView() {
         activity = this;
-        btn_show = getIntent().getBooleanExtra("btn_show", false);
         isFromTaskList = getIntent().getBooleanExtra("is_from_task_list", false);
         releaseTaskId = getIntent().getIntExtra("task_id", -1);
         DaggerTaskDetailComponent.builder()
@@ -257,7 +253,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_shrae_friend_layout.setVisibility(View.VISIBLE);
 
         taskEty = taskReleaseEty.getTask();
-        LogUtil.logI("taskType----->" + taskEty.getInspect_type());
         nameTv.setText(taskReleaseEty.getName() + "");
         priceTv.setText("+" + taskReleaseEty.getBonus() + "元");
         if (!taskReleaseEty.getDeadline().equals("永久")) {
@@ -306,70 +301,108 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
         updateBottom();
     }
-
+    private static final int TASK_TYPE_INIT = -1;//初始化状态，可能是未领取，如果不是请让第一按钮处于不可见或者不可操作状态
+    private static final int TASK_TYPE_H5 = 10;//h5任务标志
+    private static final int TASK_TYPE_RESERVATION = 11;//游戏任务中还不可以下载任务(预约任务)-->预约游戏
+    /**
+     * 用户操作按钮状态与文字设置
+     */
     private void updateBottom() {
+        type = TASK_TYPE_INIT;
+        //先复原按钮状态
         bottom_btn_layout.setVisibility(View.VISIBLE);
         btnTaskItem.setVisibility(View.VISIBLE);
+        btnTaskItem.setEnabled(true);
         btnUpImag.setVisibility(View.VISIBLE);
-        if (gettaskAcceptedEty != null && (gettaskAcceptedEty.isIs_running() || gettaskAcceptedEty.getStatus() == 3)) {//已经领取任务
+        btnUpImag.setEnabled(true);
+        //判断任务是否下线
+        if (taskReleaseEty.isOffline()) {//任务已经下线
+            btnUpImag.setVisibility(View.GONE);//不显示第二按钮
             switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
                 case 4://h5业务
-                    type = 10;
-                    btnTaskItem.setText(CommonUtil.START_TASK);
+                    btnTaskItem.setText(CommonUtil.TASK_OFFLINE);
+                    btnTaskItem.setEnabled(false);
                     break;
                 case 2:
-                case 1001:
-                    break;
-                default:
+                case 1001://信用卡与畅思任务不考虑
+                    bottom_btn_layout.setVisibility(View.GONE);
                     break;
-            }
-        } else if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
-            btnUpImag.setText("预约下载");
-            btnTaskItem.setVisibility(View.GONE);
-            btnUpImag.setVisibility(View.VISIBLE);
-        } else {
-            type = -1;
-            btnTaskItem.setText(CommonUtil.GET_TASK);
-            btnUpImag.setVisibility(View.GONE);
-        }
-        //2.6修改
-        if (btn_show)
-            bottom_btn_layout.setVisibility(View.GONE);
-
-        //任务已经下线
-        if (taskReleaseEty.getStatus() == 3 || taskReleaseEty.getStatus() == 4) {
-            bottom_btn_layout.setVisibility(View.GONE);
-        }
-
-        switch (taskEty.getTask_type()) {
-            case 1000://连续任务
-                if (taskEty.isAppAutoCommitTask()) {
-                    setBottomState2();
-                    setBottomState();
-                } else {//非应用自动审核的连续任务
-                    setSuccessionTaskBottomState();
-                }
-                break;
-            default:
-                setBottomState2();
-                break;
-        }
-        if (gettaskAcceptedEty != null){//只要有任务记录就获取下载状态
-            switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
-                case 4://h5业务
-                case 2:
-                case 1001:
                 case 1000://连续任务
+                    setFirstBtnState();
+                    break;
+                case 1002:
+                case 1003:
+                case 1004://游戏任务
+                    setFirstBtnState();
                     break;
-                default://只要有任务记录就获取下载状态
-                    setBottomState();
+                default://试玩任务直接设置下载状态
+                    setFirstBtnState();
+                    if (type == DownloadTaskService.STATUS_INSTALLED && gettaskAcceptedEty != null) {//已经安装并且有任务记录的情况下
+                        if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
+                        } else {//提交过一次，但是审核失败或者没有审核就下线了
+                            String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
+                            btnUpImag.setText(Html.fromHtml(sr));
+                            btnUpImag.setVisibility(View.VISIBLE);
+                            btnTaskItem.setVisibility(View.GONE);
+                        }
+                    }
                     break;
             }
+        } else {//任务未下线
+            if(gettaskAcceptedEty == null) {//无任务记录-->显示领取任务按钮
+                btnUpImag.setVisibility(View.GONE);//不显示第二按钮
+                btnTaskItem.setText(CommonUtil.GET_TASK);
+            } else {//有任务记录
+                switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
+                    case 4://h5业务
+                        type = TASK_TYPE_H5;
+                        btnTaskItem.setText(CommonUtil.START_TASK);
+                        break;
+                    case 2:
+                    case 1001://信用卡与畅思任务不考虑
+                        bottom_btn_layout.setVisibility(View.GONE);
+                        break;
+                    case 1002:
+                    case 1003:
+                    case 1004://游戏任务
+                        if(taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载任务(预约任务)-->预约游戏
+                            type = TASK_TYPE_RESERVATION;
+                            btnTaskItem.setText(CommonUtil.GAME_RESERVATION);
+                            btnUpImag.setVisibility(View.GONE);//不显示第二按钮
+                        } else {//游戏任务中可以下载的预约任务
+                            setFirstBtnState();
+                            setGameTaskFirstBtnState();
+                        }
+                        break;
+                    default://其它任务先设置下载状态
+                        setFirstBtnState();
+                        setOtherTaskBtnState();
+                        break;
+                }
+            }
         }
     }
 
     /**
-     * 设置非自动审核的连续任务底部按钮的状态
+     * 设置自动审核的连续任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
+     * 注：前提是gettaskAcceptedEty不为空哦
+     */
+    private void setAutoSuccessionTaskBottomState() {
+        boolean hasChildRunning = taskEty.hasChildRunning();//有子任务正在进行
+        boolean hasChildCanAccepted = taskEty.hasChildCanAccepted();//有子任务处于可领取状态
+
+        if (hasChildRunning) {//有子任务正在进行
+        } else if (hasChildCanAccepted) {//有子任务处于可领取状态
+            btnUpImag.setVisibility(View.GONE);
+            btnTaskItem.setText(CommonUtil.GET_TASK);//可以领取子任务
+            type = TASK_TYPE_INIT;
+        } else {//不能上传截图则不显示第二按钮
+            btnUpImag.setVisibility(View.GONE);
+        }
+    }
+    /**
+     * 设置非自动审核的连续任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
+     * 注：前提是gettaskAcceptedEty不为空哦
      */
     private void setSuccessionTaskBottomState() {
         int failChildPosition = taskEty.getFailChildPosition();//获取第一个审核失败子任务的位置
@@ -377,132 +410,96 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         boolean hasChildRunning = taskEty.hasChildRunning();//有子任务正在进行
         boolean hasChildCanAccepted = taskEty.hasChildCanAccepted();//有子任务处于可领取状态
 
-        if (!hasChildFail && !hasChildRunning && hasChildCanAccepted) {//没有审核失败的子任务和正在进行的子任务且有子任务处于可领取状态
-            bottom_btn_layout.setVisibility(View.VISIBLE);
-            btnTaskItem.setVisibility(View.VISIBLE);
-            btnUpImag.setVisibility(View.GONE);
-            btnTaskItem.setEnabled(true);
-            btnTaskItem.setText("领取任务");
-        } else if (hasChildRunning) {//有子任务正在进行
-            bottom_btn_layout.setVisibility(View.VISIBLE);
-            btnTaskItem.setVisibility(View.VISIBLE);
-            btnUpImag.setVisibility(View.VISIBLE);
-            btnTaskItem.setEnabled(true);
-            btnTaskItem.setText(CommonUtil.START_PLAY);
-            btnUpImag.setEnabled(true);
-            btnUpImag.setText("上传截图");
-
-            setBottomState();
-        } else if (hasChildFail) {
-            bottom_btn_layout.setVisibility(View.VISIBLE);
-            btnTaskItem.setVisibility(View.VISIBLE);
-            btnUpImag.setVisibility(View.VISIBLE);
-            btnTaskItem.setEnabled(true);
-            btnTaskItem.setText(CommonUtil.START_PLAY);
-
-            setBottomState();
-        } else {
-            setBottomState2();
-        }
         if (hasChildFail) {
             btnUpImag.setText(String.format(Locale.CHINA, "重新上传截图（第%d天）", failChildPosition + 1));
+        } else if (hasChildRunning) {//有子任务正在进行
+            btnUpImag.setText("上传截图");
+        } else if (hasChildCanAccepted) {//有子任务处于可领取状态
+            btnUpImag.setVisibility(View.GONE);
+            btnTaskItem.setText(CommonUtil.GET_TASK);//可以领取子任务
+            type = TASK_TYPE_INIT;
+        } else {//不能上传截图则不显示第二按钮
+            btnUpImag.setVisibility(View.GONE);
         }
     }
 
     /**
-     * 根据TaskAcceptedEty中的status来设置底部两个按钮的状态
+     * 设置连续任务与试玩任务两个按钮状态（任务未下线且有任务记录）
+     * 注：前提是gettaskAcceptedEty不为空哦
      */
-    private void setBottomState2() {
-        if (gettaskAcceptedEty != null) {// && taskEty.getTask_type() == 1000) {//连续任务
-            if (!TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
-                //                detailTaskTv.setVisibility(View.VISIBLE);//不显示截图
-            }
-            switch (gettaskAcceptedEty.getStatus()) {
-                case 1://"已接受任务";
-                case 2:// "正在进行中";
-                case 9:// "至少完成一个任务了";
-                    break;
-                case 6:
-                    //审核失败
-                    btnUpImag.setText("重新提交");
-                    btnUpImag.setVisibility(View.VISIBLE);
-                    btnTaskItem.setVisibility(View.VISIBLE);
-                    break;
-                //不可操作
-                case 7:// "提交审核";
-                    bottom_btn_layout.setVisibility(View.GONE);
-                    break;
-                case 3://完成任务
-                    if (!taskEty.isGameTask())
-                        bottom_btn_layout.setVisibility(View.GONE);
-                    break;
-                case 8://任务已经下线
-                    if (TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots()) || gettaskAcceptedEty.getLower_num() > 0) {//没有提交过截图或者已经提交过一次 下线失败后提交
+    private void setOtherTaskBtnState() {
+        switch (taskEty.getInspect_type()) {// 1自动审核　2手动审核 3,应用自动审核
+            case 1:
+                btnUpImag.setVisibility(View.GONE);
+                break;
+            case 2:
+                switch (type){
+                    case DownloadTaskService.STATUS_INIT:
+                    case DownloadTaskService.STATUS_FINISH:
+                        btnUpImag.setVisibility(View.GONE);
                         break;
-                    } else {//提交过一次，但是审核失败或者没有审核就下线了
-                        String sr = "重新提交（<font color='#e2271d'><big>最后一次机会</big></font>）";
-                        btnUpImag.setText(Html.fromHtml(sr));
-                        btnUpImag.setVisibility(View.VISIBLE);
-                        btnTaskItem.setVisibility(View.GONE);
+                    default:
+                        if(taskEty.getTask_type() == 1000)//连续任务
+                            setSuccessionTaskBottomState();
+                        else if(gettaskAcceptedEty.getStatus() == 6) {//试玩任务审核失败可以重新提交
+                            btnUpImag.setText("重新提交");
+                        }
                         break;
-                    }
-            }
-            if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
-                btnUpImag.setText("即将开放");
-                btnUpImag.setEnabled(false);
-                btnUpImag.setVisibility(View.VISIBLE);
-                btnTaskItem.setVisibility(View.GONE);
-            }
+                }
+                break;
+            case 3:
+                btnUpImag.setText("领取奖励");
+                switch (type){
+                    case DownloadTaskService.STATUS_INIT:
+                    case DownloadTaskService.STATUS_FINISH:
+                        btnUpImag.setVisibility(View.GONE);
+                        break;
+                    default:
+                        if(taskEty.getTask_type() == 1000)//连续任务
+                            setAutoSuccessionTaskBottomState();
+                        break;
+                }
+                break;
+        }
+    }
+
+    /**
+     * 设置游戏任务中两个按钮的状态和文字显示（任务未下线且有任务记录）
+     * 注：前提是gettaskAcceptedEty不为空哦
+     */
+    private void setGameTaskFirstBtnState() {
+        switch (type) {
+            case DownloadTaskService.STATUS_INIT:
+                btnUpImag.setVisibility(View.GONE);
+                btnTaskItem.setText(CommonUtil.GAME_DOWNLOAD);
+                break;
+            case DownloadTaskService.STATUS_FINISH:
+                btnUpImag.setVisibility(View.GONE);
+                btnTaskItem.setText(CommonUtil.GAME_INSTALL);
+                break;
+            case DownloadTaskService.STATUS_INSTALLED:
+                if (gettaskAcceptedEty.getStatus() == 3) {
+                    btnUpImag.setText(CommonUtil.GAME_RECHAGE);
+                    btnUpImag.setVisibility(View.VISIBLE);
+                    btnTaskItem.setText("启动游戏");
+                } else {
+                    btnTaskItem.setVisibility(View.GONE);
+                    btnUpImag.setText("领取奖励");
+                }
+                break;
+
         }
     }
 
     /**
-     * 正在进行的任务的状态设置
+     * 设置第一按钮的状态和文字显示
      */
-    private void setBottomState() {
+    private void setFirstBtnState() {
         setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>() {
             @Override
             public void call(Object o) {
                 if (o instanceof Integer) {
                     type = (int) o;
-                    if (taskEty.isGameTask()) {//游戏任务
-                        switch (type) {
-                            case DownloadTaskService.STATUS_INIT:
-                                btnUpImag.setVisibility(View.GONE);
-                                btnTaskItem.setText(CommonUtil.GAME_DOWNLOAD);
-                                break;
-                            case DownloadTaskService.STATUS_FINISH:
-                                btnUpImag.setVisibility(View.GONE);
-                                btnTaskItem.setText(CommonUtil.GAME_INSTALL);
-                                break;
-                            case DownloadTaskService.STATUS_INSTALLED:
-                                if (gettaskAcceptedEty.getStatus() == 3) {
-                                    btnUpImag.setText(CommonUtil.GAME_RECHAGE);
-                                    btnUpImag.setVisibility(View.VISIBLE);
-                                    btnTaskItem.setText("启动游戏");
-                                } else {
-                                    btnTaskItem.setVisibility(View.GONE);
-                                    btnUpImag.setText("领取奖励");
-                                }
-                                break;
-
-                        }
-                    } else {
-                        switch (taskEty.getInspect_type()) {// 1自动审核　2手动审核 3,应用自动审核
-                            case 1:
-                                btnUpImag.setVisibility(View.GONE);
-                                break;
-                            case 2:
-                                if (type == DownloadTaskService.STATUS_INIT)
-                                    btnUpImag.setVisibility(View.GONE);
-                                break;
-                            case 3:
-                                if (type != DownloadTaskService.STATUS_INSTALLED)
-                                    btnUpImag.setVisibility(View.GONE);
-                                btnUpImag.setText("领取奖励");
-                                break;
-                        }
-                    }
                 } else if (o instanceof String) {
                     btnTaskItem.setText((String) o);
                 } else if (o instanceof Boolean) {
@@ -510,9 +507,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 }
             }
         });
-        if(gettaskAcceptedEty == null){
-            btnTaskItem.setText("领取任务");
-        }
     }
 
     private void loadOld() {
@@ -559,25 +553,30 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         action1.call(true);
         if (isInstalled) {
             action1.call(DownloadTaskService.STATUS_INSTALLED);
-            if (taskEty.getTask_type() == 3) {//应用
-                buttonStr = CommonUtil.OPEN_APPLY;
-            } else {
-                buttonStr = CommonUtil.START_PLAY;
+            switch (taskEty.getTask_type()){// 1时间试玩任务 3应用下载 1000连续任务， 1002 1003游戏任务 1002平台游戏，1003 腾讯游戏，1004 小米游戏
+                case 3:
+                    buttonStr = CommonUtil.OPEN_APPLY;
+                    break;
+                default:
+                    buttonStr = CommonUtil.GAME_OPEN;
+                    break;
             }
         } else {
-            action1.call(DownloadTaskService.STATUS_INIT);
             if (taskEty.getDownload_link() == null || !taskEty.getDownload_link().startsWith("http")) {
                 buttonStr = SheepApp.getInstance().getResources().getString(R.string.error_download_link);
                 action1.call(false);
+                action1.call(DownloadTaskService.STATUS_INIT);
             } else {
                 DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
                 Integer mStatus = downLoadInfo.getMStatus();
                 int taskState = mStatus == null ? 0 : mStatus;
                 switch (taskState) {
                     case DownloadTaskService.STATUS_ING:
+                        action1.call(DownloadTaskService.STATUS_INIT);
                         buttonStr = Math.abs(downLoadInfo.getMPercent()) + "%";
                         break;
                     case DownloadTaskService.STATUS_PAUSE:
+                        action1.call(DownloadTaskService.STATUS_INIT);
                         buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
                         break;
                     case DownloadTaskService.STATUS_FINISH:
@@ -585,13 +584,16 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             action1.call(DownloadTaskService.STATUS_FINISH);
                             buttonStr = CommonUtil.START_INSTALL;
                         } else {
+                            action1.call(DownloadTaskService.STATUS_INIT);
                             buttonStr = CommonUtil.START_DOWNLOAD;
                         }
                         break;
                     case DownloadTaskService.STATUS_FAIL:
+                        action1.call(DownloadTaskService.STATUS_INIT);
                         buttonStr = CommonUtil.FAIL_DOWNLOAD;
                         break;
                     default:
+                        action1.call(DownloadTaskService.STATUS_INIT);
                         buttonStr = CommonUtil.START_DOWNLOAD;
                         break;
                 }
@@ -617,119 +619,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         try {
             switch (view.getId()) {
                 case R.id.detail_task_tv://查看任务截图
-                    if (taskEty.isGameTask() && taskEty.isCan_receive_account()) {
-
-                        GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
-                        CommonUtil.getInstance()
-                                .gameAccountManager(activity, Integer.parseInt(taskReleaseEty.getTask_id()), new Action1<BaseMessage>() {
-                                    @Override
-                                    public void call(BaseMessage baseMessage) {
-                                        G.showToast("领取成功");
-                                        initData();
-                                    }
-                                });
-                        return;
-                    }
-                    if (gettaskAcceptedEty == null || TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
-                        G.showToast("任务截图为空");
-                        return;
-                    }
-                    Jump2View.getInstance().showImgs(activity, 0, gettaskAcceptedEty.getScreenshots());
+                    lookScreenShot();
                     break;
                 case R.id.web_text:
                     break;
                 case R.id.ll_infos:
                     break;
                 case R.id.btn_task_item:
-                    if(type != 10 && gettaskAcceptedEty == null){
-                        type = -1;
-                    }
-                    switch (type) {
-                        case -1:
-                            if (taskReleaseEty.getAccepted_task_id() > 0) {
-                                Jump2View.getInstance()
-                                        .goNoticeAct(activity, new DialogEntity(null,
-                                                "是否放弃正在运行中的任务?",
-                                                "是",
-                                                "否",
-                                                null));
-                            } else {
-                                acceptedTask();
-                            }
-                            break;
-                        case DownloadTaskService.STATUS_INIT://开始下载
-
-                            DownloadTarget task;
-                            if (TextUtils.isEmpty(taskReleaseEty.getTask().getDownload_link()) || !taskReleaseEty.getTask().getDownload_link().contains("http")) {
-                                G.showToast(R.string.error_download_link);
-                                return;
-                            }
-                            task = Aria.download(this).load(taskReleaseEty.getTask().getDownload_link());
-                            final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
-                            if (task.getTaskState() == IEntity.STATE_RUNNING) {
-                                task.stop();
-                            } else if (task.getTaskState() == IEntity.STATE_FAIL) {
-                                task.cancel(true);
-                                task.removeRecord();
-                            } else {
-                                //                            task.setFilePath(filePath);
-                                //                            task.start();
-                                mDownloadTaskService.start(downLoadInfo);
-                            }
-                            new Thread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    if (mDownloadTaskService.addDownloadTask(downLoadInfo)) {
-                                        //发送红点信息
-                                        EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
-                                    }
-                                }
-                            }).start();
-                            UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DOWNLOAD);
-                            break;
-                        case DownloadTaskService.STATUS_FINISH:
-                            ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(taskEty.getPackage_names()));
-                            break;
-                        case DownloadTaskService.STATUS_INSTALLED:
-                            PackageUtil.startApp(SheepApp.mContext, taskEty.getPackage_names());
-                            break;
-                        case 10:
-                            Ext ext;
-                            if (taskEty == null || (ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())) {
-                                G.showToast(R.string.service_data_error);
-                            } else {
-                                Jump2View.getInstance().goWeb(activity, ext.getUrl());
-                            }
-                            break;
-                    }
+                    onClickFirstBtn();
                     break;
                 case R.id.btn_up_imag:
-                    if (gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3 && taskEty.isGameTask()) {
-                        if (taskEty.getThird_task_id() != null) {
-                            ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
-                            return;
-                        }
-                    } else if (taskEty.isGameTask()) {
-                        if (taskEty.isGameReservationCantDownload()) {
-                            CommonUtil.getInstance().reservationGameTask(activity, taskReleaseEty, new Action1<Integer>() {
-                                @Override
-                                public void call(Integer integer) {
-                                    isFresh = true;
-                                    freshData();
-                                }
-                            });
-                        } else {
-                            accepteReceiveAward();
-                        }
-                    } else if (taskEty.getInspect_type() == 3) {//应用自动审核任务
-                        try {
-                            checkAndCommitTask();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    } else {//截图任务
-                        commitScreenShot();
-                    }
+                    onClickSecondBtn();
                     break;
                 case R.id.detail_share_friend_tv:
                     Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
@@ -756,6 +656,124 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
+     * 查看截图
+     */
+    private void lookScreenShot() {
+        if (taskEty.isGameTask() && taskEty.isCan_receive_account()) {
+
+            GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
+            CommonUtil.getInstance()
+                    .gameAccountManager(activity, Integer.parseInt(taskReleaseEty.getTask_id()), new Action1<BaseMessage>() {
+                        @Override
+                        public void call(BaseMessage baseMessage) {
+                            G.showToast("领取成功");
+                            initData();
+                        }
+                    });
+            return;
+        }
+        if (gettaskAcceptedEty == null || TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
+            G.showToast("任务截图为空");
+            return;
+        }
+        Jump2View.getInstance().showImgs(activity, 0, gettaskAcceptedEty.getScreenshots());
+    }
+
+    /**
+     * 点击第二按钮
+     */
+    private void onClickSecondBtn() {
+        if (gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3 && taskEty.isGameTask()) {
+            if (taskEty.getThird_task_id() != null) {
+                ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
+            }
+        } else if (taskEty.isGameTask()) {
+            if (taskEty.isGameReservationCantDownload()) {
+                CommonUtil.getInstance().reservationGameTask(activity, taskReleaseEty, new Action1<Integer>() {
+                    @Override
+                    public void call(Integer integer) {
+                        isFresh = true;
+                        freshData();
+                    }
+                });
+            } else {
+                accepteReceiveAward();
+            }
+        } else if (taskEty.getInspect_type() == 3) {//应用自动审核任务
+            try {
+                checkAndCommitTask();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {//截图任务
+            commitScreenShot();
+        }
+    }
+
+    /**
+     * 点击第一按钮
+     */
+    private void onClickFirstBtn() {
+        switch (type) {
+            case TASK_TYPE_INIT:
+                if (taskReleaseEty.getAccepted_task_id() > 0) {
+                    Jump2View.getInstance()
+                            .goNoticeAct(activity, new DialogEntity(null,
+                                    "是否放弃正在运行中的任务?",
+                                    "是",
+                                    "否",
+                                    null));
+                } else {
+                    acceptedTask();
+                }
+                break;
+            case DownloadTaskService.STATUS_INIT://开始下载
+                DownloadTarget task;
+                if (TextUtils.isEmpty(taskReleaseEty.getTask().getDownload_link()) || !taskReleaseEty.getTask().getDownload_link().contains("http")) {
+                    G.showToast(R.string.error_download_link);
+                    return;
+                }
+                task = Aria.download(this).load(taskReleaseEty.getTask().getDownload_link());
+                final DownLoadInfo downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
+                if (task.getTaskState() == IEntity.STATE_RUNNING) {
+                    task.stop();
+                } else if (task.getTaskState() == IEntity.STATE_FAIL) {
+                    task.cancel(true);
+                    task.removeRecord();
+                } else {
+                    //                            task.setFilePath(filePath);
+                    //                            task.start();
+                    mDownloadTaskService.start(downLoadInfo);
+                }
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mDownloadTaskService.addDownloadTask(downLoadInfo)) {
+                            //发送红点信息
+                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.TIPS_DOWN_ICON));
+                        }
+                    }
+                }).start();
+                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DOWNLOAD);
+                break;
+            case DownloadTaskService.STATUS_FINISH:
+                ApkUtils.installApk(SheepApp.mContext, PackageUtil.isExistsFile(taskEty.getPackage_names()));
+                break;
+            case DownloadTaskService.STATUS_INSTALLED:
+                PackageUtil.startApp(SheepApp.mContext, taskEty.getPackage_names());
+                break;
+            case TASK_TYPE_H5://h5任务跳转h5页面
+                Ext ext;
+                if (taskEty == null || (ext = EntityUtils.getExtInfo(taskEty.getExt())) == null || TextUtils.isEmpty(ext.getUrl())) {
+                    G.showToast(R.string.service_data_error);
+                } else {
+                    Jump2View.getInstance().goWeb(activity, ext.getUrl());
+                }
+                break;
+        }
+    }
+
+    /**
      * 发起选择图片来上传截图
      */
     private void commitScreenShot() {
@@ -793,19 +811,18 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             JSONObject object = new JSONObject();
             object.put("gps", gps);
 
-            long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(taskEty.getPackage_names());
-
+            final long runTime = AppUsageManager.getInstance().getTotalTimeInForeground(taskEty.getPackage_names());
             if (runTime <= 0) {//时间小于等于0则不提交
-                G.showToast("该任务时长未达到，请继续去体验应用哦！");
+                G.showToast("该任务时长未达到，请继续去体验应用哦！"+(TestUtil.isTest()?"时长为："+runTime+"毫秒":""));
                 return;
             }
-
             MyDbManager.getInstance().removeAppRecord();//删除记录表 5.0及以下使用
             AutoTaskListUtil.getInstance().resetReceiveTaskTime();//重置比对时间  5.1及以上使用
+            AppUsageManager.getInstance().needOpenLookAppUsageStatsPermisson(true);//重新保存应用使用情况的数据
 
             object.put("task_time", runTime / 1000);
             object.put("release_task_id", taskReleaseEty.getId());
-            addTaskChildId(object, taskEty);
+            addCanCommitTaskChildId(object, taskEty);
             SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
@@ -813,6 +830,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         @Override
                         public void onNext(BaseMessage baseMessage) {
                             CommonUtil.getInstance().setTAskEnty(null);
+                            //这里领取了奖励，要刷新用户信息
+                            CommonUtil.getInstance().updateUserInfo(null);
                             String amount = taskReleaseEty.getBonus();
                             try {
                                 Map h = JSON.parseObject(baseMessage.getData() + "");
@@ -828,9 +847,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                         @Override
                         public void onError(BaseMessage baseMessage) {
-                            G.showToast("该任务时长未达到，请继续去体验应用哦！");
-                            //时间重置
-                            MyDbManager.getInstance().retAppUsageTime(taskEty.getPackage_names());
+                            G.showToast("该任务时长未达到，请继续去体验应用哦！"+(TestUtil.isTest()?"时长为："+runTime/1000+"秒":""));
                         }
                     });
         } else {
@@ -839,23 +856,34 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
-     * 添加子任务id参数
+     * 连续任务在自动审核任务领取任务时添加子任务id参数
      *
      * @param object
      * @param taskEty
      */
-    private void addTaskChildId(JSONObject object, TaskEty taskEty) {
+    private void addCanAcceptedTaskChildId(JSONObject object, TaskEty taskEty) {
         switch (taskEty.getTask_type()) {
             case 1000://连续任务
                 int task_child_id = taskEty.getCanAcceptedChildId();
-                if (task_child_id < 1) {
-                    G.showToast("暂无可以领取的任务");
-                    return;
-                }
                 object.put("task_child_id", task_child_id);
                 break;
         }
     }
+    /**
+     * 连续任务在自动审核任务领取奖励时添加子任务id参数
+     *
+     * @param object
+     * @param taskEty
+     */
+    private void addCanCommitTaskChildId(JSONObject object, TaskEty taskEty) {
+        switch (taskEty.getTask_type()) {
+            case 1000://连续任务
+                TaskChild task_child = taskEty.getCanCommitChild(TaskEty.STATUS_RUNNING);
+                if(task_child != null)
+                    object.put("task_child_id", task_child.getId());
+                break;
+        }
+    }
 
     /**
      * 任务进度
@@ -914,6 +942,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
+        //这里领取了奖励，要刷新用户信息
+        CommonUtil.getInstance().updateUserInfo(null);
         if (DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案：上传截图成功后删除之前的截图
             DataUtil.getInstance().clearScreenShots();
         }
@@ -1041,7 +1071,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         JSONObject object = new JSONObject();
         object.put("device_id", DeviceUtil.getDeviceId(activity));
         object.put("release_task_id", taskReleaseEty.getId());
-        addTaskChildId(object, taskEty);
+        addCanAcceptedTaskChildId(object, taskEty);
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()
@@ -1306,6 +1336,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
 //                        G.showToast(taskReleaseEty.getBonus() + "元");
+                        //这里领取了奖励，要刷新用户信息
+                        CommonUtil.getInstance().updateUserInfo(null);
                         ViewUtil.showMsgDialog(activity,
                                 "恭喜你获得" + taskReleaseEty.getBonus() + "元奖励",
                                 "提示",

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskList.java

@@ -80,7 +80,7 @@ public class DialogNewbieTaskList {
                         if(activity instanceof BaseActivity){
                             ((BaseActivity) activity).hideProgress();
                         }
-                        G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
+                        G.showToast(baseMessage);
                     }
                 });
     }

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

@@ -68,7 +68,6 @@ public class FgtMainAudit extends BaseCompatFragment {
         mAdapter.add(FgtAudit.newInstance(3), tabNames[2]);
         pager.setAdapter(mAdapter);
         new_tab();
-        initData();
 
         my_money_dingxiang_amount_iv.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -91,7 +91,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(!ListUtil.isEmpty(releaseEtyListsBegin))
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin));
         tryMakeMoneyAdp.refreshAdapter();
-        boolean showEmpty = tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
+        boolean showEmpty = acceptedEtyList.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
         LogUtil.println("showEmpty", showEmpty);
         CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
         refresh.setRefreshing(false);
@@ -213,7 +213,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         DataUtil.getInstance().isTaskListChange(getClass());
         isFirstCache = false;
         if(TextUtils.isEmpty(show_type))
-            refresh.setRefreshing(true);
+            if(refresh != null)
+                refresh.setRefreshing(true);
         mInitData();
     }
     public void mInitData() {

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_light"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout

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

@@ -4,8 +4,7 @@
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/content_padding_10"
     android:paddingStart="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10"
-    android:background="@color/bg_gray">
+    android:paddingEnd="@dimen/content_padding_10">
 
     <include
         android:id="@+id/empty_view"

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bottom_line"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:layout_margin="@dimen/content_padding_20"
+    android:padding="@dimen/content_padding_20"
     android:orientation="horizontal">
 
     <ImageView
@@ -14,6 +15,7 @@
         android:src="@mipmap/bottom_icon"/>
 
     <TextView
+        android:id="@+id/bottom_line_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/content_padding"

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

@@ -1,172 +1,172 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:clipChildren="true"
-    android:background="@color/bg_gray">
-
-    <!--<com.flipboard.bottomsheet.BottomSheetLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:fitsSystemWindows="true">-->
+    android:background="@color/white"
+    android:clipChildren="true">
 
     <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-    <com.sheep.gamegroup.util.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:layout_gravity="fill_vertical"
-        android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-        <LinearLayout
+
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            android:fillViewport="true"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <include
-                layout="@layout/homepage_item_top2"
-                android:visibility="gone"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-            <include
-                layout="@layout/check_net_view"/>
+                <include
+                    layout="@layout/homepage_item_top2"
+                    android:visibility="gone" />
 
-            <include
-                layout="@layout/homepage_item_banner"/>
+                <include layout="@layout/check_net_view" />
 
-            <include
-                layout="@layout/homepage_item_gridview_listview"
-                android:visibility="visible"/>
+                <include layout="@layout/homepage_item_banner" />
 
-            <include
-                layout="@layout/homepage_item_notice_and_currenttime"/>
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="visible" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="10dp"
-                android:background="#fff5f5f5"/>
+                <include layout="@layout/homepage_item_notice_and_currenttime" />
 
-            <include
-                layout="@layout/homepage_item_get_award"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#fff5f5f5"/>
-
-            <include
-                layout="@layout/homepage_item_notice"
-                android:visibility="gone"/>
-            <include
-                layout="@layout/homepage_item_currenttime_reward"
-                android:visibility="gone"/>
-
-            <include
-                layout="@layout/homepage_item_4module"
-                android:visibility="gone"/>
-
-            <include
-                layout="@layout/homepage_item_liy_q"
-                android:visibility="gone"/>
-            <include
-                layout="@layout/homepage_item_gridview_listview"
-                android:visibility="gone"/>
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/content_padding_10"
-                android:paddingRight="@dimen/content_padding_10"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="#fff5f5f5" />
 
-            <View
-                android:id="@+id/recyclerview_line"
-                android:layout_width="match_parent"
-                android:layout_height="10dp"
-                android:layout_marginBottom="@dimen/content_padding_8"
-                android:layout_marginTop="@dimen/content_padding_8"
-                android:background="#fff5f5f5"
-                android:visibility="gone"/>
+                <include layout="@layout/homepage_item_get_award" />
 
-            <!--选项卡-->
-            <include
-                layout="@layout/tablayout_viewpager_layout"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="#fff5f5f5" />
 
-        </LinearLayout>
+                <include
+                    layout="@layout/homepage_item_notice"
+                    android:visibility="gone" />
 
-    </com.sheep.gamegroup.util.NestedScrollView>
-    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+                <include
+                    layout="@layout/homepage_item_currenttime_reward"
+                    android:visibility="gone" />
+
+                <include
+                    layout="@layout/homepage_item_4module"
+                    android:visibility="gone" />
 
-    <!--</com.flipboard.bottomsheet.BottomSheetLayout>-->
+                <include
+                    layout="@layout/homepage_item_liy_q"
+                    android:visibility="gone" />
+
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="gone" />
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recyclerview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/content_padding_10"
+                    android:paddingRight="@dimen/content_padding_10" />
+
+                <View
+                    android:id="@+id/recyclerview_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:layout_marginBottom="@dimen/content_padding_8"
+                    android:layout_marginTop="@dimen/content_padding_8"
+                    android:background="#fff5f5f5"
+                    android:visibility="gone" />
+
+                <!--选项卡-->
+                <include layout="@layout/tablayout_viewpager_layout" />
+
+                <include layout="@layout/find_item_bottom"/>
+
+            </LinearLayout>
+
+        </android.support.v4.widget.NestedScrollView>
+    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/newbie_task"
         android:layout_width="40dp"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_alignParentEnd="true"
         android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
         android:visibility="gone">
+
         <ImageView
             android:id="@+id/bg_newbie_task"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:scaleType="fitXY"
-            android:adjustViewBounds="true"/>
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
     </com.kfzs.duanduan.view.DragRelativeLayout>
+
     <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/view_rob_duty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/content_padding_10"
-        android:paddingBottom="@dimen/content_padding_10"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_alignParentEnd="true"
         android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
         android:visibility="visible">
+
         <ImageView
             android:id="@+id/iv_rob_duty"
             android:layout_width="55dp"
             android:layout_height="45dp"
+            android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:src="@mipmap/red_package_floatbtn"
-            android:adjustViewBounds="true"/>
+            android:src="@mipmap/red_package_floatbtn" />
     </com.kfzs.duanduan.view.DragRelativeLayout>
+
     <TextView
         android:id="@+id/test_change_user"
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
         android:text="切换账号"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <TextView
         android:id="@+id/test_change"
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
         android:layout_above="@+id/test_change_user"
         android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
         android:text="切换服务器"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="@dimen/content_padding_10"
+    android:layout_margin="@dimen/content_padding_10"
     android:paddingBottom="@dimen/content_padding_10"
-    android:layout_margin="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/homepage_item_get_award_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/homepage_item_jiangli"
-        android:paddingTop="@dimen/content_padding_2"/>
+        android:layout_marginStart="5dp"
+        android:paddingTop="@dimen/content_padding_2"
+        android:src="@mipmap/homepage_item_jiangli" />
 
     <TextView
         android:id="@+id/homepage_item_get_award_name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/common_margin_10"
         android:text="你还有329元的奖励未领取"
         android:textColor="@color/black_333333"
         android:textSize="@dimen/text_size_3"
-        app:layout_constraintLeft_toRightOf="@id/homepage_item_get_award_iv"
-        android:layout_marginLeft="@dimen/common_margin_10"/>
+        app:layout_constraintLeft_toRightOf="@id/homepage_item_get_award_iv" />
 
     <TextView
         android:id="@+id/homepage_item_money_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=""
-        app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
-        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
+        android:text=""
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_1"/>
+        android:textSize="11sp"
+        app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
+        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv" />
 
     <TextView
         android:id="@+id/homepage_item_juan_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=""
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
+        android:layout_marginEnd="2dp"
+        android:text=""
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_1"/>
+        android:textSize="11sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv" />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
     android:paddingLeft="@dimen/content_padding_10"
     android:paddingTop="@dimen/content_padding_10"
     android:paddingRight="@dimen/content_padding_10">

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

@@ -7,8 +7,7 @@
     android:background="@color/white"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:padding="@dimen/content_padding_small"
-    android:visibility="gone">
+    android:padding="@dimen/content_padding_small">
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -3,68 +3,75 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/notice_currenttime_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="55dp"
-        android:minWidth="55dp"
-        android:src="@mipmap/homepage_mianyangtt"/>
+        android:layout_centerVertical="true"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="5dp"
+        android:src="@mipmap/homepage_mianyangtt" />
 
     <LinearLayout
         android:id="@+id/homepage_notice_layout"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
+        android:layout_toRightOf="@+id/notice_currenttime_iv"
+        android:gravity="center"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="【公告】"/>
+            android:text="【公告】"
+            android:textColor="#666666"
+            android:textSize="11sp" />
+
         <com.sunfusheng.marqueeview.MarqueeView
             android:id="@+id/homepage_item_notice_mv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/content_padding_10"
+            android:minHeight="20dp"
             android:paddingEnd="@dimen/content_padding_10"
-            android:minHeight="30dp"
+            android:paddingStart="@dimen/content_padding_10"
             app:mvAnimDuration="1000"
             app:mvDirection="bottom_to_top"
             app:mvInterval="3000"
+            app:mvSingleLine="true"
             app:mvTextColor="@color/white"
-            app:mvTextSize="14sp"
-            app:mvSingleLine="true" />
+            app:mvTextSize="11sp" />
     </LinearLayout>
+
     <LinearLayout
-        android:layout_below="@+id/homepage_notice_layout"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
+        android:layout_below="@+id/homepage_notice_layout"
+        android:layout_toRightOf="@+id/notice_currenttime_iv"
+        android:gravity="center"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="【动态】"/>
+            android:text="【动态】"
+            android:textColor="#666666"
+            android:textSize="11sp" />
+
         <com.sunfusheng.marqueeview.MarqueeView
             android:id="@+id/upview1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/content_padding_10"
+            android:minHeight="20dp"
             android:paddingEnd="@dimen/content_padding_10"
-            android:minHeight="30dp"
+            android:paddingStart="@dimen/content_padding_10"
             app:mvAnimDuration="1000"
             app:mvDirection="bottom_to_top"
             app:mvInterval="3000"
+            app:mvSingleLine="true"
             app:mvTextColor="@color/white"
-            app:mvTextSize="14sp"
-            app:mvSingleLine="true" />
+            app:mvTextSize="14sp" />
     </LinearLayout>
 
 

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

@@ -16,7 +16,7 @@
             android:layout_height="@dimen/content_padding_65"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="120dp"
-            android:src="@mipmap/understand_sheep_b" />
+            android:src="@drawable/loading_01" />
 
         <TextView
             android:id="@+id/tv_duty_title"

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

@@ -2,12 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:paddingLeft="@dimen/content_padding_20"
-    android:paddingRight="@dimen/content_padding_20"
-    android:layout_marginBottom="@dimen/content_padding_10"
-    android:layout_marginLeft="@dimen/content_padding_10"
-    android:layout_marginRight="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingBottom="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/icon_iv"

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

@@ -3,25 +3,23 @@
     android:id="@+id/item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_marginBottom="12dp">
+    android:layout_marginBottom="12dp"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/item_title_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="13dp"
         android:text="推荐"
         android:textColor="@color/black"
         android:textSize="15dp"
-        android:layout_marginBottom="13dp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/release_task_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/content_padding_4"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-
-    </android.support.v7.widget.RecyclerView>
+        android:paddingBottom="@dimen/content_padding_4" />
 
 </LinearLayout>

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

@@ -1,8 +1,7 @@
 <?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="match_parent"
-    android:background="@color/bg_gray">
+    android:layout_height="match_parent">
 
     <include
         android:id="@+id/title"
@@ -13,22 +12,23 @@
         layout="@layout/empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/title" />
+        android:layout_below="@+id/title"
+        android:layout_marginTop="100dp" />
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/content_padding_13"
-        android:layout_below="@+id/title">
+        android:layout_below="@+id/title"
+        android:paddingStart="@dimen/content_padding_16"
+        android:paddingEnd="@dimen/content_padding_16">
 
         <ListView
             android:id="@+id/withdrawal_listview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/title"
-            android:divider="@color/transparent"
-            android:dividerHeight="@dimen/content_padding_10"
+            android:divider="@color/gray_F5F5F5"
+            android:dividerHeight="1dp"
             android:listSelector="@color/transparent"
             android:scrollbars="none" />
 

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

@@ -23,8 +23,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:text="内容"
-    android:textSize="@dimen/text_size_12"
-    android:textColor="#7F7F7F"
+    android:textColor="#666666"
+    android:textSize="11sp"
     android:gravity="center_vertical"
     android:ellipsize="marquee"
     android:singleLine="true" />