From c675196cb2cbe62b6750d1e7bf194dd3bf55aea6 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Tue, 26 Mar 2019 16:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/MessageShareUtils.java     |  2 +-
 .../com/gh/gamecenter/adapter/ImagePagerAdapter.java   | 10 +++++++---
 .../java/com/gh/gamecenter/game/GameFragmentAdapter.kt |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
index 8a31b8327b..5c5b4ee778 100644
--- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
@@ -376,7 +376,7 @@ public class MessageShareUtils {
                     }
                 }
             }
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             Utils.log("消息分享异常" + e.toString());
             e.printStackTrace();
         } finally {
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
index 9330793c57..9c1227df1c 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
@@ -75,17 +75,21 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter {
 
         view.setOnClickListener(v -> {
 
+            int size = mSlideEntityList.size();
+
+            if (size == 0) return;
+
             // 首页轮播图数据统计
             DataLogUtils.uploadLunbotuLog(mContext, slideEntity.getType(),
-                    slideEntity.getText(), String.valueOf(getPosition(position) % mSlideEntityList.size() + 1));
+                    slideEntity.getText(), String.valueOf(getPosition(position) % size + 1));
 
             String entrance = StringUtils.buildString("(游戏-专题:滚动图["
                     , slideEntity.getText()
                     , "=", slideEntity.getType()
-                    , "=", String.valueOf(getPosition(position) + 1)
+                    , "=", String.valueOf(size + 1)
                     , "])");
 
-            DataUtils.onMtaEvent(mContext, "轮播图", mSource, String.valueOf(getPosition(position) % mSlideEntityList.size() + 1));
+            DataUtils.onMtaEvent(mContext, "轮播图", mSource, String.valueOf(getPosition(position) % size + 1));
 
             DirectUtils.directToLinkPage(mContext, slideEntity, entrance, "首页游戏");
 
diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
index dae1ea2de1..d4b58df742 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
@@ -505,7 +505,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName:
                         }
                     }
                 } else {
-                    if (position > mItemDataList.size) return arrayListOf()
+                    if (position >= mItemDataList.size) return arrayListOf()
 
                     val game = mItemDataList[position].game
                     if (game != null) {