diff --git a/PushSDK/AndroidManifest.xml b/PushSDK/AndroidManifest.xml
index 310c22244a..67c0870f86 100644
--- a/PushSDK/AndroidManifest.xml
+++ b/PushSDK/AndroidManifest.xml
@@ -98,7 +98,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="${applicationId}.intent.action.COMMAND" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -139,7 +139,7 @@
         </service>
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="${applicationId}.umeng.message"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false">
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml b/PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml
index bb9dbc1b89..01acaa79f1 100644
--- a/PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml
+++ b/PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml
@@ -99,7 +99,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true" >
             <intent-filter>
-                <action android:name="${applicationId}.intent.action.COMMAND" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -141,7 +141,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="${applicationId}.umeng.message"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml b/PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml
index 1d8d63b392..01acaa79f1 100644
--- a/PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml
+++ b/PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml
@@ -99,7 +99,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true" >
             <intent-filter>
-                <action android:name="dollar_openBracket_applicationId_closeBracket" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -141,7 +141,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="dollar_openBracket_applicationId_closeBracket"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/bundles/release/AndroidManifest.xml b/PushSDK/build/intermediates/bundles/release/AndroidManifest.xml
index bb9dbc1b89..01acaa79f1 100644
--- a/PushSDK/build/intermediates/bundles/release/AndroidManifest.xml
+++ b/PushSDK/build/intermediates/bundles/release/AndroidManifest.xml
@@ -99,7 +99,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true" >
             <intent-filter>
-                <action android:name="${applicationId}.intent.action.COMMAND" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -141,7 +141,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="${applicationId}.umeng.message"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml b/PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml
index 1d8d63b392..01acaa79f1 100644
--- a/PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml
+++ b/PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml
@@ -99,7 +99,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true" >
             <intent-filter>
-                <action android:name="dollar_openBracket_applicationId_closeBracket" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -141,7 +141,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="dollar_openBracket_applicationId_closeBracket"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/bundles/release/classes.jar b/PushSDK/build/intermediates/bundles/release/classes.jar
index 3b80139d23..17f3e019e1 100644
Binary files a/PushSDK/build/intermediates/bundles/release/classes.jar and b/PushSDK/build/intermediates/bundles/release/classes.jar differ
diff --git a/PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml b/PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
index d4fef61d7a..3043bfaba5 100644
--- a/PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
+++ b/PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
@@ -105,7 +105,7 @@
             android:name="com.taobao.agoo.AgooCommondReceiver"
             android:exported="true" >
             <intent-filter>
-                <action android:name="com.umeng.message.lib.test.intent.action.COMMAND" />
+                <action android:name="com.gh.gamecenter.intent.action.COMMAND" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REMOVED" />
@@ -147,7 +147,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="com.umeng.message.lib.test.umeng.message"
+            android:authorities="com.gh.gamecenter.umeng.message"
             android:exported="false" >
             <grant-uri-permission android:pathPattern=".*" />
         </provider>
diff --git a/PushSDK/build/intermediates/res/resources-debug-androidTest.ap_ b/PushSDK/build/intermediates/res/resources-debug-androidTest.ap_
index d4472e0ae4..1dd66082b7 100644
Binary files a/PushSDK/build/intermediates/res/resources-debug-androidTest.ap_ and b/PushSDK/build/intermediates/res/resources-debug-androidTest.ap_ differ
diff --git a/PushSDK/build/outputs/aar/PushSDK-debug.aar b/PushSDK/build/outputs/aar/PushSDK-debug.aar
index 59dddc5c93..419646f538 100644
Binary files a/PushSDK/build/outputs/aar/PushSDK-debug.aar and b/PushSDK/build/outputs/aar/PushSDK-debug.aar differ
diff --git a/PushSDK/build/outputs/aar/PushSDK-release.aar b/PushSDK/build/outputs/aar/PushSDK-release.aar
index 56d8975c6f..0198eac469 100644
Binary files a/PushSDK/build/outputs/aar/PushSDK-release.aar and b/PushSDK/build/outputs/aar/PushSDK-release.aar differ
diff --git a/PushSDK/libs/arm64-v8a/libcocklogic-1.1.3.so b/PushSDK/libs/arm64-v8a/libcocklogic-1.1.3.so
new file mode 100644
index 0000000000..2f58430fbc
Binary files /dev/null and b/PushSDK/libs/arm64-v8a/libcocklogic-1.1.3.so differ
diff --git a/PushSDK/libs/arm64-v8a/libtnet-3.1.7.so b/PushSDK/libs/arm64-v8a/libtnet-3.1.7.so
new file mode 100644
index 0000000000..be143c5c72
Binary files /dev/null and b/PushSDK/libs/arm64-v8a/libtnet-3.1.7.so differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e17c80425..2428c4a700 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,6 +74,7 @@
             android:value="GH_TEST"/>
         <!--android:value="${CHANNEL_VALUE}"-->
 
+        <!-- 友盟推送 -->
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="585a29fa8f4a9d327600023e">
@@ -173,21 +174,6 @@
                 <category android:name="android.intent.category.BROWSABLE"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.mob.tools.MobUIShell"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
-            <intent-filter>
-                <data android:scheme="tencent100371282" />
-
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="com.gh.gamecenter.wxapi.WXEntryActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
diff --git a/app/src/main/java/com/gh/common/util/GiftUtils.java b/app/src/main/java/com/gh/common/util/GiftUtils.java
index 96ae560ac4..1f1ac9d1db 100644
--- a/app/src/main/java/com/gh/common/util/GiftUtils.java
+++ b/app/src/main/java/com/gh/common/util/GiftUtils.java
@@ -4,6 +4,7 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
@@ -206,6 +207,7 @@ public class GiftUtils {
     public static void initGiftBtn(final TextView giftBtn, final GiftEntity giftEntity, final GiftDao giftDao,
                                    final boolean isInstallRequired, final GiftDetailAdapter adapter) {
 
+        giftBtn.setTextColor(Color.WHITE);
         switch (giftEntity.getGiftStatus()) {
             case "coming":
                 giftBtn.setText("未开抢");
@@ -229,11 +231,13 @@ public class GiftUtils {
                 break;
             case "linged":
                 giftBtn.setText("已领取");
-                giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                giftBtn.setBackgroundResource(R.drawable.gift_linged_bg);
+                giftBtn.setTextColor(Color.parseColor("#06D0A8"));
                 break;
             case "taoed":
                 giftBtn.setText("已淘号");
-                giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                giftBtn.setBackgroundResource(R.drawable.gift_taoed_bg);
+                giftBtn.setTextColor(Color.parseColor("#ffb13c"));
                 break;
             case "copy":
                 giftBtn.setText("复制");
@@ -247,13 +251,27 @@ public class GiftUtils {
         giftBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if ("领取".equals(giftBtn.getText().toString()) || "淘号".equals(giftBtn.getText().toString())) {
+                    if (isInstallRequired && !isAppInstalled(giftBtn.getContext(), giftEntity.getPackageName())) {
+                        String platform;
+                        if (TextUtils.isEmpty(giftEntity.getPlatform())) {
+                            platform = "";
+                        } else {
+                            platform = PlatformUtils.getInstance(giftBtn.getContext())
+                                    .getPlatformName(giftEntity.getPlatform()) + "版";
+                        }
 
-                if (isInstallRequired && !isAppInstalled(giftBtn.getContext(), giftEntity.getPackageName())) {
-                    DialogUtils.showHintDialog(giftBtn.getContext(), "条件不符"
-                            , "请先安装《" +  giftEntity.getGame().getName()
-                                    + PlatformUtils.getInstance(giftBtn.getContext())
-                                    .getPlatformName(giftEntity.getPlatform()) + "》版", "知道了");
-                    return;
+                        DialogUtils.showWarningDialog(giftBtn.getContext(), "条件不符",
+                                "请先安装《" + giftEntity.getGame().getName() + "》 "
+                                        + platform, "关闭", "立即安装"
+                                , new DialogUtils.ConfiremListener() {
+                                    @Override
+                                    public void onConfirem() {
+                                        adapter.openDownload();
+                                    }
+                                }, null);
+                        return;
+                    }
                 }
 
                 switch (giftBtn.getText().toString()) {
@@ -287,11 +305,12 @@ public class GiftUtils {
 //                                Utils.toast(giftBtn.getContext(), "领取成功");
                                 giftDao.add(new GiftInfo(giftEntity.getId(), giftEntity.getContent(), giftEntity.getIcon()
                                         , giftEntity.getName(),giftEntity.getPlatform(), giftEntity.getGiftStatus(), giftEntity.getGame().getId()
-                                        , giftEntity.getGame().getName(), giftCode, giftEntity.getAvailable(), giftEntity.getTotal()));
+                                        , giftEntity.getGame().getName(), giftCode, giftEntity.getAvailable() - 1, giftEntity.getTotal()));
 
                                 EventBus.getDefault().post(new EBReuse("giftChanged"));
 
                                 giftEntity.setGiftStatus("linged");
+                                giftEntity.setAvailable(giftEntity.getAvailable() - 1);
                                 adapter.initGiftDao();
                                 adapter.notifyDataSetChanged();
 
@@ -303,6 +322,15 @@ public class GiftUtils {
                                             @Override
                                             public void onConfirem() {
                                                 copyLink(finalGiftCode, giftBtn.getContext());
+                                                if (isInstallRequired) {
+                                                    giftBtn.postDelayed(new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            lunningAppDialog(giftBtn.getContext()
+                                                                    , "请尽快进入游戏兑换", giftEntity);
+                                                        }
+                                                    }, 300);
+                                                }
                                             }
                                         }, null);
                             }
@@ -386,6 +414,16 @@ public class GiftUtils {
                                             @Override
                                             public void onConfirem() {
                                                 copyLink(finalGiftCode, giftBtn.getContext());
+
+                                                if (isInstallRequired) {
+                                                    giftBtn.postDelayed(new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            lunningAppDialog(giftBtn.getContext()
+                                                                    , "淘号礼包不保证可用，请尽快进入游戏尝试兑换", giftEntity);
+                                                        }
+                                                    }, 300);
+                                                }
                                             }
                                         }, null);
                             }
@@ -450,6 +488,23 @@ public class GiftUtils {
         return false;
     }
 
+    public static void lunningAppDialog (final Context context, String msg, final GiftEntity giftEntity) {
+        DialogUtils.showWarningDialog(context, "复制成功", msg
+                , "关闭", "启动游戏"
+                , new DialogUtils.ConfiremListener() {
+                    @Override
+                    public void onConfirem() {
+                        if (GiftUtils.isAppInstalled(context, giftEntity.getPackageName())) {
+                            PackageUtils.launchApplicationByPackageName(context, giftEntity.getPackageName());
+                        } else {
+                            Utils.toast(context, "请安装游戏：" +  giftEntity.getGame().getName()
+                                    + PlatformUtils.getInstance(context).getPlatformName(giftEntity.getPlatform()) + "版");
+                        }
+
+                    }
+                }, null);
+    }
+
 
     //复制文字
     public static void copyLink(String copyContent, Context context) {
diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java
index 27985e018a..40c6bc91d9 100644
--- a/app/src/main/java/com/gh/common/util/NewsUtils.java
+++ b/app/src/main/java/com/gh/common/util/NewsUtils.java
@@ -128,7 +128,7 @@ public class NewsUtils {
 			long today = format.parse(format.format(new Date())).getTime();
 			if (time >= today && time < today + 86400 * 1000) {
 				format.applyPattern("HH:mm");
-				textView.setText(String.format("今天 %s", format.format(time)));
+				textView.setText(format.format(time));
 			} else if (time >= today - 86400 * 1000 && time < today) {
 				format.applyPattern("HH:mm");
 				textView.setText(String.format("昨天 %s", format.format(time)));
diff --git a/app/src/main/java/com/gh/common/util/SpeedUtils.java b/app/src/main/java/com/gh/common/util/SpeedUtils.java
index b1846695c6..d7af92b9c0 100644
--- a/app/src/main/java/com/gh/common/util/SpeedUtils.java
+++ b/app/src/main/java/com/gh/common/util/SpeedUtils.java
@@ -11,7 +11,7 @@ public class SpeedUtils {
 			}
 			return str + "MB/s";
 		}
-		return kSpeed + "K/s";
+		return kSpeed + "KB/s";
 	}
 
 	public static String getRemainTime(long totalSize, long currentSize, long speed) {
diff --git a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java
index 5f52c8e691..bd3fbbb009 100644
--- a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java
+++ b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java
@@ -59,7 +59,7 @@ public class Concern_LinearLayout extends LinearLayout {
 
 	public Concern_LinearLayout(Context context, AttributeSet attrs) {
 		super(context, attrs);
-		height = DisplayUtils.dip2px(context, 121);
+		height = DisplayUtils.dip2px(context, 150);
 		distance = DisplayUtils.dip2px(context, 6);
 	}
 
diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java
index 23b17adfd0..0d1cae8b7e 100644
--- a/app/src/main/java/com/gh/download/DownloadManager.java
+++ b/app/src/main/java/com/gh/download/DownloadManager.java
@@ -222,7 +222,7 @@ public class DownloadManager {
 									  String location) {
 
 		// 安装指引
-		if ("Huawei".equals(Build.BRAND) || "Oppo".equals(Build.BRAND)) {
+		if (Build.BOARD.equals("Huawei") || "Oppo".equals(Build.BRAND)) {
 			SharedPreferences sp = context.getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);
 			final SharedPreferences.Editor edit = sp.edit();
 			if (sp.getBoolean("InstallHint" +  PackageUtils.getVersionName(context), true)) {
diff --git a/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
index 94a2f2a4a3..88cd849ac2 100644
--- a/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
@@ -2,6 +2,7 @@ package com.gh.gamecenter;
 
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.base.AppController;
@@ -41,7 +42,7 @@ public class GiftDetailActivity extends BaseDetailActivity {
 
         iv_share.setVisibility(View.GONE);
 
-        mAdapter = new GiftDetailAdapter(this, mGiftEntity);
+        mAdapter = new GiftDetailAdapter(this, mGiftEntity, detail_tv_download);
         detail_rv_show.setLayoutManager(new LinearLayoutManager(this));
         detail_rv_show.setAdapter(mAdapter);
 
@@ -86,6 +87,10 @@ public class GiftDetailActivity extends BaseDetailActivity {
                             }
                         }
 
+                        if (TextUtils.isEmpty(mGiftEntity.getPackageName()) && gameEntity.getApk().size() > 0) {
+                            mGiftEntity.setPackageName(gameEntity.getApk().get(0).getPackageName());
+                        }
+
                         mAdapter.addGiftDetail();
                     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
index 04f1338d8a..cbac8c92e5 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
@@ -108,7 +108,7 @@ public class ShareCardActivity extends BaseActivity {
             @Override
             public void run() {
                 final String filePath = getExternalCacheDir().getPath() + "/ShareImg/ShareQRCode.jpg";
-                boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html", 200, 200, filePath);
+                boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200", 200, 200, filePath);
                 if (success) {
                     runOnUiThread(new Runnable() {
                         @Override
diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
index 24de4d708a..358052366f 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
@@ -152,7 +152,7 @@ public class ShareCardPicActivity extends BaseActivity {
             @Override
             public void run() {
                 final String filePath = getExternalCacheDir().getPath() + "/ShareImg/ShareQRCode.jpg";
-                boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html", 200, 200, filePath);
+                boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200", 200, 200, filePath);
                 if (success) {
                     runOnUiThread(new Runnable() {
                         @Override
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index 75bcb4f99c..bdedd3d00d 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -42,6 +42,7 @@ public class WebActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //TODO 接入推送打开网页的类型
 
         String webUrl = getIntent().getStringExtra("url");
         String webTitle = getIntent().getStringExtra("gameName");
@@ -148,7 +149,7 @@ public class WebActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         // 刷新评论数
-        if (resultCode == 1001 ) {
+        if (resultCode == 1001 && progressBar.getVisibility() == View.VISIBLE) {
             webComment.setText("查看评论(" + data.getExtras().getInt("commentNum") + ")");
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java
index e2651e53f5..c41a122f92 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java
@@ -11,12 +11,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.GiftUtils;
-import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.Utils;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GiftDetailTopViewHolder;
@@ -45,6 +42,8 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private OnCallBackListener mCallBackListener;
 
+    private TextView mDownloadTv;
+
     private GiftEntity mGiftEntity;
     private GiftDetailEntity mGiftDetailEntity;
 
@@ -52,10 +51,11 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private List<GiftInfo> mGiftInfos;
 
-    public GiftDetailAdapter(GiftDetailActivity giftDetailActivity, GiftEntity giftEntity) {
+    public GiftDetailAdapter(GiftDetailActivity giftDetailActivity, GiftEntity giftEntity, TextView tvDownload) {
         this.mContext = giftDetailActivity;
         this.mCallBackListener = giftDetailActivity;
         this.mGiftEntity = giftEntity;
+        this.mDownloadTv = tvDownload;
 
         mGiftDao = new GiftDao(mContext);
         mGiftInfos = mGiftDao.getAll();
@@ -146,9 +146,16 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             if (mGiftDetailEntity.getInstallRequired()) {
                 TextView textView = new TextView(mContext);
                 textView.setTextColor(Color.parseColor("#717171"));
-                Spanned content =  Html.fromHtml("领取条件：" + "<font color=\"#06D0A8\">安装《" +
-                        mGiftEntity.getGame().getName() + "》" + PlatformUtils.getInstance(mContext)
-                        .getPlatformName(mGiftEntity.getPlatform()) + "版</font>");
+                Spanned content;
+                if (TextUtils.isEmpty(mGiftEntity.getPlatform())) {
+                    content =  Html.fromHtml("领取条件：" + "<font color=\"#06D0A8\">安装《" +
+                            mGiftEntity.getGame().getName() + "》</font>");
+                } else {
+                    content =  Html.fromHtml("领取条件：" + "<font color=\"#06D0A8\">安装《" +
+                            mGiftEntity.getGame().getName() + "》" + PlatformUtils.getInstance(mContext)
+                            .getPlatformName(mGiftEntity.getPlatform()) + "版</font>");
+                }
+
                 textView.setText(content);
                 holder.gamedetail_item_news_list.addView(textView);
             }
@@ -175,8 +182,12 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private void initGiftDetailTop(GiftDetailTopViewHolder holder) {
         holder.giftGameIcon.setImageURI(mGiftEntity.getIcon());
         holder.giftName.setText(mGiftEntity.getName());
-        holder.giftGameName.setText(mGiftEntity.getGame().getName() + PlatformUtils.getInstance(mContext)
-                .getPlatformName(mGiftEntity.getPlatform()) + "版");
+        if (TextUtils.isEmpty(mGiftEntity.getPlatform())) {
+            holder.giftGameName.setText(mGiftEntity.getGame().getName());
+        } else {
+            holder.giftGameName.setText(mGiftEntity.getGame().getName() + "-" +PlatformUtils.getInstance(mContext)
+                    .getPlatformName(mGiftEntity.getPlatform()));
+        }
 
         int count = (int)(((float)mGiftEntity.getAvailable()/(float)mGiftEntity.getTotal()) * 100);
         Spanned content = null;
@@ -194,7 +205,6 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         for (final GiftInfo giftInfo : mGiftInfos) {
             if (giftInfo.getGiftId().equals(mGiftEntity.getId())) {
                 holder.giftCopyBtn.setText("复制");
-                holder.giftCopyBtn.setBackgroundResource(R.drawable.textview_blue_style);
                 holder.giftCopyBtn.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -202,26 +212,13 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                             String msg;
                             if ("ling".equals(giftInfo.getGiftStatus())) {
                                 msg = "礼包码：" + giftInfo.getGiftCode() +
-                                        "\n请尽快使用，礼包码将于60分钟后进入淘号池";
+                                        "\n请尽快进入游戏兑换";
                             } else {
                                 msg = "礼包码：" + giftInfo.getGiftCode() +
                                         "\n淘号礼包不保证可用，请尽快进入游戏尝试兑换";
                             }
 
-                            DialogUtils.showWarningDialog(mContext, "复制成功", msg
-                                    , "关闭", "启动游戏"
-                                    , new DialogUtils.ConfiremListener() {
-                                        @Override
-                                        public void onConfirem() {
-                                            if (GiftUtils.isAppInstalled(mContext, mGiftEntity.getPackageName())) {
-                                                PackageUtils.launchApplicationByPackageName(mContext, mGiftEntity.getPackageName());
-                                            } else {
-                                                Utils.toast(mContext, "请安装游戏：" +  mGiftEntity.getGame().getName()
-                                                        + PlatformUtils.getInstance(mContext).getPlatformName(mGiftEntity.getPlatform()) + "版");
-                                            }
-
-                                        }
-                                    }, null);
+                            GiftUtils.lunningAppDialog(mContext, msg, mGiftEntity);
                         }
                         GiftUtils.copyLink(giftInfo.getGiftCode(), mContext);
                     }
@@ -230,6 +227,8 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 Spanned giftCode;
                 if ("ling".equals(giftInfo.getGiftStatus())) {
                     giftCode =  Html.fromHtml("已领取：" + "<font color=\"#00B7FA\">" +giftInfo.getGiftCode()+ "</font>");
+                    holder.giftCopyBtn.setBackgroundResource(R.drawable.gift_linged_bg);
+                    holder.giftCopyBtn.setTextColor(Color.parseColor("#06D0A8"));
                     if (count == 0) {
                         content = Html.fromHtml("剩余：" + "<font color=\"#9A9A9A\">" + count + "%" + "</font>");
                     } else {
@@ -238,6 +237,8 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 } else {
                     giftCode =  Html.fromHtml("已淘号：" + "<font color=\"#ffb13c\">" +giftInfo.getGiftCode()+ "</font>");
                     content = Html.fromHtml("剩余：" + count + "%" );
+                    holder.giftCopyBtn.setBackgroundResource(R.drawable.gift_taoed_bg);
+                    holder.giftCopyBtn.setTextColor(Color.parseColor("#ffb13c"));
                 }
                 holder.giftCode.setVisibility(View.VISIBLE);
                 holder.giftCode.setText(giftCode);
@@ -282,4 +283,9 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         mGiftDao = new GiftDao(mContext);
         mGiftInfos = mGiftDao.getAll();
     }
+
+    // 点击立即安装打开下载页面，如果只有一个包 直接下载
+    public void openDownload() {
+        mDownloadTv.performClick();
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/StrategyAdapter.java
index e5682c457b..94b2a9ccae 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/StrategyAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/StrategyAdapter.java
@@ -71,7 +71,7 @@ public class StrategyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (mGameId == null) {
             gameNews = RetrofitManager.getApi().getNews("攻略", 20, offset);
         } else {
-            gameNews = RetrofitManager.getApi().getGameNews(mGameId, 20, offset);
+            gameNews = RetrofitManager.getApi().getGameNews(mGameId, 20, "攻略", offset);
         }
         gameNews.map(new Func1<List<NewsEntity>, List<NewsEntity>>() {
                     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GiftSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GiftSearchViewHolder.java
new file mode 100644
index 0000000000..4221437914
--- /dev/null
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GiftSearchViewHolder.java
@@ -0,0 +1,26 @@
+package com.gh.gamecenter.adapter.viewholder;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.gh.gamecenter.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by khy on 2016/12/26.
+ */
+public class GiftSearchViewHolder extends RecyclerView.ViewHolder {
+
+    @BindView(R.id.gift_et_search) public EditText searchEt;
+    @BindView(R.id.gift_tv_search) public TextView searchTv;
+    @BindView(R.id.gift_tv_back) public TextView backTv;
+
+    public GiftSearchViewHolder(View itemView) {
+        super(itemView);
+        ButterKnife.bind(this, itemView);
+    }
+}
diff --git a/app/src/main/java/com/gh/gamecenter/db/info/GiftInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/GiftInfo.java
index fe7c4f616d..4fe65c917f 100644
--- a/app/src/main/java/com/gh/gamecenter/db/info/GiftInfo.java
+++ b/app/src/main/java/com/gh/gamecenter/db/info/GiftInfo.java
@@ -45,6 +45,17 @@ public class GiftInfo  implements Serializable {
     @DatabaseField(columnName = "total")
     private int total;
 
+    @DatabaseField(columnName = "isDelete")
+    private boolean isDelete = false;
+
+    public boolean isDelete() {
+        return isDelete;
+    }
+
+    public void setDelete(boolean delete) {
+        isDelete = delete;
+    }
+
     public int getAvailable() {
         return available;
     }
@@ -164,8 +175,9 @@ public class GiftInfo  implements Serializable {
                 ", gameId='" + gameId + '\'' +
                 ", gameName='" + gameName + '\'' +
                 ", giftCode='" + giftCode + '\'' +
-                ", available='" + available + '\'' +
-                ", total='" + total + '\'' +
+                ", available=" + available +
+                ", total=" + total +
+                ", isDelete=" + isDelete +
                 '}';
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
index 7c8a946f80..70b4a33c04 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
@@ -17,8 +17,8 @@ import com.gh.common.util.Utils;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
-import com.gh.gamecenter.adapter.viewholder.GameNewsSearchViewHolder;
 import com.gh.gamecenter.adapter.viewholder.GiftNormalViewHolder;
+import com.gh.gamecenter.adapter.viewholder.GiftSearchViewHolder;
 import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftEntity;
@@ -198,7 +198,7 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         switch (viewType) {
             case ItemViewType.SEARCH_NORMAL:
                 view = LayoutInflater.from(mContext).inflate(R.layout.gift_item_search, parent, false);
-                return new GameNewsSearchViewHolder(view);
+                return new GiftSearchViewHolder(view);
             case ItemViewType.LOADING:
                 view = LayoutInflater.from(mContext).inflate(R.layout.refresh_footerview, parent, false);
                 return new FooterViewHolder(view);
@@ -212,8 +212,8 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof GiftNormalViewHolder) {
             initGiftViewHolder((GiftNormalViewHolder) holder, position);
-        } else if (holder instanceof GameNewsSearchViewHolder){
-            initSearchViewHolder((GameNewsSearchViewHolder) holder);
+        } else if (holder instanceof GiftSearchViewHolder){
+            initSearchViewHolder((GiftSearchViewHolder) holder);
         } else if (holder instanceof FooterViewHolder) {
             initFooterViewHolder((FooterViewHolder) holder);
         }
@@ -251,31 +251,33 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
-    private void initSearchViewHolder(final GameNewsSearchViewHolder holder) {
+    private void initSearchViewHolder(final GiftSearchViewHolder holder) {
         if (mSerchKey != null) {
-            holder.game_news_et_search.setText(mSerchKey);
+            holder.searchEt.setText(mSerchKey);
         }
 
         if (mIsSearch) {
-            holder.game_news_tv_search.setText("返回");
+            holder.backTv.setVisibility(View.VISIBLE);
         } else {
-            holder.game_news_tv_search.setText("搜索");
+            holder.backTv.setVisibility(View.GONE);
         }
 
-        holder.game_news_tv_search.setOnClickListener(new View.OnClickListener() {
+        holder.backTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String btnText = holder.game_news_tv_search.getText().toString();
-                String key = holder.game_news_et_search.getText().toString();
-                if (btnText.equals("搜索")) {
-                    if (TextUtils.isEmpty(key)) {
-                        Utils.toast(mContext, "请输入关键字");
-                        return;
-                    }
-                    mSearchListener.search(true, key);
-                } else { // 返回
-                    mSearchListener.search(false, key);
+                mSearchListener.search(false, holder.searchEt.getText().toString());
+            }
+        });
+
+        holder.searchTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (TextUtils.isEmpty(holder.searchEt.getText().toString())) {
+                    Utils.toast(mContext, "请输入关键字");
+                    return;
                 }
+                mSearchListener.search(true, holder.searchEt.getText().toString());
 
                 InputMethodManager imm = (InputMethodManager)mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(gift1Fragment.getActivity().getWindow().getDecorView().getWindowToken(), 0);
@@ -286,8 +288,12 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
     private void initGiftViewHolder(final GiftNormalViewHolder holder, final int position) {
         final GiftEntity giftEntity = mGiftList.get(position - 1);
         holder.giftName.setText(giftEntity.getName());
-        holder.giftGameName.setText(giftEntity.getGame().getName() + " - " + PlatformUtils.getInstance(mContext)
-                .getPlatformName(giftEntity.getPlatform()));
+        if (TextUtils.isEmpty(giftEntity.getPlatform())) {
+            holder.giftGameName.setText(giftEntity.getGame().getName());
+        } else {
+            holder.giftGameName.setText(giftEntity.getGame().getName() + "-" +PlatformUtils.getInstance(mContext)
+                    .getPlatformName(giftEntity.getPlatform()));
+        }
         holder.giftGameIcon.setImageURI(giftEntity.getIcon());
 
         String content ;
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
index 233bbd9931..7f1ca4f9be 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
@@ -16,7 +16,6 @@ import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.GiftUtils;
 import com.gh.common.util.MD5Utils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.TokenUtils;
 import com.gh.gamecenter.ConcernActivity;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
@@ -391,8 +390,12 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         final GiftEntity giftEntity = mGiftList.get(position - 1);
         holder.giftName.setText(giftEntity.getName());
         holder.giftGameIcon.setImageURI(giftEntity.getIcon());
-        holder.giftGameName.setText(giftEntity.getGame().getName() + " - " + PlatformUtils.getInstance(mContext)
-                .getPlatformName(giftEntity.getPlatform()));
+        if (TextUtils.isEmpty(giftEntity.getPlatform())) {
+            holder.giftGameName.setText(giftEntity.getGame().getName());
+        } else {
+            holder.giftGameName.setText(giftEntity.getGame().getName() + "-" +PlatformUtils.getInstance(mContext)
+                    .getPlatformName(giftEntity.getPlatform()));
+        }
 
         String content ;
         if (giftEntity.getContent().contains("<br/>")) {
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java
index 44402cf1a7..7c242e6d7b 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java
@@ -11,9 +11,11 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.gh.base.AppController;
+import com.gh.common.util.DialogUtils;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.GiftUtils;
 import com.gh.common.util.PlatformUtils;
+import com.gh.common.util.Utils;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GiftNormalViewHolder;
@@ -36,6 +38,7 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
     private OnCallBackListener mCallBackListener;
 
     private List<GiftEntity> mGiftList;
+    private List<GiftInfo> mGiftInfos;
 
     private GiftDao mGiftDao;
 
@@ -51,20 +54,21 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
     public void initData() {
         mGiftList.clear();
         mGiftDao = new GiftDao(mContext);
-        List<GiftInfo> giftInfos = mGiftDao.getAll();
+        mGiftInfos = mGiftDao.getAll();
 
-        if (giftInfos == null) {
+        if (mGiftInfos == null) {
             mCallBackListener.loadEmpty();
             return;
         }
+        for (int i = 0; i < mGiftInfos.size(); i++) { // 数据转换
+            GiftInfo giftInfo = mGiftInfos.get(i);
+            if (giftInfo.isDelete()) continue;
 
-        for (int i = 0; i < giftInfos.size(); i++) { // 数据转换
-            GiftInfo giftInfo = giftInfos.get(i);
             GiftGameEntity giftGameEntity = new GiftGameEntity(giftInfo.getGameId(), giftInfo.getGameName());
             GiftEntity giftEntity = new GiftEntity(giftInfo.getGiftId(), giftInfo.getGiftId(), giftInfo.getContent()
                     , giftGameEntity, giftInfo.getIcon(), giftInfo.getName(), giftInfo.getPlatform()
                     , giftInfo.getGiftStatus(), giftInfo.getGiftCode(), giftInfo.getAvailable(), giftInfo.getTotal());
-            mGiftList.add(i,giftEntity);
+            mGiftList.add(giftEntity);
         }
 
         if (mGiftList.size() == 0) {
@@ -86,15 +90,15 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GiftNormalViewHolder viewHolder = (GiftNormalViewHolder)holder;
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT
                 , ViewGroup.LayoutParams.WRAP_CONTENT);
-        int left = (int) mContext.getResources().getDimension(R.dimen.cardview_mar_left);
+//        int left = (int) mContext.getResources().getDimension(R.dimen.cardview_mar_left);
         if (position == 0 || position == getItemCount() -1) {
             if (position == 0) {
-                params.setMargins(left, DisplayUtils.dip2px(mContext, 5),left,0);
+                params.setMargins(0, DisplayUtils.dip2px(mContext, 5),0,0);
             } else {
-                params.setMargins(left, 0, left,  DisplayUtils.dip2px(mContext, 5));
+                params.setMargins(0, 0, 0,  DisplayUtils.dip2px(mContext, 5));
             }
         } else {
-            params.setMargins(left, 0, left, 0);
+            params.setMargins(0, 0, 0, 0);
         }
         viewHolder.itemView.setLayoutParams(params);
 
@@ -132,6 +136,30 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             }
         });
 
+        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                DialogUtils.showWarningDialog(mContext, "删除礼包", "礼包码删除之后不可恢复，请确定您已经兑换过该礼包"
+                        , "取消", "确定删除"
+                        , new DialogUtils.ConfiremListener() {
+                            @Override
+                            public void onConfirem() {
+                                //TODO 同步到数据库
+                                for (GiftInfo mGiftInfo : mGiftInfos) {
+                                    if (giftEntity.getId().equals(mGiftInfo.getGiftId())) {
+                                        mGiftInfo.setDelete(true);
+                                        mGiftDao.update(mGiftInfo);
+                                        initData();
+                                        break;
+                                    }
+                                }
+
+                            }
+                        }, null);
+                return false;
+            }
+        });
+
         viewHolder.giftBtnStatus.setText("复制");
         viewHolder.giftBtnStatus.setBackgroundResource(R.drawable.textview_blue_style);
     }
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 710b7f15ac..d51fc759a6 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -548,8 +548,13 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
             String giftCode = null;
             viewHolder.imgLayout.removeAllViews();
-            viewHolder.content.setText(concernEntity.getName() + "-" + PlatformUtils.getInstance(context)
-                    .getPlatformName(concernEntity.getPlatform()) + " (" + content + ")" );
+
+            if (TextUtils.isEmpty(concernEntity.getPlatform())) {
+                viewHolder.content.setText(concernEntity.getName() + "\n礼包内容：" + content  );
+            } else {
+                viewHolder.content.setText(concernEntity.getName() + "（限" + PlatformUtils.getInstance(context)
+                        .getPlatformName(concernEntity.getPlatform()) + "版）\n礼包内容：" + content  );
+            }
             viewHolder.comment.setVisibility(View.GONE);
             viewHolder.share.setVisibility(View.GONE);
             viewHolder.link.setImageResource(R.drawable.gift_icon);
@@ -560,14 +565,16 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                     if ("finish".equals(giftStatusEntity.getStatus())) {
                         viewHolder.read.setText("已结束");
                     } else {
-                        viewHolder.read.setText(Html.fromHtml("<font color=\"#00B7FA\">" + "点击领取" + "</font>"));
+                        viewHolder.read.setText("点击查看");
                     }
 
-                    for (GiftInfo info : giftInfo) {
-                        if (info.getGiftId().equals(concernEntity.getId())) {
-                            viewHolder.read.setText("已领取");
-                            giftCode = info.getGiftCode();
-                            break;
+                    if (giftInfo != null) {
+                        for (GiftInfo info : giftInfo) {
+                            if (info.getGiftId().equals(concernEntity.getId())) {
+                                viewHolder.read.setText("已领取");
+                                giftCode = info.getGiftCode();
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
index 11ebeee1b7..2eb79b61a3 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
@@ -105,6 +105,10 @@ public interface ApiService {
     Observable<List<NewsEntity>> getGameNews(@Path("game_id") String game_id, @Query("limit") int limit,
                                              @Query("offset") int offset, @Query("type") String type); // 获取游戏新闻
 
+    @GET("game/{game_id}/news")
+    Observable<List<NewsEntity>> getGameNews(@Path("game_id") String game_id, @Query("limit") int limit,
+                                             @Query("type_group") String type, @Query("offset") int offset); // 获取游戏攻略
+
     @GET("game/{game_id}/news")
     Observable<List<NewsEntity>> getGameNews(@Path("game_id") String game_id, @Query("limit") int limit,
                                              @Query("offset") int offset); // 获取游戏新闻
diff --git a/app/src/main/res/drawable/gift_linged_bg.xml b/app/src/main/res/drawable/gift_linged_bg.xml
new file mode 100644
index 0000000000..71206109e1
--- /dev/null
+++ b/app/src/main/res/drawable/gift_linged_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/btn_plugin" />
+
+    <corners android:radius="2dp" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gift_taoed_bg.xml b/app/src/main/res/drawable/gift_taoed_bg.xml
new file mode 100644
index 0000000000..1b927e4e8e
--- /dev/null
+++ b/app/src/main/res/drawable/gift_taoed_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1dp"
+        android:color="#ffb13c" />
+
+    <corners android:radius="2dp" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/news_detail_comment.xml b/app/src/main/res/drawable/news_detail_comment.xml
new file mode 100644
index 0000000000..d0242f41d1
--- /dev/null
+++ b/app/src/main/res/drawable/news_detail_comment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="1dp"
+        android:color="@color/content" />
+
+    <corners android:radius="999dp" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_concern.xml b/app/src/main/res/layout/activity_concern.xml
index 40b2024b56..fa7467db90 100644
--- a/app/src/main/res/layout/activity_concern.xml
+++ b/app/src/main/res/layout/activity_concern.xml
@@ -54,7 +54,7 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/concern_rv_recommend"
         android:layout_width="match_parent"
-        android:layout_height="121dp"
+        android:layout_height="150dp"
         android:overScrollMode="never"
         android:visibility="gone" >
     </android.support.v7.widget.RecyclerView>
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 8339deab7e..020a6caf15 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:orientation="vertical"
-            android:visibility="gone" >
+            android:visibility="visible" >
 
             <View
                 android:layout_width="match_parent"
@@ -31,9 +31,9 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="44dp"
+                android:layout_height="60dp"
                 android:background="@android:color/white"
-                android:padding="6dp" >
+                android:padding="10dp" >
 
                 <TextView
                     android:id="@+id/detail_tv_download"
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index c7c97ee0df..ce1b4e3e99 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -85,6 +85,12 @@
 
         </RelativeLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="7dp"
+            android:background="@drawable/shadow_down"
+            android:layout_alignParentBottom="true"/>
+
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/gift_item.xml b/app/src/main/res/layout/gift_item.xml
index ca49452e70..58ddb0cf5e 100644
--- a/app/src/main/res/layout/gift_item.xml
+++ b/app/src/main/res/layout/gift_item.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:background="@android:color/white"
+    android:background="@drawable/reuse_listview_item_style"
     android:paddingBottom="15dp"
     android:paddingLeft="12dp"
     android:paddingRight="12dp"
diff --git a/app/src/main/res/layout/gift_item_search.xml b/app/src/main/res/layout/gift_item_search.xml
index 70ac8a5f93..a544a5e45e 100644
--- a/app/src/main/res/layout/gift_item_search.xml
+++ b/app/src/main/res/layout/gift_item_search.xml
@@ -9,7 +9,7 @@
     android:layout_marginBottom="11dp">
 
     <EditText
-        android:id="@+id/game_news_et_search"
+        android:id="@+id/gift_et_search"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/gift_search_bg"
@@ -22,7 +22,21 @@
         android:textSize="16sp" />
 
     <TextView
-        android:id="@+id/game_news_tv_search"
+        android:id="@+id/gift_tv_back"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="返回"
+        android:textColor="@android:color/white"
+        android:gravity="center"
+        android:paddingRight="10dp"
+        android:paddingLeft="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="1dp"
+        android:layout_toLeftOf="@+id/gift_tv_search"
+        android:background="#DCDCDC"/>
+
+    <TextView
+        android:id="@+id/gift_tv_search"
         android:layout_width="48dp"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
diff --git a/app/src/main/res/layout/home_subject_entrance_item.xml b/app/src/main/res/layout/home_subject_entrance_item.xml
index 5486f7e8b0..6c8f9fdc63 100644
--- a/app/src/main/res/layout/home_subject_entrance_item.xml
+++ b/app/src/main/res/layout/home_subject_entrance_item.xml
@@ -8,8 +8,8 @@
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/home_subject_icon"
-        android:layout_width="43dp"
-        android:layout_height="43dp"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
         fresco:placeholderImage= "@drawable/home_subject_placeholder"/>
 
     <TextView