task ui small tune up

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

@@ -415,6 +415,9 @@ public class Release_task implements Serializable, MultiItemEntity {
         return NumberFormatUtils.retainMost2W(bonus);
     }
 
+    public String getVIPBonusText() {
+        return NumberFormatUtils.retainMost2W(vip_bonus);
+    }
 
     public String getCashOrWelfare() {
         if(isShop()){

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -241,6 +242,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     StandardGSYVideoPlayer videoPlayerView;
     @BindView(R.id.about_merchandise_tile)
     View about_merchandise_tile;
+    @BindView(R.id.most_discount_tag)
+    TextView most_discount_tag;
     @BindView(R.id.most_discount_tv)
     TextView most_discount_tv;
     @BindView(R.id.watch_video_tag)
@@ -259,10 +262,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     View recharge_game_bar;
     @BindView(R.id.watch_video_bar)
     View watch_video_bar;
+    @BindView(R.id.ignore_video_btn)
+    View ignore_video_btn;
 
     //是否需要在onResume中刷新页面
     private boolean isFresh = false;
     private boolean isDownloadImmeditely = false;
+    private boolean autoAcceptTask = true;
 
     @Override
     protected int getLayoutId() {
@@ -395,15 +401,24 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         ViewUtil.setVisibility(priceTv, !taskReleaseEty.isShop());
         ViewUtil.setVisibility(item_money_vip_tv, !taskReleaseEty.isShop());
         ViewUtil.setVisibility(task_detail_reward, !taskReleaseEty.isShop());
-        ViewUtil.setVisibility(about_merchandise_tile, taskReleaseEty.isShop());
-        ViewUtil.setText(most_discount_tv, "最高抵扣" + taskReleaseEty.getShop_amount() + "元");
         ViewUtil.setVisibility(watch_video_bar, taskReleaseEty.getVideo_amount() > 0);
         ViewUtil.setVisibility(recharge_game_bar, taskEty.getBenchmark() == 4);
+        ViewUtil.setVisibility(ignore_video_btn, !taskReleaseEty.isShop());
         ViewUtil.setImageRes(watch_video_ico, taskReleaseEty.getVideo_award() == 1 ? R.mipmap.icon_select : R.mipmap.text_delete);
         ViewUtil.setImageRes(recharge_game_ico, taskReleaseEty.isAuto_progress() ? R.mipmap.icon_select : R.mipmap.text_delete);
         if (taskReleaseEty.getVideo_amount() > 0) {
             ViewUtil.setText(video_task_tip, "看完教程视频，立减" + taskReleaseEty.getVideo_amount() + "元");
         }
+        ViewUtil.setText(most_discount_tag, taskReleaseEty.isShop() ? "商品抵扣" : "提现金额");
+        if(taskReleaseEty.isShop()){
+            ViewUtil.setText(most_discount_tv, "最高抵扣" + taskReleaseEty.getShop_amount() + "元");
+        } else {
+            if(DataUtil.getInstance().getUserEntity().isVIP()){
+                ViewUtil.setText(most_discount_tv, "+" + taskReleaseEty.getVIPBonusText() + "元");
+            } else {
+                ViewUtil.setText(most_discount_tv, "+" + taskReleaseEty.getBonusText() + "元");
+            }
+        }
         ViewUtil.setImage(act_hard_work_iv, R.drawable.hard_work_for_money);
         updateBottom();
     }
@@ -513,7 +528,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 btnUpImag.setVisibility(View.GONE);//不显示第二按钮
                 btnTaskItem.setText(R.string.get_task);
                 // 自动领取任务
-                acceptedTask();
+                if (autoAcceptTask) {
+                    acceptedTask();
+                    autoAcceptTask = false;
+                }
             } else {//有任务记录
                 switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
                     case TASK_TYPE_H5://h5业务
@@ -1801,10 +1819,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                                         @Override
                                         public void onNext(BaseMessage baseMessage) {
-                                            ViewUtil.setImageRes(watch_video_ico, R.mipmap.icon_select);
-                                            ViewUtil.setVisibility(video_player_layer, false);
                                         }
                                     });
+                            ViewUtil.setImageRes(watch_video_ico, R.mipmap.icon_select);
+                            ViewUtil.setVisibility(video_player_layer, false);
                         }
                     }
 

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

@@ -405,6 +405,7 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                android:id="@+id/most_discount_tag"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -638,8 +639,7 @@
                 android:layout_width="match_parent"
                 android:layout_marginLeft="24dp"
                 android:layout_marginRight="24dp"
-                android:layout_marginTop="-40dp"
-                android:layout_height="10dp"
+                android:layout_height="100dp"
                 android:layout_centerInParent="true" />
 
             <TextView