修复无法获取上游与标签下的游戏列表的bug

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupMore.java

@@ -29,7 +29,7 @@ public class ActGameGroupMore extends BaseContainerActivity {
     @Override
     protected Fragment initFragment() {
         if(gameListType != null)
-            return FgtGameGroupMore.newInstance(gameListType.getType());
+            return FgtGameGroupMore.newInstance(gameListType.getPort_type());
         else
             return new FgtGameGroupMore();
     }

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -175,14 +175,14 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
         RefreshUtil.newInstance().publicParameterLoadMore(refresh, this);
 
         ViewUtil.setImage(write_comment, ViewUtil.getNetImgByName("write_comment"));
-        if(gameGroup == null){
-            ViewUtil.setVisibility(gc_game_app_detail_game_list, false);
+        boolean isGameGroupNull = gameGroup == null;
+        ViewUtil.setVisibility(gc_game_app_detail_game_list, !isGameGroupNull);
+        ViewUtil.setVisibility(item_gc_game_app_list_bottom, !isGameGroupNull);
+        ViewUtil.setVisibility(item_gc_game_app_list_top, isGameGroupNull);
+        ViewUtil.setVisibility(gc_game_app_detail_bt2, isGameGroupNull);
+        ViewUtil.setVisibility(gc_game_app_detail_line, isGameGroupNull);
+        if(isGameGroupNull){
         } else {//游戏组，不显示下载按钮
-            ViewUtil.setVisibility(gc_game_app_detail_game_list, true);
-            ViewUtil.setVisibility(item_gc_game_app_list_bottom, true);
-            ViewUtil.setVisibility(item_gc_game_app_list_top, false);
-            ViewUtil.setVisibility(gc_game_app_detail_bt2, false);
-            ViewUtil.setVisibility(gc_game_app_detail_line, false);
             ViewUtil.setText(item_gc_game_app_list_tv, "比一比");
             item_gc_game_app_list_rv.setHasFixedSize(true);
             item_gc_game_app_list_rv.setNestedScrollingEnabled(false);

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGroupMore.java

@@ -117,7 +117,7 @@ public class FgtGameGroupMore extends BaseFragment {
         if (gameListType == null) {
             return;
         }
-        gameListType.setType(type);
+        gameListType.setPort_type(type);
         ObservableUtil.getObservable(SheepApp.getInstance().getNetComponent().getApiService(), gameListType).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.module.game.model;
 
 import com.sheep.gamegroup.model.entity.Applications;
 import com.sheep.gamegroup.module.game.api.IGameGroup;
+import com.sheep.gamegroup.util.ListUtil;
 
 import java.util.List;
 
@@ -146,8 +147,20 @@ public class GameGroup implements IGameGroup {
      */
     public Applications getFirstApplications() {
         Applications app;
-        if(applications != null && (app = applications.get(0)) != null)
+        if(applications != null && (app = ListUtil.getItem(applications, 0)) != null)
             return app;
         return null;
     }
+
+
+    /**
+     * 获取第一个游戏的id
+     * @return
+     */
+    public int getFirstApplicationsId() {
+        Applications app;
+        if(applications != null && (app = ListUtil.getItem(applications, 0)) != null)
+            return app.getId();
+        return 0;
+    }
 }

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

@@ -2790,8 +2790,13 @@ public class Jump2View {
                         }
                         Activity activity = SheepApp.getInstance().getCurrentActivity();
                         Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
-                        if(gameGroup.getFirstApplications() != null)
-                            intent.putExtra("id", gameGroup.getFirstApplications().getId());
+                        int id = gameGroup.getFirstApplicationsId();
+                        if (id > 0){
+                            intent.putExtra("id", id);
+                        } else {
+                            G.showToast(R.string.please_contact_customer_service);
+                            return;
+                        }
                         if(ListUtil.size(gameGroup.getApplications()) > 1)//有多个游戏时才添加游戏组数据
                             DataUtil.putObject(intent, gameGroup);
                         activity.startActivity(intent);
@@ -2809,11 +2814,15 @@ public class Jump2View {
      * 小绵羊3.4.10新增 -- 游戏组游戏详情 界面
      */
     public void goPlayGameDetail(int id) {
-        Activity activity = SheepApp.getInstance().getCurrentActivity();
-        Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
-        intent.putExtra("id", id);
-        activity.startActivity(intent);
         GAME_PLAY_GAME_DETAIL.onEvent();
+        if (id > 0){
+            Activity activity = SheepApp.getInstance().getCurrentActivity();
+            Intent intent = new Intent(activity, ActGameGroupOrGameDetail.class);
+            intent.putExtra("id", id);
+            activity.startActivity(intent);
+        } else {
+            G.showToast(R.string.please_contact_customer_service);
+        }
     }
 
     /**

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

@@ -195,6 +195,7 @@
                     <TextView
                         android:id="@+id/gc_game_app_detail_bt3"
                         style="@style/style_vip_td_tv"
+                        android:visibility="gone"
                         android:layout_marginStart="30dp"
                         app:layout_constraintBottom_toBottomOf="@id/gc_game_app_comment_score"
                         app:layout_constraintStart_toEndOf="@id/gc_game_app_detail_bt1" />