指定任务中会展示其可以兑换的道具

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

@@ -89,6 +89,15 @@ public class Release_task implements Serializable {
     private int user_task_status;//备注:和任务记录状态一样
 
     private int is_appoint;// int(11) NOT NULL DEFAULT '0' COMMENT '是否指定任务 1:是 0:不指定'
+    private String reward_type_name;//`orm:"-" description:"奖励方式" json:"reward_type_name"` 绵羊币或者其它
+
+    public void setReward_type_name(String reward_type_name) {
+        this.reward_type_name = reward_type_name;
+    }
+
+    public String getReward_type_name() {
+        return reward_type_name;
+    }
 
     public int getDemo_time() {
         return demo_time;
@@ -446,4 +455,20 @@ public class Release_task implements Serializable {
     public boolean isAppointTask() {
         return is_appoint == 1;
     }
+    /**
+     * 要展示的定向内容
+     */
+    public String getRewrdTypeNameMsg() {
+        return !TextUtils.isEmpty(reward_type_name) && !TextUtils.equals("绵羊币", reward_type_name) ? String.format(Locale.CHINA, "(%s)", reward_type_name) : "";
+    }
+
+    /**
+     * +5元
+     * or
+     * +5元（元宝）
+     * @return
+     */
+    public String getRewardMsg() {
+        return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewrdTypeNameMsg());
+    }
 }

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

@@ -300,7 +300,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
         }
         ViewUtil.setText(nameTv, taskReleaseEty.getName());
-        ViewUtil.setText(priceTv, String.format(Locale.CHINA, "+%s元", taskReleaseEty.getBonusText()));
+        ViewUtil.setText(priceTv, taskReleaseEty.getRewardMsg());
         ViewUtil.setText(item_money_vip_tv, taskReleaseEty.getVipBonusText());
         if (!taskReleaseEty.getDeadline().equals("永久")) {
             ViewUtil.setText(dateTv, String.format(Locale.CHINA, "截至日期：%s", TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline()))));
@@ -617,6 +617,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             btnUpImag.setVisibility(View.GONE);
             btnTaskItem.setText(R.string.get_task);
             type = TASK_TYPE_INIT;
+        } else if(taskReleaseEty != null && taskReleaseEty.isAppointTask()){
+            ViewUtil.setVisibility(btnUpImag, true);
+            ViewUtil.setTextId(btnUpImag, R.string.to_exchange);
         } else {//不能上传截图则不显示第二按钮
             btnUpImag.setVisibility(View.GONE);
         }
@@ -962,6 +965,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 e.printStackTrace();
                 G.showToast(e.getMessage());
             }
+        } else if(taskReleaseEty != null && taskReleaseEty.isAppointTask()) {//定向任务已经完成时，可以去兑换
+            Jump2View.getInstance().goAppointTaskList();
         } else {//截图任务
             commitScreenShot();
         }

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

@@ -535,7 +535,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_name_tv), taskReleaseEty.getName());
                 CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty, show_type);
-                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money), "+" + taskReleaseEty.getBonusText() + "元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money), taskReleaseEty.getRewardMsg());
                 ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
                 ViewUtil.setVisibility(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), true);
 
@@ -752,7 +752,8 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
 
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 if(taskReleaseEty.isAppointTask() && taskAcceptedEty.isFinish()){//定向任务已经有结果
-                    ViewUtil.setText(detail_task_tv, "去兑换");
+                    ViewUtil.setVisibility(detail_task_tv, true);//强制设置为可见
+                    ViewUtil.setTextId(detail_task_tv, R.string.to_exchange);
                     ViewUtil.setOnClickListener(detail_task_tv, v -> Jump2View.getInstance().goAppointTaskList());
                 } else {
                     ViewUtil.setTextId(detail_task_tv, R.string.cancel);

app/src/main/res/values/strings.xml

@@ -222,4 +222,7 @@
     <string name="copy_assistant_tip">如果您是游戏玩家，恭喜您，通过复制链接，然后回到小绵羊，可以实现快速进入游戏，快去尝试吧！</string>
     <string name="opened">已开启</string>
     <string name="closed">已关闭</string>
+
+
+    <string name="to_exchange">去兑换</string>
 </resources>