audit task update

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

@@ -428,6 +428,22 @@ public class Release_task implements Serializable, MultiItemEntity {
         return NumberFormatUtils.retainMost2W(vip_bonus);
     }
 
+    public String getShowValue(boolean isVip) {
+        if (isShop()) {
+            if (isVip) {
+                return NumberFormatUtils.retainMost2W(shop_amount * 10000) + "经验值";
+            } else {
+                return NumberFormatUtils.retainMost2W(vip_shop_amount * 10000) + "经验值";
+            }
+        } else {
+            if (isVip) {
+                return getVIPBonusText() + "元";
+            } else {
+                return getBonusText() + "元";
+            }
+        }
+    }
+
     public String getCashOrWelfare() {
         if (isShop()) {
             return "回报";

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActFind.java

@@ -21,6 +21,11 @@ public class ActFind extends BaseContainerActivity {
     public final static int FOR_GAME = 1;
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.common_container_nofit;
     }

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActDownloadManager.java

@@ -13,6 +13,12 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
  * 小绵羊3.4.10新增 -- 下载管理界面
  */
 public class ActDownloadManager extends BaseContainerActivity {
+
+    @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
     @Override
     public void initView() {
         super.initView();

app/src/main/java/com/sheep/gamegroup/module/search/ActSearch.java

@@ -60,6 +60,11 @@ public class ActSearch extends BaseContainerActivity {
     private List<SearchRecord> historyKeywords = new ArrayList<>();
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.act_search;
     }

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

@@ -89,6 +89,12 @@ public class ActArticle extends BaseActivity implements Action1<Integer> {
     //输入框
     private EditText input_comment_input;
     private WebViewVideoHelper webViewVideoHelper = new WebViewVideoHelper();
+
+    @Override
+    protected boolean showWhiteStatusBar(){
+        return true;
+    }
+
     @Override
     public void initView() {
         id = DataUtil.getObject(getIntent(), Integer.class);

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

@@ -41,6 +41,11 @@ public class ActCreditCardTaskList extends AbsChooseImageActivity {
     private TitleFragmentListAdapter mAdapter;
 
     @Override
+    protected boolean showWhiteStatusBar(){
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.act_credit_card_task_list;
     }

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

@@ -13,6 +13,11 @@ import com.sheep.gamegroup.view.fragment.FgtFootprint;
 public class ActFootprint extends BaseContainerActivity {
 
     @Override
+    protected boolean showWhiteStatusBar(){
+        return true;
+    }
+
+    @Override
     protected Fragment initFragment() {
         return new FgtFootprint();
     }

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

@@ -58,6 +58,11 @@ public class ActGiftDetail extends BaseActivity {
     }
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     public void initView() {
         TitleBarUtils.getInstance()
                 .setTitleFinish(this)

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

@@ -31,6 +31,11 @@ public class ActMsg extends BaseActivity {
     View title_tab_oval_1;
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.act_msg;
     }

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

@@ -58,6 +58,11 @@ public class ActSetting extends BaseActivity {
     }
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     public void initView() {
         activity = this;
         TitleBarUtils.getInstance()

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

@@ -90,6 +90,10 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     @BindView(R.id.personal_info_authentication)
     TextView personal_info_authentication;
 
+    @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {

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

@@ -75,6 +75,11 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     }
 
     @Override
+    protected boolean showWhiteStatusBar(){
+        return true;
+    }
+
+    @Override
     public void initListener() {
     }
     public static final int MAX_COUNT = 2;//修改为只验证身份证与姓名

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

@@ -96,6 +96,11 @@ public class RechargeAct extends BaseActivity {
     }
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         IpaynowPlugin.getInstance().onActivityDestroy();

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

@@ -44,6 +44,11 @@ public class TryMakeMoneyact extends BaseActivity {
     }
 
     @Override
+    protected boolean showWhiteStatusBar(){
+        return true;
+    }
+
+    @Override
     public void initView() {
         activity = this;
         EventBus.getDefault().register(activity);

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

@@ -81,6 +81,11 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     }
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     public void initView() {
         activity = this;
         TitleBarUtils

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

@@ -14,8 +14,10 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -33,10 +35,12 @@ import java.util.Locale;
 public class TaskListItemAdp extends BaseAdapter {
     private Context context;
     private List<TaskAcceptedEty> etyList;
+    private UserEntity user;
 
     public TaskListItemAdp(Context context, List<TaskAcceptedEty> etyList) {
         this.context = context;
         this.etyList = etyList;
+        user = DataUtil.getInstance().getUserEntity();
     }
 
     @Override
@@ -57,18 +61,18 @@ public class TaskListItemAdp extends BaseAdapter {
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         final Object object = getItem(position);
-        if(!(object instanceof TaskAcceptedEty)){
+        if (!(object instanceof TaskAcceptedEty)) {
             return LayoutInflater.from(context).inflate(R.layout.find_item_bottom, null);
         }
         final TaskAcceptedEty ety = (TaskAcceptedEty) object;
-        if(ety.getRelease_task() == null || ety.getRelease_task().getTask() == null){
+        if (ety.getRelease_task() == null || ety.getRelease_task().getTask() == null) {
             return convertView;
         }
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
-        if(tag instanceof ViewHolder){
+        if (tag instanceof ViewHolder) {
             holder = (ViewHolder) tag;
-        }else {
+        } else {
             holder = new ViewHolder();
             convertView = LayoutInflater.from(context).inflate(R.layout.task_list_item, null);
             holder.name_tv = convertView.findViewById(R.id.name_tv);
@@ -83,14 +87,14 @@ public class TaskListItemAdp extends BaseAdapter {
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
         ViewUtil.setText(holder.date_tv, context.getString(R.string.commit_time_point) + TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         String stateStr;
-        if(ety.getStatus() == 3){
-            stateStr = String.format(Locale.CHINA, "+%s元", ety.getRelease_task().getBonusText());
+        if (ety.getStatus() == 3) {
+            stateStr = String.format(Locale.CHINA, "+%s", ety.getRelease_task().getShowValue(user.isVIP()));
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.txt_red));
-        }else {
-            stateStr = String.format(Locale.CHINA, "%s元", ety.getRelease_task().getBonusText());
+        } else {
+            stateStr = String.format(Locale.CHINA, "%s", ety.getRelease_task().getShowValue(user.isVIP()));
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
-        CommonUtil.getInstance().setTaskTag(context, convertView, ety.getRelease_task(),CommonUtil.TASK_AUDIT);
+        CommonUtil.getInstance().setTaskTag(context, convertView, ety.getRelease_task(), CommonUtil.TASK_AUDIT);
         holder.price_tv.setText(stateStr);
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -99,7 +103,7 @@ public class TaskListItemAdp extends BaseAdapter {
             }
         });
         DownloadService.setDownLoadLongClick(convertView, ety.getRelease_task().getTask());
-        setTaskStatusText(ety, holder.detail_task_tv,holder.desc_tv);
+        setTaskStatusText(ety, holder.detail_task_tv, holder.desc_tv);
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(SkinUtil.getAppIcon()))
@@ -107,15 +111,15 @@ public class TaskListItemAdp extends BaseAdapter {
         return convertView;
     }
 
-    class ViewHolder{
+    class ViewHolder {
         ImageView icon_iv;
-        TextView name_tv, date_tv, price_tv,detail_task_tv,desc_tv;
+        TextView name_tv, date_tv, price_tv, detail_task_tv, desc_tv;
     }
 
     //设置任务完成状态与失败原因
-    private void setTaskStatusText(TaskAcceptedEty ety, TextView textView, TextView desc_tv){
+    private void setTaskStatusText(TaskAcceptedEty ety, TextView textView, TextView desc_tv) {
         desc_tv.setVisibility(View.GONE);
-        switch (ety.getStatus()){
+        switch (ety.getStatus()) {
             default:
             case TaskAcceptedEty.STATUS_ACCEPTED_TASK://提交中
             case TaskAcceptedEty.STATUS_RUNNING:
@@ -147,7 +151,7 @@ public class TaskListItemAdp extends BaseAdapter {
                 }
                 break;
         }
-        switch (ety.getAllowSubmit()){
+        switch (ety.getAllowSubmit()) {
             case TaskAcceptedEty.ALLOW_SUBMIT_NO:
                 textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));