소스 검색

版本升级为:3.4.7
添加子任务中会员资金

zengjiebin 7 년 전
부모
커밋
37f76eb632

+ 16 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskChild.java

@@ -6,11 +6,13 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Created by ljy on 2018/5/10.
@@ -22,6 +24,7 @@ public class TaskChild implements Serializable {
     private String EndTime;//1530115200,
     private String Desc;//"<p>阿斯顿发射的发</p>",
     private String Amount;//1,
+    private float vip_amount;//1,
     private int Id;//8,
     private int already_accepted_task_id;//8,
     private String task_id;//161,
@@ -201,6 +204,14 @@ public class TaskChild implements Serializable {
         this.already_accepted_task_id = already_accepted_task_id;
     }
 
+    public float getVip_amount() {
+        return vip_amount;
+    }
+
+    public void setVip_amount(float vip_amount) {
+        this.vip_amount = vip_amount;
+    }
+
     public int getAllowSubmit() {
         return allowSubmit;
     }
@@ -268,6 +279,11 @@ public class TaskChild implements Serializable {
     public static final int STATUS_FAIL= 6;//审核失败
     public static final int STATUS_OUT_TIME = 7;
 
+    //资金信息
+    public String getAmountInfo() {
+        return String.format(Locale.CHINA, "+%s元(会员:+%s元)", NumberFormatUtils.retainMost2W(getAmount()), NumberFormatUtils.retainMost2W(getVip_amount()));
+    }
+
 
     @IntDef({STATUS_RUNNING, STATUS_FAIL})
     @Retention(RetentionPolicy.SOURCE)

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskdetailSonListviewAdp.java

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.QRUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -114,7 +115,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             holder.num_item_textview.setText(position + 1 + "");
             CommonUtil.getInstance()
                     .bindDataTaskDetailSon(descEntity, holder.title_item_tv, position);
-            holder.title_item_price_tv.setText("+" + descEntity.getAmount() + "元");
+            ViewUtil.setText(holder.title_item_price_tv, descEntity.getAmountInfo());
             if (descEntity.isSelectFlag()) {
                 holder.select_tab_iv.setRotation(180);
                 holder.item_show_layout.setVisibility(View.VISIBLE);

+ 2 - 2
gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.4.6
-VERSION_CODE=3004006
+VERSION_NAME=3.4.7
+VERSION_CODE=3004007
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_BUILD_TOOLS_VERSION=28.0.3
 ANDROID_MIN_SDK_VERSION=18