diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java
index 53b0ea2686..bfc520fb39 100644
--- a/app/src/main/java/com/gh/common/view/DownloadDialog.java
+++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java
@@ -112,8 +112,8 @@ public class DownloadDialog {
 							adapterMap.get(position - 1).notifyItemChanged(location % (row * column));
 						}
 
-						if (position - 1 < collectionAdapterMap.size()){
-							if (collectionAdapterMap != null && collectionAdapterMap.size() >= position - 1 && collectionAdapterMap.size() >= 1){
+						if (collectionAdapterMap != null && position - 1 < collectionAdapterMap.size()){
+							if ( collectionAdapterMap.size() >= position - 1 && collectionAdapterMap.size() >= 1){
 								collectionAdapterMap.get(position - 1).notifyItemChanged(location % (row * column));
 							}
 						}
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
index 70ece56efa..93419faf62 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
@@ -3,10 +3,10 @@ package com.gh.gamecenter;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.util.ArrayMap;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
@@ -156,8 +156,8 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis
 
         //初始化关注
         concernManager = new ConcernManager(getApplicationContext());
-        for (int i = 0; i < concernManager.getAllConcern().size(); i++) {
-            if (concernManager.getAllConcern().get(i).getId().equals(gameId)){
+        for (int i = 0; i < concernManager.getConcernGame().size(); i++) {
+            if (concernManager.getConcernGame().get(i).getId().equals(gameId)){
                 isConcern = true;
             }
         }
@@ -727,11 +727,28 @@ public class GameDetailsActivity extends BaseActivity implements View.OnClickLis
             if ( childCount == 0){
                 for (int i =0;i<entity.getNews().size();i++){
                     RelativeLayout rlChild = (RelativeLayout) LayoutInflater.from(context).inflate(R.layout.gamedetails_zixun_item,null);
+
                     TextView tv_tag = (TextView) rlChild.findViewById(R.id.gamedetails_rv_item_zixun_tag);
+                    ViewGroup.LayoutParams layoutParams = tv_tag.getLayoutParams();
+                    layoutParams.width = DisplayUtils.dip2px(GameDetailsActivity.this,28);
+                    layoutParams.height = DisplayUtils.dip2px(GameDetailsActivity.this,17);
+                    tv_tag.setLayoutParams(layoutParams);
+                    if ("活动".equals(entity.getNews().get(i).getType())){
+                        tv_tag.setTextColor(Color.WHITE);
+                        tv_tag.setBackgroundResource(R.drawable.textview_orange_style);
+                    } else if ("公告".equals(entity.getNews().get(i).getType())){
+                        tv_tag.setTextColor(Color.WHITE);
+                        tv_tag.setBackgroundResource(R.drawable.textview_red_style);
+                    } else {
+                        tv_tag.setTextColor(Color.WHITE);
+                        tv_tag.setBackgroundResource(R.drawable.textview_blue_style);
+                    }
+                    tv_tag.setText(entity.getNews().get(i).getType());
+
                     TextView tv_title = (TextView) rlChild.findViewById(R.id.gamedetails_rv_item_zixun_title);
                     rlChild.setBackgroundResource(R.drawable.cardview_item_style);
-                    tv_tag.setText(entity.getNews().get(i).getType());
                     tv_title.setText(entity.getNews().get(i).getTitle());
+
                     llContainer.addView(rlChild);
                     final int finalI = i;
                     rlChild.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
index d979bca62a..7092e54976 100644
--- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
@@ -122,7 +122,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen
 			public boolean onTouch(View v, MotionEvent event) {
 				if (event.getAction() == MotionEvent.ACTION_DOWN) {
 					startY = event.getY();
-				} else if (event.getAction() == MotionEvent.ACTION_DOWN) {
+				} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
 					if (Math.abs(startY - event.getY()) > 0) {
 						return true;
 					}
@@ -141,6 +141,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen
 		game_news_list.setAdapter(adapter);
 
 		game_news_top_type_list.setVisibility(View.GONE);
+		ivSearch.setVisibility(View.GONE);
 		typeListAdapter.setNewsType(change.getType(), change.getPosition());
 	}
 
diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
index 2a9020e5fe..83ac67a542 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
@@ -9,7 +9,6 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.support.v4.util.ArrayMap;
 import android.support.v4.view.MotionEventCompat;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
@@ -426,8 +425,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
             String url = "http://news.ghzhushou.com/" + entity.getId()
                     + ".html";
             if (gameEntity == null){
-                showShare(url, gameEntity.getName(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle()
-                        , gameEntity.getTag(), entrance, "新闻");
+                showShare(url, entity.getTitle(), "http://image.ghzhushou.com/pic/56976f928ab49edc6e8b45f1.png",entity.getTitle()
+                        , null, entrance, "新闻");
             }else {
                 showShare(url, gameEntity.getName(), gameEntity.getIcon(), entity.getTitle(), gameEntity.getTag(), entrance
                         , "新闻");
@@ -1014,8 +1013,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
                     holder.cardView.setVisibility(View.VISIBLE);
                     ImageUtils.getInstance(getApplicationContext()).displayFile(gameEntity.getIcon(), holder.essaydetails_icon);
                     holder.essaydetails_name.setText(gameEntity.getName());
-                    for (int i = 0; i < concernManager.getAllConcern().size(); i++) {
-                        if (concernManager.getAllConcern().get(i).getId().equals(gameEntity.getId())){
+                    for (int i = 0; i < concernManager.getConcernGame().size(); i++) {
+                        if (concernManager.getConcernGame().get(i).getId().equals(gameEntity.getId())){
                             isConcern = true;
                         }
                     }
diff --git a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
index eecf875409..c6e8bd2697 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
@@ -106,7 +106,7 @@ public class News4Fragment extends Fragment implements News4FragmentAdapter.OnCa
                 super.onScrollStateChanged(recyclerView, newState);
                 if (mNews4FragmentAdapter != null &&newState == RecyclerView.SCROLL_STATE_IDLE
                         &&mLayoutManager.findLastVisibleItemPosition() + 1 == mNews4FragmentAdapter.getItemCount()
-                        &&isLoadOver &&!isRemove &&!isNetworkError){
+                        &&isLoadOver &&!isRemove &&!isNetworkError && reuse_none_data.getVisibility() == View.GONE){
                     isLoadOver = false;
                     page++;
                     mNews4FragmentAdapter.loadJosnData(page);
@@ -218,6 +218,7 @@ public class News4Fragment extends Fragment implements News4FragmentAdapter.OnCa
                 mSwipeRefreshLayout.setRefreshing(false);
             }
             reuse_none_data.setVisibility(View.VISIBLE);
+            mProgressBar.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/res/layout/gamedetails_zixun_item.xml b/app/src/main/res/layout/gamedetails_zixun_item.xml
index 24a0cc22b1..f114b83432 100644
--- a/app/src/main/res/layout/gamedetails_zixun_item.xml
+++ b/app/src/main/res/layout/gamedetails_zixun_item.xml
@@ -32,6 +32,7 @@
             android:id="@+id/gamedetails_rv_item_zixun_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="《刀塔传奇》剧毒皇后-蜘蛛女郎" />
+            android:text="《刀塔传奇》剧毒皇后-蜘蛛女郎"
+            android:singleLine="true"/>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file