diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
index cffc9ba024..562c00826b 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
@@ -1272,7 +1272,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
         super.onPause();
         statusMap.clear();
         DownloadManager.getInstance(this).removeObserver(dataWatcher);
-        if (!isSentReport) {
+        if (!isSentReport && entity != null) {
             long end = Calendar.getInstance().getTimeInMillis();
 
             int seconds = (int) ((end - start) / 1000);
diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java
index 84a2cfede9..73c0eed460 100644
--- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java
@@ -41,6 +41,9 @@ public class SubjectActivity extends BaseActivity {
 	private boolean isEverpause = false;
 	private boolean isDestroy = false;
 
+	private LinearLayoutManager layoutManager;
+	private int page = 1;
+
 	private Handler handler = new Handler() {
 		@Override
 		public void handleMessage(Message msg) {
@@ -115,12 +118,26 @@ public class SubjectActivity extends BaseActivity {
 			}
 		});
 
+		layoutManager = new LinearLayoutManager(this);
+
 		subject_list.setHasFixedSize(true);
-		subject_list.setLayoutManager(new LinearLayoutManager(this));
+		subject_list.setLayoutManager(layoutManager);
 		adapter = new SubjectAdapter(this, subject_list, subject_pb_loading, reuse_no_connection, id,order);
 		subject_list.setAdapter(adapter);
 		subject_list.addItemDecoration(new VerticalItemDecoration(this, 1));
 
+		subject_list.setOnScrollListener(new RecyclerView.OnScrollListener() {
+			@Override
+			public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+				super.onScrollStateChanged(recyclerView, newState);
+				if (!isDestroy && newState == RecyclerView.SCROLL_STATE_IDLE && adapter.getItemCount() == layoutManager.findLastVisibleItemPosition()+1&&adapter.isLoaded()){
+					page++;
+					adapter.initList(page);
+
+				}
+			}
+		});
+
 	}
 
 	public void onEventMainThread(EBPWDismiss dismiss) {
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
index 5c5e73bd78..eb89a27ee4 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
@@ -27,6 +27,7 @@ import com.gh.download.DownloadEntry;
 import com.gh.gamecenter.GameDetailsActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SubjectActivity;
+import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder;
 import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder;
 import com.gh.gamecenter.db.info.GameInfo;
@@ -65,8 +66,9 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 	private LinearLayout reuse_no_connection;
 
 	private List<GameEntity> list;
-
 	private boolean order;
+	private static final int FOOTER_ITEM = 101;
+	private boolean isLoaded;
 
 	// 黄壮华 获取引用 修改2015/8/15
 	private ArrayMap<String, Integer> locationMap;
@@ -77,6 +79,12 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
 	private DismissEntity dismissEntity;
 
+	private int page = 1;
+	private boolean isRemove;
+	private boolean isNetworkError;
+	private int per_page = 20;
+	private String id;
+
 	public SubjectAdapter(Context context,
 						  RecyclerView recyclerView,
 						  ProgressBarCircularIndeterminate pbLoading,
@@ -100,14 +108,18 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		DownloadItemUtils.initializeGameMap(context, gameMap);
 
 		list = new ArrayList<GameEntity>();
+		isLoaded = false;
+		isNetworkError = false;
+		this.id = id;
 
-		initList(id);
+		initList(page);
 	}
 
-	private void initList(String id) {
+	public void initList(final int page) {
+		isLoaded =false;
 		JsonArrayExtendedRequest request = new JsonArrayExtendedRequest(
 				TimestampUtils.addTimestamp(Config.HOST
-						+ "v1d50/game/column/" + id, Constants.GAME_CD),
+						+ "v1d50/game/column/" + id +"?page="+ page, Constants.GAME_CD),
 				new Response.Listener<JSONArray>() {
 
 					@Override
@@ -122,12 +134,19 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 				// 无网络连接
 				if (error.getClass().equals(NoConnectionError.class)
 						|| error.getClass().equals(TimeoutError.class)) {
-					if (subject_pb_loading != null && subject_pb_loading.getVisibility() == View.VISIBLE) {
-						subject_pb_loading.setVisibility(View.GONE);
+					if (page == 1){
+						if (subject_pb_loading != null && subject_pb_loading.getVisibility() == View.VISIBLE) {
+							subject_pb_loading.setVisibility(View.GONE);
+						}
+						Toast.makeText(context, "网络错误", Toast.LENGTH_SHORT).show();
+						subject_list.setVisibility(View.GONE);
+						reuse_no_connection.setVisibility(View.VISIBLE);
+					}else {
+						Toast.makeText(context, "网络错误", Toast.LENGTH_SHORT).show();
+						isNetworkError = true;
+						notifyDataSetChanged();
 					}
-					Toast.makeText(context, "网络错误", Toast.LENGTH_SHORT).show();
-					subject_list.setVisibility(View.GONE);
-					reuse_no_connection.setVisibility(View.VISIBLE);
+
 				}
 			}
 
@@ -149,7 +168,8 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 							entity.getId(), entity.getName()));
 				}
 			}
-			list = gameList;
+			list.addAll(gameList);
+
 			notifyItemRangeInserted(list.size() - gameList.size(), gameList.size());
 		}
 
@@ -165,20 +185,36 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		if (subject_pb_loading != null && subject_pb_loading.getVisibility() == View.VISIBLE) {
 			subject_pb_loading.setVisibility(View.GONE);
 		}
+		if (list.isEmpty() ||  gameList.size() < 20) {
+			isRemove = true;
+			notifyDataSetChanged();
+		}
+		isLoaded = true;
 	}
 
 	@Override
 	public int getItemCount() {
-		return list.size();
+		if (list.size()<1){
+			return 0;
+		}
+		return list.size()+1;
 	}
 
 	@Override
 	public int getItemViewType(int position) {
+		if (list.size() == position) {
+			return FOOTER_ITEM;
+		}
 		return position;
 	}
 
 	@Override
 	public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+		if (i == FOOTER_ITEM){
+			View view = LayoutInflater.from(viewGroup.getContext()).inflate(
+					R.layout.refresh_footerview, viewGroup, false);
+			return new FooterViewHolder(view);
+		}
 		if (list.get(i).getTest() != null) {
 			View view = LayoutInflater.from(viewGroup.getContext()).inflate(
 					R.layout.home_game_test_item, viewGroup, false);
@@ -196,6 +232,32 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 			initGameNormalViewHolder((GameNormalViewHolder) viewHolder, position);
 		} else if (viewHolder instanceof GameTestViewHolder) {
 			initGameTestViewHolder((GameTestViewHolder) viewHolder, position);
+		} else if (viewHolder instanceof FooterViewHolder){
+			initFooterViewHolder((FooterViewHolder) viewHolder);
+		}
+	}
+
+	private void initFooterViewHolder(FooterViewHolder viewHolder) {
+		if (isNetworkError) {
+			viewHolder.footerview_progressbar.setVisibility(View.GONE);
+			viewHolder.footerview_tv_loading.setText("加载失败，点击重试");
+			viewHolder.itemView.setClickable(true);
+			viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					isNetworkError = false;
+					notifyDataSetChanged();
+					initList(list.size()/per_page+1);
+				}
+			});
+		} else if (isRemove) {
+			viewHolder.footerview_progressbar.setVisibility(View.GONE);
+			viewHolder.footerview_tv_loading.setText("加载完毕");
+			viewHolder.itemView.setClickable(false);
+		} else {
+			viewHolder.footerview_progressbar.setVisibility(View.VISIBLE);
+			viewHolder.footerview_tv_loading.setText("加载中...");
+			viewHolder.itemView.setClickable(false);
 		}
 	}
 
@@ -347,4 +409,8 @@ public class SubjectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 		return dismissEntity;
 	}
 
+	public boolean isLoaded(){
+		return isLoaded;
+	}
+
 }
diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
index d698ea2537..13d24f542d 100644
--- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
@@ -693,7 +693,11 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
         for (int i = 0, size = subjectList.size(); i < size; i++) {
             if (position > offset && position <= subjectList.get(i).getData().size() + offset) {
-                gameEntity = subjectList.get(i).getData().get(position - offset - 1);
+                int index = position -offset-1;
+                if (index<0){
+                    index = 0;
+                }
+                gameEntity = subjectList.get(i).getData().get(index);
                 if (TextUtils.isEmpty(gameEntity.getImage()) && gameEntity.getTest() == null) {
                     int order = position - offset - 1;
                     if (subjectList.get(i).getData().get(0).getImage() != null) {
@@ -828,7 +832,11 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
         for (int i = 0, size = subjectList.size(); i < size; i++) {
             if (position >= offset && position <= subjectList.get(i).getData().size() + offset){
-                gameEntity = subjectList.get(i).getData().get(position - offset);
+                int index = position -offset-1;
+                if (index<0){
+                    index = 0;
+                }
+                gameEntity = subjectList.get(i).getData().get(index);
                 if (position == offset && TextUtils.isEmpty(gameEntity.getImage()) || position == offset+1&&!TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
                     holder.thumb.setVisibility(View.GONE);
                     holder.title.setText(subjectList.get(i).getName());
diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
index c9ec280a80..4cce1563b0 100644
--- a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java
@@ -309,7 +309,11 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GameEntity gameEntity;
         for (int i = 0; i < subjectList.size(); i++) {
             if (position >= offset && position <= subjectList.get(i).getData().size() + offset) {
-                gameEntity = subjectList.get(i).getData().get(position - offset);
+                int index = position -offset;
+                if (index<0){
+                    index = 0;
+                }
+                gameEntity = subjectList.get(i).getData().get(index);
                 if (position == offset && TextUtils.isEmpty(gameEntity.getImage()) || position == offset+1&&!TextUtils.isEmpty(subjectList.get(i).getData().get(0).getImage())) {
                     holder.thumb.setVisibility(View.GONE);
                     holder.title.setText(subjectList.get(i).getName());
@@ -346,7 +350,11 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GameEntity gameEntity;
         for (int i = 0, size = subjectList.size(); i < size; i++) {
             if (position > offset && position <= subjectList.get(i).getData().size() + offset) {
-                gameEntity = subjectList.get(i).getData().get(position - offset - 1);
+                int index = position -offset-1;
+                if (index<0){
+                    index = 0;
+                }
+                gameEntity = subjectList.get(i).getData().get(index);
                 if (TextUtils.isEmpty(gameEntity.getImage()) && gameEntity.getTest() == null) {
                     int order = position - offset - 1;
                     if (subjectList.get(i).getData().get(0).getImage() != null) {
@@ -405,7 +413,11 @@ public class Game2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GameEntity gameEntity;
         for (int i = 0, size = subjectList.size(); i < size; i++) {
             if (position >= offset && position <= subjectList.get(i).getData().size() + offset) {
-                gameEntity = subjectList.get(i).getData().get(position - offset - 1);
+                int index = position -offset-1;
+                if (index<0){
+                    index = 0;
+                }
+                gameEntity = subjectList.get(i).getData().get(index);
                 if (gameEntity.getTest() != null) {
                     int order = position - offset - 1;
                     if (subjectList.get(i).getData().get(0).getImage() != null) {
diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
index 249a5fefc4..5671942808 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -1,12 +1,10 @@
 package com.gh.gamecenter.news;
 
-import android.app.Activity;
 import android.content.Context;
 import android.support.v4.util.ArrayMap;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -319,7 +317,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         });
         viewHolder.fm_read2_special1_title.setText(newsEntity.getTitle());
         ImageUtils.getInstance(context).display(newsEntity.getThumbnail().getUrl().get(0),
-                viewHolder.fm_read2_special1_thumb);
+                viewHolder.fm_read2_special1_thumb,1,context);
         Integer views = viewsMap.get(newsEntity.getId());
         if (views == null) {
             viewHolder.fm_read2_special1_ll_read.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java
index db2982b658..bfdbd5683d 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java
@@ -317,7 +317,7 @@ public class News2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         });
         viewHolder.fm_read2_special1_title.setText(newsEntity.getTitle());
         ImageUtils.getInstance(context).display(newsEntity.getThumbnail().getUrl().get(0),
-                viewHolder.fm_read2_special1_thumb);
+                viewHolder.fm_read2_special1_thumb,1,context);
         Integer views = viewsMap.get(newsEntity.getId());
         if (views == null) {
             viewHolder.fm_read2_special1_ll_read.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable-nodpi/splash_01.jpg b/app/src/main/res/drawable-nodpi/splash_01.jpg
index 5a83c49242..80702029ed 100644
Binary files a/app/src/main/res/drawable-nodpi/splash_01.jpg and b/app/src/main/res/drawable-nodpi/splash_01.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/splash_02.jpg b/app/src/main/res/drawable-nodpi/splash_02.jpg
index a025be4922..e1ebc00780 100644
Binary files a/app/src/main/res/drawable-nodpi/splash_02.jpg and b/app/src/main/res/drawable-nodpi/splash_02.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/splash_03.jpg b/app/src/main/res/drawable-nodpi/splash_03.jpg
index 7cefe3f361..a98e2def0d 100644
Binary files a/app/src/main/res/drawable-nodpi/splash_03.jpg and b/app/src/main/res/drawable-nodpi/splash_03.jpg differ
diff --git a/app/src/main/res/drawable-nodpi/splash_04.jpg b/app/src/main/res/drawable-nodpi/splash_04.jpg
index b4fd3841c2..065a4299e4 100644
Binary files a/app/src/main/res/drawable-nodpi/splash_04.jpg and b/app/src/main/res/drawable-nodpi/splash_04.jpg differ
diff --git a/app/src/main/res/layout/home_game_normal_item.xml b/app/src/main/res/layout/home_game_normal_item.xml
index 666f781153..c0b7df9df9 100644
--- a/app/src/main/res/layout/home_game_normal_item.xml
+++ b/app/src/main/res/layout/home_game_normal_item.xml
@@ -8,14 +8,14 @@
 
     <TextView
         android:id="@+id/home1_game_order"
-        android:layout_width="20dp"
+        android:layout_width="25dp"
         android:layout_height="wrap_content"
         android:text="1"
         android:gravity="center"
         android:layout_centerVertical="true"
         android:textColor="#333333"
         android:layout_marginRight="4dp"
-        android:maxLength="2"
+        android:maxLength="3"
         android:textSize="14sp"
         android:visibility="gone"/>