显示游戏名称

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

@@ -47,6 +47,15 @@ public class TaskEty implements Serializable, IDownload {
     //用于自定义字段，如自定义手机号
     private String unique_identification;//UniqueIdentification string       `orm:"column(unique_identification);null" description:"唯一标识" json:"unique_identification"`
     private int app_id;
+    private Applications application;
+
+    public void setApplication(Applications application) {
+        this.application = application;
+    }
+
+    public Applications getApplication() {
+        return application;
+    }
 
     public String getQr_code() {
         return qr_code;
@@ -722,4 +731,7 @@ public class TaskEty implements Serializable, IDownload {
     public static final int INSPECT_TYPE_PERSION = 2;
     public static final int INSPECT_TYPE_SHEEP = 3;
 
+    public String getAppName() {
+        return application != null ? application.getName() : null;
+    }
 }

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpMyWelfare.java

@@ -1,9 +1,11 @@
 package com.sheep.gamegroup.module.game.adapter;
 
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.model.entity.Applications;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
@@ -43,6 +45,7 @@ public class AdpMyWelfare extends AdbCommonRecycler<TaskAcceptedEty> {
         ImageView item_icon_iv = holder.itemView.findViewById(R.id.item_icon_iv);
         ImageView item_level_iv = holder.itemView.findViewById(R.id.item_level_iv);
         TextView item_name_tv = holder.itemView.findViewById(R.id.item_name_tv);
+        TextView item_name_tv2 = holder.itemView.findViewById(R.id.item_name_tv2);
         TextView item_time_tv = holder.itemView.findViewById(R.id.item_time_tv);
         TextView item_info_tv = holder.itemView.findViewById(R.id.item_info_tv);
         TextView item_value_tv = holder.itemView.findViewById(R.id.item_value_tv);
@@ -56,9 +59,12 @@ public class AdpMyWelfare extends AdbCommonRecycler<TaskAcceptedEty> {
         if (taskEty == null) {
             return;
         }
+
         ViewUtil.setGameImage(item_icon_iv, taskEty.getIcon());
         ViewUtil.setImageLevel(item_level_iv, release_task.getLevel());
         ViewUtil.setText(item_name_tv, release_task.getName());
+        ViewUtil.setVisibility(item_name_tv2, !TextUtils.isEmpty(taskEty.getAppName()));
+        ViewUtil.setText(item_name_tv2, taskEty.getAppName());
         ViewUtil.setText(item_time_tv, release_task.getRemainderTime());
         ViewUtil.setText(item_info_tv, release_task.getWelfareInfo());
         ViewUtil.setText(item_value_tv, release_task.getWelfareValue());

app/src/main/res/drawable/shape_e6e6e6_solid_rectangle_ntl_10.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"
+        android:bottomLeftRadius="10dp" />
+    <solid android:color="#E6E6E6" />
+
+</shape>

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

@@ -40,23 +40,38 @@
         android:id="@+id/item_name_tv"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:maxLines="2"
-        android:ellipsize="end"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:text="王者荣耀皮肤"
         android:textColor="#ff333333"
         android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@id/item_song_iv"
+        app:layout_constraintBottom_toBottomOf="@id/item_song_iv"
         app:layout_constraintEnd_toStartOf="@id/item_value_tv"
-        app:layout_constraintTop_toTopOf="@id/item_icon_iv" />
+        app:layout_constraintStart_toEndOf="@id/item_song_iv"
+        app:layout_constraintTop_toTopOf="@id/item_song_iv" />
+
+    <TextView
+        android:id="@+id/item_name_tv2"
+        android:layout_width="64dp"
+        android:layout_height="20dp"
+        android:layout_marginTop="5dp"
+        android:background="@drawable/shape_e6e6e6_solid_rectangle_ntl_10"
+        android:gravity="center"
+        android:singleLine="true"
+        android:text="射雕英雄传"
+        android:textColor="#ff666666"
+        android:textSize="10sp"
+        android:visibility="invisible"
+        app:layout_constraintStart_toStartOf="@id/item_song_iv"
+        app:layout_constraintTop_toBottomOf="@id/item_name_tv" />
 
     <TextView
         android:id="@+id/item_time_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="13dp"
+        android:layout_marginBottom="10dp"
         android:text="剩余时间：3天54小时12分"
         android:textColor="#ff999999"
         android:textSize="11sp"
@@ -67,15 +82,15 @@
         android:id="@+id/item_info_tv"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:text="内容：xx皮肤、xx皮肤"
         android:textColor="#ff999999"
-        android:singleLine="true"
-        android:ellipsize="end"
         android:textSize="11sp"
-        android:layout_marginEnd="5dp"
         app:layout_constraintBottom_toBottomOf="@id/item_icon_iv"
-        app:layout_constraintStart_toStartOf="@id/item_song_iv"
-        app:layout_constraintEnd_toStartOf="@id/item_vip_tv"/>
+        app:layout_constraintEnd_toStartOf="@id/item_vip_tv"
+        app:layout_constraintStart_toStartOf="@id/item_song_iv" />
 
     <TextView
         android:id="@+id/item_value_tv"