任务列表中添加vip金额

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

@@ -1,10 +1,13 @@
 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;
@@ -14,7 +17,7 @@ import java.util.Locale;
  * Created by ljy on 2018/3/20.
  */
 
-public class Release_task implements Serializable{
+public class Release_task implements Serializable {
     private float bonus;// 0,
     private String create_time;// 0,
     private String deadline;// 0,
@@ -46,6 +49,7 @@ public class Release_task implements Serializable{
     private int consume_amount;//最低消费
     private int gift_ratio;//赠送比例，取值0-100
     private int user_task_status;//备注:和任务记录状态一样
+
     public int getDemo_time() {
         return demo_time;
     }
@@ -153,7 +157,7 @@ public class Release_task implements Serializable{
     }
 
     public String getLast_num() {
-        return TextUtils.isEmpty(last_num)?"0":last_num;
+        return TextUtils.isEmpty(last_num) ? "0" : last_num;
     }
 
     public void setLast_num(String last_num) {
@@ -185,7 +189,7 @@ public class Release_task implements Serializable{
     }
 
     public String getRelease_num() {
-        return TextUtils.isEmpty(release_num)?"0":release_num;
+        return TextUtils.isEmpty(release_num) ? "0" : release_num;
     }
 
     public void setRelease_num(String release_num) {
@@ -217,7 +221,7 @@ public class Release_task implements Serializable{
     }
 
     public String getTask_id() {
-        return TextUtils.isEmpty(task_id)?"0":task_id;
+        return TextUtils.isEmpty(task_id) ? "0" : task_id;
     }
 
     public void setTask_id(String task_id) {
@@ -289,6 +293,7 @@ public class Release_task implements Serializable{
 
     /**
      * 获取奖金的文本表示（这里保留两位有效数字，因为服务器可能返回这样的结果：0.6000000238418579）
+     *
      * @return
      */
     public String getBonusText() {
@@ -296,8 +301,8 @@ public class Release_task implements Serializable{
     }
 
 
-    public String getCashOrWelfare(){
-        switch (cash_task){
+    public String getCashOrWelfare() {
+        switch (cash_task) {
             case 2:
                 return "福利";
             case 1:
@@ -305,8 +310,10 @@ public class Release_task implements Serializable{
                 return "现金";
         }
     }
+
     /**
      * 任务是否下线
+     *
      * @return
      */
     public boolean isOffline() {
@@ -322,25 +329,30 @@ public class Release_task implements Serializable{
 
     /**
      * 福利内容
+     *
      * @return
      */
     public String getGiftRatioText() {
         return String.format(Locale.CHINA, "最低充%d，每充%d送%d", consume_amount, consume_amount, gift_ratio * consume_amount / 100);
     }
+
     /**
      * 剩余份数
+     *
      * @return
      */
     public String getLastNumText() {
         return String.format(Locale.CHINA, "剩余%s份", last_num);
     }
-    public int getLastNum1Or0(){
+
+    public int getLastNum1Or0() {
         int lastNum = NumberFormatUtils.parseInteger(last_num, 0);
         return lastNum > 0 ? 1 : 0;
     }
+
     public String getDateText() {
         long endTime = NumberFormatUtils.parseLong(deadline);
-        if(endTime < 1000_000){
+        if (endTime < 1000_000) {
             return "永久";
         }
         return String.format(Locale.CHINA, "%s—%s", TimeUtil.TimeStamp2Date(online_time, "yyyy/MM/dd"), TimeUtil.TimeStamp2Date(endTime, "yyyy/MM/dd"));
@@ -348,6 +360,7 @@ public class Release_task implements Serializable{
 
     /**
      * 任务是否已经完成，对于游戏任务或者福利来说，就是已经领取奖励
+     *
      * @return
      */
     public boolean isTaskFinished() {
@@ -357,4 +370,13 @@ public class Release_task implements Serializable{
     public String getH5BonusText() {
         return String.format(Locale.CHINA, "<font color='#ff2d4b' size='1'>￥</font><font color='#ff2d4b'>%s</font>", getBonusText());
     }
+
+    //所有的奖励金额展示内容
+    public CharSequence getVipBonusText() {
+        return String.format(Locale.CHINA, "会员：+%s元", NumberFormatUtils.retainMost2(bonus+0.1));
+//        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)
+//                .getSsb();
+//        return String.format(Locale.CHINA, "会员：+%s元\n+%s元", NumberFormatUtils.retainMost2(bonus + 0.1f), NumberFormatUtils.retainMost2(bonus));
+    }
 }

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

@@ -566,6 +566,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName() + "");
                 CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_money)).setText("+" + taskReleaseEty.getBonusText() + "元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
 
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 if (isBegin == 1 || type == 2) {//即将开始
@@ -744,6 +745,7 @@ public class TryMakeMoneyAdp extends AdbCommonRecycler<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
                 CommonUtil.getInstance().setTaskTag(context, viewHolder.itemView, taskReleaseEty,show_type);
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ taskReleaseEty.getBonusText() +"元");
+                ViewUtil.setText(viewHolder.itemView.findViewById(R.id.item_money_vip_tv), taskReleaseEty.getVipBonusText());
                 if(!taskReleaseEty.getDeadline().equals("永久")){
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
                             "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT_DD, Long.valueOf(taskReleaseEty.getDeadline()))+"");

app/src/main/res/layout/tablayout_viewpager_layout.xml

@@ -19,7 +19,6 @@
         android:id="@+id/viewpager_act_game_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/content_padding_15"
         android:minHeight="@dimen/view_size_100"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </LinearLayout>

app/src/main/res/layout/try_makemoney_item_recommend.xml

@@ -23,10 +23,10 @@
             android:id="@+id/item_title_tv"
             android:layout_width="match_parent"
             android:layout_height="@dimen/content_padding_20"
-            android:layout_marginEnd="12dp"
-            android:gravity="center_vertical"
             android:layout_marginStart="@dimen/content_padding_small"
+            android:layout_marginEnd="12dp"
             android:layout_toEndOf="@+id/item_title_iv"
+            android:gravity="center_vertical"
             android:text="进行中"
             android:textColor="@color/black"
             android:textSize="15sp" />
@@ -42,9 +42,13 @@
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="@dimen/content_padding_10">
+        android:layout_marginEnd="12dp">
+
+        <View
+            android:id="@+id/item_top_v"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/content_padding_10" />
 
         <ImageView
             android:id="@+id/item_icon_iv"
@@ -52,16 +56,16 @@
             android:layout_height="70dp"
             android:src="@drawable/icon_lj"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
 
         <TextView
             android:id="@+id/end_of_time_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/content_padding_4"
             android:layout_marginStart="@dimen/content_padding_4"
             android:layout_marginTop="55dp"
+            android:layout_marginEnd="@dimen/content_padding_4"
             android:background="@drawable/shape_ash_stroke_white_solid_rectangle"
             android:gravity="center"
             android:lines="1"
@@ -70,19 +74,7 @@
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@+id/item_icon_iv"
             app:layout_constraintStart_toStartOf="@+id/item_icon_iv"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/item_money"
-            android:layout_width="@dimen/find_bt_with"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:text="+10元"
-            android:textColor="@color/txt_red"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -90,7 +82,8 @@
             android:layout_marginStart="@dimen/content_padding"
             android:orientation="vertical"
             app:layout_constraintEnd_toStartOf="@+id/task_type_tv"
-            app:layout_constraintStart_toEndOf="@+id/item_icon_iv">
+            app:layout_constraintStart_toEndOf="@+id/item_icon_iv"
+            app:layout_constraintTop_toBottomOf="@id/item_top_v">
 
             <TextView
                 android:id="@+id/item_name_tv"
@@ -131,6 +124,7 @@
                     android:textColor="#cc8e8e8e"
                     android:textSize="10sp"
                     android:visibility="gone" />
+
                 <TextView
                     android:id="@+id/item_num_tv2"
                     android:layout_width="wrap_content"
@@ -150,8 +144,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/content_padding_8"
                 android:layout_marginTop="@dimen/content_padding_2"
+                android:layout_marginEnd="@dimen/content_padding_8"
                 android:orientation="horizontal">
 
                 <TextView
@@ -179,11 +173,11 @@
         <TextView
             android:id="@+id/task_type_tv"
             style="@style/style_button_find"
+            android:layout_marginTop="5dp"
             android:text="取消任务"
             android:visibility="invisible"
-            android:layout_marginTop="5dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
         <TextView
             android:id="@+id/detail_task_tv_center"
@@ -193,50 +187,88 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/item_top_v" />
 
-        <RelativeLayout
-            android:id="@+id/detail_task_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
-            app:layout_constraintEnd_toEndOf="parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:gravity="end"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/item_top_v">
 
             <TextView
-                android:id="@+id/detail_task_tv"
-                style="@style/style_button_find"
-                android:text="取消任务" />
+                android:id="@+id/item_money_vip_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:minWidth="@dimen/find_bt_with"
+                android:text="会员：+11元"
+                android:textColor="@color/txt_red"
+                android:textSize="10sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <TextView
-                android:id="@+id/detail_task_tv_down"
-                style="@style/style_button_find"
-                android:text="取消任务"
-                android:visibility="gone" />
+                android:id="@+id/item_money"
+                android:layout_width="@dimen/find_bt_with"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:text="+10元"
+                android:textColor="@color/txt_red"
+                android:textSize="15sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <RelativeLayout
+                android:id="@+id/detail_task_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-        </RelativeLayout>
+                <TextView
+                    android:id="@+id/detail_task_tv"
+                    style="@style/style_button_find"
+                    android:text="取消任务" />
+
+                <TextView
+                    android:id="@+id/detail_task_tv_down"
+                    style="@style/style_button_find"
+                    android:text="取消任务"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+        </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="12dp"
         android:background="@drawable/sp_rectangle_bg_gray_radius"
         android:padding="@dimen/content_padding_small"
         android:text="若1小时35分22秒后任务未完成，该任务自动取消，您可以重新接受该任务"
         android:textColor="@color/txt_black_8e8e8e"
         android:textSize="@dimen/text_size_10"
         android:visibility="gone" />
+
     <View
         android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10"/>
+        android:layout_height="@dimen/content_padding_10" />
+
     <View
         android:id="@+id/line_tv"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:background="@color/gray_F0F0F0" />
 </LinearLayout>