Просмотр исходного кода

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

zengjiebin лет назад: 7
Родитель
Сommit
5fb96c48bf

+ 2 - 5
app/src/main/java/com/sheep/gamegroup/model/entity/Release_task.java

@@ -1,13 +1,10 @@
 package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
-import android.view.View;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.helper.DownloadHelper;
 import com.sheep.gamegroup.util.TimeUtil;
-import com.sheep.gamegroup.util.string.SpannableSb;
-import com.sheep.jiuyan.samllsheep.R;
 
 import java.io.Serializable;
 import java.util.Locale;
@@ -458,7 +455,7 @@ public class Release_task implements Serializable {
     /**
      * 要展示的定向内容
      */
-    public String getRewrdTypeNameMsg() {
+    public String getRewardTypeNameMsg() {
         return !TextUtils.isEmpty(reward_type_name) && !TextUtils.equals("绵羊币", reward_type_name) ? String.format(Locale.CHINA, "(%s)", reward_type_name) : "";
     }
 
@@ -469,6 +466,6 @@ public class Release_task implements Serializable {
      * @return
      */
     public String getRewardMsg() {
-        return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewrdTypeNameMsg());
+        return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewardTypeNameMsg());
     }
 }

+ 5 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -638,7 +638,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         btnUpImag.setVisibility(View.GONE);
                         break;
                     default:
-                        btnUpImag.setText("确认完成");//第二按钮不可点击且显示状态(sdk自动审核直接领取奖励)
+                        if(taskReleaseEty != null && taskReleaseEty.isAppointTask()){
+                            ViewUtil.setTextId(btnUpImag, R.string.to_exchange);
+                        } else {
+                            btnUpImag.setText("确认完成");//第二按钮不可点击且显示状态(sdk自动审核直接领取奖励)
+                        }
                         break;
                 }
                 break;