billyyoyo 6 anni fa
parent
commit
a619f2b46f

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

@@ -421,19 +421,19 @@ public class Release_task implements Serializable, MultiItemEntity {
      * @return
      */
     public String getBonusText() {
-        return NumberFormatUtils.retainMost2W(bonus);
+        return NumberFormatUtils.retainMost2W(bonus + video_amount);
     }
 
     public String getVIPBonusText() {
-        return NumberFormatUtils.retainMost2W(vip_bonus);
+        return NumberFormatUtils.retainMost2W(vip_bonus + video_amount);
     }
 
     public String getShowValue(boolean isVip) {
         if (isShop()) {
             if (isVip) {
-                return NumberFormatUtils.retainMost2W(shop_amount * 10000) + "经验值";
+                return NumberFormatUtils.retainMost2W((shop_amount + video_amount) * 10000) + "经验值";
             } else {
-                return NumberFormatUtils.retainMost2W(vip_shop_amount * 10000) + "经验值";
+                return NumberFormatUtils.retainMost2W((vip_shop_amount + video_amount) * 10000) + "经验值";
             }
         } else {
             if (isVip) {
@@ -521,9 +521,9 @@ public class Release_task implements Serializable, MultiItemEntity {
     //所有的奖励金额展示内容
     public CharSequence getVipBonusText() {
         if (isShop()) {
-            return String.format(Locale.CHINA, "会员:+%s经验值", NumberFormatUtils.retainMost2W(getVip_shop_amount() * 10000));
+            return String.format(Locale.CHINA, "会员:+%s经验值", NumberFormatUtils.retainMost2W((vip_shop_amount + video_amount) * 10000));
         } else {
-            return String.format(Locale.CHINA, "会员:+%s元", NumberFormatUtils.retainMost2W(getVip_bonus()));
+            return String.format(Locale.CHINA, "会员:+%s元", NumberFormatUtils.retainMost2W(getVip_bonus() + video_amount));
         }
 //        return new SpannableSb().append(String.format(Locale.CHINA, "会员:+%s元", NumberFormatUtils.retainMost2(bonus+0.1)), R.dimen.text_size_10).checkAndBr()
 //                .append(String.format(Locale.CHINA, "+%s元", NumberFormatUtils.retainMost2(bonus)), R.dimen.text_size_1)
@@ -558,7 +558,7 @@ public class Release_task implements Serializable, MultiItemEntity {
      */
     public String getRewardMsg() {
         if (isShop()) {
-            return String.format(Locale.CHINA, "+%s经验值", NumberFormatUtils.retainMost2W(getShop_amount() * 10000));
+            return String.format(Locale.CHINA, "+%s经验值", NumberFormatUtils.retainMost2W((getShop_amount() + video_amount) * 10000));
         } else {
             return String.format(Locale.CHINA, "+%s元%s", getBonusText(), getRewardTypeNameMsg());
         }
@@ -620,7 +620,7 @@ public class Release_task implements Serializable, MultiItemEntity {
     //获取福利的价值
     public CharSequence getWelfareValue() {
         if (isShop()) {
-            return String.format(Locale.CHINA, "+%s经验值", NumberFormatUtils.retainMost2W(getShop_amount() * 10000));
+            return String.format(Locale.CHINA, "+%s经验值", NumberFormatUtils.retainMost2W((getShop_amount() + video_amount) * 10000));
         } else {
             return String.format(Locale.CHINA, "+%s元", bonus);
         }

+ 2 - 1
app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -197,6 +197,7 @@
             android:layout_width="wrap_content"
             android:layout_height="70dp"
             android:orientation="vertical"
+            android:gravity="right"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/item_top_v">
 
@@ -205,7 +206,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="+1万经验值"
+                android:text="+2万经验值"
                 android:lines="1"
                 android:ellipsize="end"
                 android:textColor="@color/txt_red"