搜索游戏组中尝试显示会员通道

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

@@ -37,6 +37,7 @@ public class AdpSearchResp extends AdbCommonRecycler<SearchResp>{
         holder.itemView.setOnClickListener(v -> Jump2View.getInstance().goSearchResp(item));
         View item_download_welfare_line = holder.itemView.findViewById(R.id.line_tv);
         TextView detail_task_tv_center = holder.itemView.findViewById(R.id.detail_task_tv_center);
+        TextView detail_task_tv_center2 = holder.itemView.findViewById(R.id.detail_task_tv_center2);
         TextView item_name_tv = holder.itemView.findViewById(R.id.item_name_tv);
         TextView item_date_tv = holder.itemView.findViewById(R.id.item_date_tv);
         LinearLayout ll_game_tag = holder.itemView.findViewById(R.id.ll_game_tag);
@@ -51,6 +52,7 @@ public class AdpSearchResp extends AdbCommonRecycler<SearchResp>{
         ViewUtil.setText(detail_task_tv_center, "查看详情");
 
         ViewUtil.setVisibility(item_download_welfare_line, holder.getAdapterPosition() + 1 == getItemCount() ? View.GONE : View.VISIBLE);
+        ViewUtil.setVisibility(detail_task_tv_center2, gameGroup.getGame_discount_id() > 0);
 
         Applications download = item.getDownload();
         //tag 标签绘制

app/src/main/java/com/sheep/gamegroup/module/game/api/IGameGroup.java

@@ -10,4 +10,6 @@ public interface IGameGroup {
     String getPackageSizeMsg();
 
     String getIcon();
+
+    int getGame_discount_id();
 }

app/src/main/java/com/sheep/gamegroup/module/game/model/GameGroup.java

@@ -40,6 +40,8 @@ public class GameGroup implements IGameGroup {
 
     private int tag;
 
+    private int game_discount_id;
+
     private String updated_at;
 
     public String getName() {
@@ -127,6 +129,15 @@ public class GameGroup implements IGameGroup {
         this.updated_at = updated_at;
     }
 
+    public int getGame_discount_id() {
+        return game_discount_id;
+    }
+
+    public void setGame_discount_id(int game_discount_id) {
+        this.game_discount_id = game_discount_id;
+    }
+
+
 
 
     /**

app/src/main/java/com/sheep/gamegroup/module/game/model/SearchResp.java

@@ -81,36 +81,4 @@ public class SearchResp {
         }
         return null;
     }
-
-    public String getPackage_size() {
-        switch (type){
-            case TYPE_GAME:
-                if(applications != null){
-                    return applications.getPackage_size()+"M";
-                }
-                break;
-            case TYPE_GAME_GROUP:
-                if(game_group != null){
-                    return game_group.getPackage_size()+"M";
-                }
-                break;
-        }
-        return "";
-    }
-
-    public String getIcon() {
-        switch (type){
-            case TYPE_GAME:
-                if(applications != null){
-                    return applications.getIcon();
-                }
-                break;
-            case TYPE_GAME_GROUP:
-                if(game_group != null){
-                    return game_group.getIcon();
-                }
-                break;
-        }
-        return null;
-    }
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2802,7 +2802,8 @@ public class Jump2View {
                         Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
                         if(gameGroup.getFirstApplications() != null)
                             intent.putExtra("id", gameGroup.getFirstApplications().getId());
-                        DataUtil.putObject(intent, gameGroup);
+                        if(ListUtil.size(gameGroup.getApplications()) > 1)//有多个游戏时才添加游戏组数据
+                            DataUtil.putObject(intent, gameGroup);
                         activity.startActivity(intent);
                     }
 

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

@@ -26,11 +26,9 @@ import java.util.List;
  */
 
 public class PlayGameItemAdapter extends AdbCommonRecycler<GameEntity> {
-    private Context activity;
 
     public PlayGameItemAdapter(Context context, List<GameEntity> list) {
         super(context, list);
-        activity = context;
     }
 
     @Override

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

@@ -186,16 +186,8 @@
 
                     <TextView
                         android:id="@+id/gc_game_app_detail_bt3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="30dp"
+                        style="@style/style_vip_td_tv"
                         android:layout_marginStart="30dp"
-                        android:background="@drawable/shape_vip_gradient_rectangle_15"
-                        android:gravity="center"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="10dp"
-                        android:text="会员通道"
-                        android:textColor="#714E36"
-                        android:textSize="14sp"
                         app:layout_constraintBottom_toBottomOf="@id/gc_game_app_comment_score"
                         app:layout_constraintStart_toEndOf="@id/gc_game_app_detail_bt1" />
 

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

@@ -9,15 +9,7 @@
 
     <TextView
         android:id="@+id/item_gggc_vip_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:background="@drawable/shape_vip_gradient_rectangle_15"
-        android:gravity="center"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:text="会员通道"
-        android:textColor="#714E36"
-        android:textSize="14sp"
+        style="@style/style_vip_td_tv"
         app:layout_constraintBottom_toBottomOf="@id/item_gggc_ll2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/item_gggc_ll1"

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

@@ -43,8 +43,10 @@
             android:layout_height="70dp"
             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_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/detail_task_tv_center"
+            app:layout_constraintStart_toEndOf="@id/item_icon_iv">
 
             <TextView
                 android:id="@+id/item_name_tv"
@@ -109,9 +111,18 @@
             android:layout_centerInParent="true"
             android:text="@string/task_cancel"
             android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
+            app:layout_constraintBottom_toTopOf="@id/detail_task_tv_center2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/detail_task_tv_center2"
+            style="@style/style_vip_td_tv2"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            android:layout_marginTop="16dp"
+            app:layout_constraintBottom_toBottomOf="@id/item_icon_iv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/detail_task_tv_center" />
 
     </android.support.constraint.ConstraintLayout>
 

app/src/main/res/values/dd_styles.xml

@@ -504,4 +504,30 @@
         <item name="android:scaleType">fitXY</item>
         <item name="android:adjustViewBounds">true</item>
     </style>
+    <!-- 会员通道textView 样式-->
+    <style name="style_vip_td_tv">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:background">@drawable/shape_vip_gradient_rectangle_15</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">10dp</item>
+        <item name="android:text">会员通道</item>
+        <item name="android:textColor">#714E36</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="style_vip_td_tv2">
+        <item name="android:background">@drawable/shape_vip_gradient_rectangle_15</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">10dp</item>
+        <item name="android:text">会员通道</item>
+        <item name="android:textColor">#714E36</item>
+        <item name="android:layout_width">@dimen/find_bt_with</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:textSize">@dimen/text_size_12</item>
+    </style>
 </resources>