From 3f98bcea33e923355591becf5d5975966ca6753d Mon Sep 17 00:00:00 2001
From: khy <18814188563@163.com>
Date: Wed, 21 Dec 2016 10:41:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A4=BC=E5=8C=85?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/base/BaseDetailActivity.java  |   4 +
 .../java/com/gh/common/util/DialogUtils.java  |  30 ++-
 .../java/com/gh/common/util/GiftUtils.java    | 191 ++++++++++++++----
 .../com/gh/gamecenter/GiftDetailActivity.java |  37 +++-
 .../java/com/gh/gamecenter/MainActivity.java  |   8 +
 .../gh/gamecenter/MessageDetailActivity.java  |   3 +-
 .../gamecenter/adapter/GiftDetailAdapter.java | 141 +++++++++++--
 .../com/gh/gamecenter/db/info/GiftInfo.java   |  29 ++-
 .../gh/gamecenter/entity/ConcernEntity.java   |  41 ++++
 .../gamecenter/entity/GiftDetailEntity.java   |  12 +-
 .../com/gh/gamecenter/entity/GiftEntity.java  |  60 +++++-
 .../gamecenter/entity/GiftStatusEntity.java   |  20 ++
 .../com/gh/gamecenter/gift/Gift1Fragment.java |  17 +-
 .../gamecenter/gift/Gift1FragmentAdapter.java |  75 +++++--
 .../com/gh/gamecenter/gift/Gift2Fragment.java |  12 +-
 .../gamecenter/gift/Gift2FragmentAdapter.java |  72 ++++++-
 .../com/gh/gamecenter/gift/Gift3Fragment.java |  42 +---
 .../gamecenter/gift/Gift3FragmentAdapter.java |  53 ++++-
 .../com/gh/gamecenter/news/News1Fragment.java |   4 +
 .../gamecenter/news/News1FragmentAdapter.java | 110 ++++++++++
 .../gh/gamecenter/retrofit/ApiService.java    |   2 +-
 app/src/main/res/drawable-hdpi/gift_icon.png  | Bin 0 -> 1676 bytes
 app/src/main/res/layout/activity_detail.xml   |   1 +
 app/src/main/res/layout/common_hintdialog.xml |  48 +++++
 app/src/main/res/layout/fragment_gift3.xml    |   1 -
 app/src/main/res/layout/gift_item_search.xml  |  35 ++++
 .../main/res/layout/giftdetail_item_top.xml   |  10 +-
 27 files changed, 912 insertions(+), 146 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/gift_icon.png
 create mode 100644 app/src/main/res/layout/common_hintdialog.xml
 create mode 100644 app/src/main/res/layout/gift_item_search.xml

diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java
index e67eb06624..1236cb5d8e 100644
--- a/app/src/main/java/com/gh/base/BaseDetailActivity.java
+++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java
@@ -53,6 +53,8 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
     protected TextView detail_tv_per;
     protected LinearLayout reuse_ll_loading;
     protected LinearLayout reuse_no_connection;
+    protected LinearLayout reuse_none_data;
+    protected TextView reuse_tv_none_data;
     protected ImageView iv_share;
 
     protected GameEntity gameEntity;
@@ -115,6 +117,8 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
         detail_tv_per = (TextView) findViewById(R.id.detail_tv_per);
         reuse_ll_loading = (LinearLayout) findViewById(R.id.reuse_ll_loading);
         reuse_no_connection = (LinearLayout) findViewById(R.id.reuse_no_connection);
+        reuse_none_data = (LinearLayout) findViewById(R.id.reuse_none_data);
+        reuse_tv_none_data = (TextView) findViewById(R.id.reuse_tv_none_data);
 
         detail_ll_bottom.setOnClickListener(this);
         detail_tv_download.setOnClickListener(this);
diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index bd2bc1ed0c..7309a8591f 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -88,6 +88,32 @@ public class DialogUtils {
 		dialog.show();
 	}
 
+	public static void showHintDialog(Context context, String title, CharSequence msg, String confirm) {
+		final Dialog dialog = new Dialog(context);
+
+		View view = View.inflate(context, R.layout.common_hintdialog, null);
+
+		TextView hintdialog_title = (TextView) view.findViewById(R.id.hintdialog_title);
+		hintdialog_title.setText(title);
+
+		// 内容
+		TextView hintdialog_content = (TextView) view.findViewById(R.id.hintdialog_content);
+		hintdialog_content.setText(msg);
+
+		TextView hintdialog_confirm = (TextView) view.findViewById(R.id.hintdialog_confirm);
+
+		hintdialog_confirm.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				dialog.cancel();
+			}
+		});
+
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		dialog.setContentView(view);
+		dialog.show();
+	}
+
 	public static void showHijackDialog(final Context context) {
 		showWarningDialog(context, "警告", "您当前网络环境异常，下载地址已被替换（网络劫持），请更换网络环境进行下载。",
 				new ConfiremListener() {
@@ -138,8 +164,8 @@ public class DialogUtils {
 
 	public static void showCancelDialog(Context context, final ConfiremListener listener) {
 		Spanned content = Html.fromHtml("取消关注游戏后，您将无法及时收到游戏" +
-				"<font color='#ff0000'>攻略</font>、" +
-				"<font color='#ff0000'>资讯</font>等最新动态提醒。");
+				"<font color=\"#ff0000\">攻略</font>、" +
+				"<font color=\"#ff0000\">资讯</font>等最新动态提醒。");
 		showWarningDialog(context, "取消关注", content, "暂不取消", "确定取消", listener, null);
 	}
 
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 5ed1504233..fecf308f80 100644
--- a/app/src/main/java/com/gh/common/util/GiftUtils.java
+++ b/app/src/main/java/com/gh/common/util/GiftUtils.java
@@ -1,11 +1,17 @@
 package com.gh.common.util;
 
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
+import com.gh.base.AppController;
+import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.adapter.GiftDetailAdapter;
 import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftEntity;
@@ -18,11 +24,9 @@ import com.gh.gamecenter.retrofit.RetrofitManager;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.IOException;
 import java.util.List;
 
 import de.greenrobot.event.EventBus;
-import okhttp3.ResponseBody;
 import retrofit2.adapter.rxjava.HttpException;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -53,11 +57,12 @@ public class GiftUtils {
     }
 
     //初始化存号箱 获取存号箱所有礼包
-    public static void getCunHaoXiang(final Context context, final  PostGiftListener listener) {
-        getCunHaoXiang(context, true, listener);
+    public static void getCunHaoXiang(final Context context, final GiftDao giftDao) {
+        getCunHaoXiang(context, true, giftDao);
     }
 
-    private static void getCunHaoXiang(final Context context, final boolean isCheck, final PostGiftListener listener) {
+    private static void getCunHaoXiang(final Context context, final boolean isCheck, final GiftDao giftDao) {
+
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -68,7 +73,14 @@ public class GiftUtils {
                             @Override
                             public void onResponse(List<GiftEntity> response) {
                                 super.onResponse(response);
-                                listener.postSucced(response);
+                                for (GiftEntity giftEntity : response) {
+                                    giftDao.add(new GiftInfo(giftEntity.getGiftId(), giftEntity.getContent(), giftEntity.getIcon()
+                                            , giftEntity.getName(),giftEntity.getPlatform(), giftEntity.getGiftStatus()
+                                            , giftEntity.getGame().getId(), giftEntity.getGame().getName(), giftEntity.getCode()
+                                            , giftEntity.getAvailable(), giftEntity.getTotal()));
+                                }
+
+                                EventBus.getDefault().post(new EBReuse("giftChanged"));
                             }
 
                             @Override
@@ -77,12 +89,10 @@ public class GiftUtils {
                                 if (e instanceof HttpException) {
                                     HttpException exception = (HttpException) e;
                                     if (exception.code() == 401) {
-                                        getCunHaoXiang(context, false, listener);
+                                        getCunHaoXiang(context, false, giftDao);
                                         return;
                                     }
                                 }
-
-                                listener.postFailed(e);
                             }
                         });
 
@@ -103,15 +113,11 @@ public class GiftUtils {
                 RetrofitManager.getApi().postGiftLing(TokenUtils.getToken(context, isCheck), giftId)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new Response<ResponseBody>() {
+                        .subscribe(new JSONObjectResponse() {
                             @Override
-                            public void onResponse(ResponseBody response) {
+                            public void onResponse(JSONObject response) {
                                 super.onResponse(response);
-                                try {
-                                    listener.postSucced(response.string().toString());
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
+                                listener.postSucced(response);
                             }
 
                             @Override
@@ -124,7 +130,6 @@ public class GiftUtils {
                                         return;
                                     }
                                 }
-
                                 listener.postFailed(e);
                             }
                         });
@@ -140,6 +145,7 @@ public class GiftUtils {
 
     private static void postGiftTao(final Context context, final String giftId, final boolean isCheck
             , final PostGiftListener listener) {
+
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -196,7 +202,9 @@ public class GiftUtils {
         void postFailed(Throwable error);
     }
     
-    public static void initGiftBtn(final TextView giftBtn, final GiftEntity giftEntity, final GiftDao giftDao) {
+    public static void initGiftBtn(final TextView giftBtn, final GiftEntity giftEntity, final GiftDao giftDao,
+                                   final boolean isInstallRequired, final GiftDetailAdapter adapter) {
+
         switch (giftEntity.getGiftStatus()) {
             case "coming":
                 giftBtn.setText("未开始");
@@ -221,6 +229,11 @@ public class GiftUtils {
             case "check":
                 giftBtn.setText("查看");
                 giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
+            case "copy":
+                giftBtn.setText("复制");
+                giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                break;
             default:
                 giftBtn.setBackgroundResource(R.drawable.textview_cancel_style);
                 giftBtn.setText("异常");
@@ -229,20 +242,34 @@ public class GiftUtils {
         giftBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                switch (giftEntity.getGiftStatus()) {
-                    case "coming":
+
+                if (isInstallRequired && !isAppInstalled(giftBtn.getContext(), giftEntity.getPackageName())) {
+                    DialogUtils.showHintDialog(giftBtn.getContext(), "条件不符"
+                            , "请检查是否符合领取条件：安装游戏" +  giftEntity.getGame().getName()
+                                    + PlatformUtils.getInstance(giftBtn.getContext())
+                                    .getPlatformName(giftEntity.getPlatform()) + "版", "知道了");
+                    return;
+                }
+
+                switch (giftBtn.getText().toString()) {
+                    case "未开始":
                         Utils.toast(giftBtn.getContext(), "还没到开始领取时间");
                         break;
-                    case "ling":
+                    case "查看":
+                        AppController.put("giftEntity", giftEntity);
+                        Intent intent = new Intent(giftBtn.getContext(), GiftDetailActivity.class);
+                        giftBtn.getContext().startActivity(intent);
+                        break;
+                    case "领取":
                         postGiftLing(giftBtn.getContext(), giftEntity.getId(), new PostGiftListener() {
                             @Override
                             public void postSucced(Object response) {
 
                                 JSONObject responseBody = (JSONObject) response;
+                                Utils.log("postGiftLing=====" + responseBody);
                                 String giftCode = null;
                                 try {
-                                    JSONObject jsonObject = new JSONObject(responseBody.toString());
-                                    giftCode = jsonObject.getString("code");
+                                    giftCode = responseBody.getString("code");
                                 } catch (JSONException e) {
                                     e.printStackTrace();
                                 }
@@ -254,10 +281,14 @@ public class GiftUtils {
 
                                 Utils.toast(giftBtn.getContext(), "领取成功");
                                 giftDao.add(new GiftInfo(giftEntity.getId(), giftEntity.getContent(), giftEntity.getIcon()
-                                        , giftEntity.getName(),giftEntity.getPlatform(), "tao"
-                                        , giftEntity.getGame().getId(), giftEntity.getGame().getName(), giftCode));
+                                        , giftEntity.getName(),giftEntity.getPlatform(), giftEntity.getGiftStatus(), giftEntity.getGame().getId()
+                                        , giftEntity.getGame().getName(), giftCode, giftEntity.getAvailable(), giftEntity.getTotal()));
 
                                 EventBus.getDefault().post(new EBReuse("giftChanged"));
+
+                                giftEntity.setGiftStatus("check");
+                                adapter.initGiftDao();
+                                adapter.notifyDataSetChanged();
                             }
 
                             @Override
@@ -270,18 +301,23 @@ public class GiftUtils {
                                         try {
                                             JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
                                             String detail = errorJson.getString("detail");
+
                                             if ("coming".equals(detail)) {
-                                                Utils.toast(giftBtn.getContext(), "礼包未开抢");
+                                                Utils.toast(giftBtn.getContext(), "礼包领取时间未开始");
                                             } else if ("finish".equals(detail)) {
-                                                Utils.toast(giftBtn.getContext(), "礼包已结束");
+                                                Utils.toast(giftBtn.getContext(), "礼包领取时间已结束");
                                             } else if ("fetched".equals(detail)) {
-                                                Utils.toast(giftBtn.getContext(), "用户已领过或淘过该礼包");
-                                            } else if ("try tao".equals(detail)) {
-                                                Utils.toast(giftBtn.getContext(), "礼包当前为淘号状态");
-                                            } else if ("used up".equals(detail)){
-                                                Utils.toast(giftBtn.getContext(), "礼包已被领光，未达淘号状态");
+                                                Utils.toast(giftBtn.getContext(), "你已领过这个礼包了");
+                                                getCunHaoXiang(giftBtn.getContext(), giftDao);
+                                                giftBtn.setText("查看");
+                                                giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                                            } else if ("try tao".equals(detail) || "used up".equals(detail)) {
+                                                DialogUtils.showHintDialog(giftBtn.getContext(), "礼包已领光"
+                                                        , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
                                             } else if ("maintaining".equals(detail)) {
-                                                Utils.toast(giftBtn.getContext(), "服务端正在修改礼包");
+                                                Utils.toast(giftBtn.getContext(), "网络状态异常，请稍后再试");
+                                            } else {
+                                                Utils.toast(giftBtn.getContext(), "操作失败");
                                             }
                                         } catch (Exception ex) {
                                             ex.printStackTrace();
@@ -290,28 +326,109 @@ public class GiftUtils {
                                         return;
                                     }
                                 }
-
+                                Utils.toast(giftBtn.getContext(), "网络异常");
                             }
                         });
 
                         break;
-                    case "tao":
+                    case "淘号":
                         postGiftTao(giftBtn.getContext(), giftEntity.getId(), new PostGiftListener() {
                             @Override
                             public void postSucced(Object response) {
 
+                                JSONObject responseBody = (JSONObject) response;
+                                Utils.log("postGiftTao=====" + responseBody);
+                                String giftCode = null;
+                                try {
+                                    giftCode = responseBody.getString("code");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+
+                                if (TextUtils.isEmpty(giftCode)) {
+                                    Utils.toast(giftBtn.getContext(), "淘号异常");
+                                    return;
+                                }
+
+                                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()));
+
+                                EventBus.getDefault().post(new EBReuse("giftChanged"));
+
+                                giftEntity.setGiftStatus("check");
+                                adapter.initGiftDao();
+                                adapter.notifyDataSetChanged();
                             }
 
                             @Override
                             public void postFailed(Throwable error) {
+                                Utils.log("---" + error.toString());
+
+                                if (error instanceof HttpException) {
+                                    HttpException exception = (HttpException) error;
+                                    if (exception.code() == 403) {
+                                        try {
+                                            JSONObject errorJson = new JSONObject(exception.response().errorBody().string());
+                                            String detail = errorJson.getString("detail");
+
+                                            if ("coming".equals(detail)) {
+                                                Utils.toast(giftBtn.getContext(), "礼包领取时间未开始");
+                                            } else if ("finish".equals(detail)) {
+                                                Utils.toast(giftBtn.getContext(), "礼包领取时间已结束");
+                                            } else if ("fetched".equals(detail)) {
+                                                Utils.toast(giftBtn.getContext(), "你已领过这个礼包了");
+                                                getCunHaoXiang(giftBtn.getContext(), giftDao);
+                                                giftBtn.setText("查看");
+                                                giftBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                                            } else if ("try tao".equals(detail) || "used up".equals(detail)) {
+                                                DialogUtils.showHintDialog(giftBtn.getContext(), "礼包已领光"
+                                                        , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了");
+                                            } else if ("maintaining".equals(detail)) {
+                                                Utils.toast(giftBtn.getContext(), "网络状态异常，请稍后再试");
+                                            } else if ("fail to compete".equals(detail)) {
+                                                Utils.toast(giftBtn.getContext(), "淘号失败，稍后重试");
+                                            } else {
+                                                Utils.toast(giftBtn.getContext(), "操作失败");
+                                            }
+                                        } catch (Exception ex) {
+                                            ex.printStackTrace();
+                                            Utils.toast(giftBtn.getContext(),"礼包处理异常");
+                                        }
+                                        return;
+                                    }
+                                }
                                 Utils.toast(giftBtn.getContext(), "网络异常");
-                                Utils.log(error.toString());
                             }
                         });
-
                         break;
                 }
             }
         });
     }
+
+    public static boolean isAppInstalled(Context context, String packageName) {
+        final android.content.pm.PackageManager packageManager = context.getPackageManager();
+        List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);
+        if (pinfo != null) {
+            for (int i = 0; i < pinfo.size(); i++) {
+                String pn = pinfo.get(i).packageName;
+                if (pn.equals(packageName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    //复制文字
+    public static void copyLink(String copyContent, Context context) {
+        ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        cmb.setText(copyContent);
+
+        Utils.toast(context,copyContent + "复制成功");
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
index e55a2a88e5..94a2f2a4a3 100644
--- a/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GiftDetailActivity.java
@@ -7,6 +7,7 @@ import android.view.View;
 import com.gh.base.AppController;
 import com.gh.base.BaseDetailActivity;
 import com.gh.gamecenter.adapter.GiftDetailAdapter;
+import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.GiftEntity;
 import com.gh.gamecenter.retrofit.Response;
@@ -24,10 +25,17 @@ public class GiftDetailActivity extends BaseDetailActivity {
 
     private GiftEntity mGiftEntity;
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        AppController.put("giftEntity", mAdapter.getGiftEntity());
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        name = "礼包详情";
+        actionbar_tv_title.setText("礼包详情");
+        title = "礼包详情";
 
         mGiftEntity = (GiftEntity) AppController.get("giftEntity", true);
 
@@ -49,7 +57,7 @@ public class GiftDetailActivity extends BaseDetailActivity {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        mAdapter.addGiftDetail();
+                        getGameDigest();
                     }
                 }, 1000);
             }
@@ -65,19 +73,28 @@ public class GiftDetailActivity extends BaseDetailActivity {
                     @Override
                     public void onResponse(GameEntity response) {
                         gameEntity = response;
-
                         title = gameEntity.getName();
-                        actionbar_tv_title.setText(gameEntity.getName());
-                        mAdapter.addGiftDetail();
                         entrance = "礼包详情"; //TODO
 
                         downloadAddWord = gameEntity.getDownloadAddWord();
                         downloadOffText = gameEntity.getDownloadOffText();
                         initDownload(true);
+
+                        for (ApkEntity apkEntity : gameEntity.getApk()) {
+                            if (mGiftEntity.getPlatform().equals(apkEntity.getPlatform())) {
+                                mGiftEntity.setPackageName(apkEntity.getPackageName());
+                            }
+                        }
+
+                        mAdapter.addGiftDetail();
                     }
 
                     @Override
                     public void onFailure(Throwable e) {
+                        detail_rv_show.setVisibility(View.GONE);
+                        reuse_ll_loading.setVisibility(View.GONE);
+                        detail_ll_bottom.setVisibility(View.GONE);
+                        detail_rv_show.setPadding(0, 0, 0, 0);
                         reuse_no_connection.setVisibility(View.VISIBLE);
                     }
                 });
@@ -99,4 +116,14 @@ public class GiftDetailActivity extends BaseDetailActivity {
         detail_rv_show.setPadding(0, 0, 0, 0);
         reuse_no_connection.setVisibility(View.VISIBLE);
     }
+
+    @Override
+    public void loadEmpty() {
+        detail_rv_show.setVisibility(View.GONE);
+        reuse_ll_loading.setVisibility(View.GONE);
+        detail_ll_bottom.setVisibility(View.GONE);
+        detail_rv_show.setPadding(0, 0, 0, 0);
+        reuse_tv_none_data.setText("天了噜~页面不见了");
+        reuse_none_data.setVisibility(View.VISIBLE);
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 6ab73683f0..99fc99dc48 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -34,6 +34,7 @@ import com.gh.common.util.DataUtils;
 import com.gh.common.util.DeviceUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.FileUtils;
+import com.gh.common.util.GiftUtils;
 import com.gh.common.util.MD5Utils;
 import com.gh.common.util.NetworkUtils;
 import com.gh.common.util.PackageUtils;
@@ -47,6 +48,7 @@ import com.gh.download.DataWatcher;
 import com.gh.download.DownloadEntity;
 import com.gh.download.DownloadManager;
 import com.gh.download.DownloadStatus;
+import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.ConcernInfo;
 import com.gh.gamecenter.db.info.GameInfo;
 import com.gh.gamecenter.entity.ApkEntity;
@@ -489,6 +491,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 			checkUpdate();
 		}
 		if (isNewFirstLaunch) {
+			initCunHaoXiang();
 			getPluginUpdate();
 //			sp.edit().putBoolean("isNewFirstLaunchV" + PackageUtils.getVersion(getApplicationContext()), false).apply();
 		}
@@ -522,6 +525,11 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
 		Log.e("TD_CHANNEL_ID", (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"));
 	}
 
+	private void initCunHaoXiang() {
+		GiftDao giftDao = new GiftDao(this);
+		GiftUtils.getCunHaoXiang(this, giftDao);
+	}
+
 	// 初始化关注
 	private void initConcern() {
 		RetrofitManager.getApi().getConcern(TokenUtils.getDeviceId(MainActivity.this))
diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
index f599080184..fb034771d9 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
@@ -470,7 +470,8 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {
-            if (commentNum != -1 && commentNum != adapter.getConcernEntity().getCommentnum()) {
+            if (commentNum != -1 && adapter.getConcernEntity() != null
+                    && commentNum != adapter.getConcernEntity().getCommentnum()) {
                 Intent intent= new Intent();
                 intent.putExtra("commentNum", adapter.getConcernEntity().getCommentnum());
                 setResult(1001, intent);
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 f6ec9a70b3..66ce597f41 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/GiftDetailAdapter.java
@@ -5,25 +5,33 @@ import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 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;
+import com.gh.gamecenter.db.GiftDao;
+import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftDetailEntity;
 import com.gh.gamecenter.entity.GiftEntity;
+import com.gh.gamecenter.entity.GiftStatusEntity;
 import com.gh.gamecenter.gamedetail.GameDetailNewsViewHolder;
 import com.gh.gamecenter.listener.OnCallBackListener;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 
 import java.text.SimpleDateFormat;
-import java.util.Locale;
+import java.util.List;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -40,10 +48,18 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private GiftEntity mGiftEntity;
     private GiftDetailEntity mGiftDetailEntity;
 
+    private GiftDao mGiftDao;
+
+    private List<GiftInfo> mGiftInfos;
+
     public GiftDetailAdapter(GiftDetailActivity giftDetailActivity, GiftEntity giftEntity) {
         this.mContext = giftDetailActivity;
         this.mCallBackListener = giftDetailActivity;
         this.mGiftEntity = giftEntity;
+
+        mGiftDao = new GiftDao(mContext);
+        mGiftInfos = mGiftDao.getAll();
+
     }
 
     public void addGiftDetail() {
@@ -63,7 +79,7 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                     @Override
                     public void onFailure(Throwable e) {
                         super.onFailure(e);
-                        mCallBackListener.loadError();
+                        mCallBackListener.loadEmpty();
                     }
                 });
     }
@@ -100,12 +116,10 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         if (mGiftEntity != null) {
             index =  2;
         }
-
         if (mGiftDetailEntity != null) {
             if (mGiftDetailEntity.getTime() != null || mGiftDetailEntity.getInstallRequired()) {
                 index ++;
             }
-
             if (mGiftDetailEntity.getDes() != null) {
                 index ++;
             }
@@ -119,39 +133,41 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         holder.gamedetail_item_news_list.setPadding(0, DisplayUtils.dip2px(mContext, 10)
                 , 0, DisplayUtils.dip2px(mContext, 10));
         holder.gamedetail_item_news_list.removeAllViews();
+
         if (mGiftEntity.getContent() != null && position == 1) {
             holder.gamedetail_item_news_title.setText("礼包内容");
             TextView textView = new TextView(mContext);
             textView.setTextColor(Color.parseColor("#717171"));
-            textView.setText(mGiftEntity.getContent());
+            textView.setText(Html.fromHtml(mGiftEntity.getContent()));
             holder.gamedetail_item_news_list.addView(textView);
         } else if (mGiftDetailEntity != null && position == 2) {
             holder.gamedetail_item_news_title.setText("领取规则");
+
             if (mGiftDetailEntity.getInstallRequired()) {
                 TextView textView = new TextView(mContext);
                 textView.setTextColor(Color.parseColor("#717171"));
-                Spanned content =  Html.fromHtml("<font color='#000000'>已安装 " + mGiftEntity.getGame().getName() +
+                Spanned content =  Html.fromHtml("领取条件：" + "<font color=\"#06D0A8\">安装游戏： " +
                         mGiftEntity.getGame().getName() + PlatformUtils.getInstance(mContext)
-                        .getPlatformName(mGiftEntity.getPlatform()) + "</font>");
-                textView.setText("领取条件：" + content);
+                        .getPlatformName(mGiftEntity.getPlatform()) + "版</font>");
+                textView.setText(content);
                 holder.gamedetail_item_news_list.addView(textView);
             }
+
             if (mGiftDetailEntity.getTime() != null) {
-                SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
-                format.applyPattern("yyyy年MM月dd日");
-                String start = format.format(mGiftDetailEntity.getTime().getStart());
-                String end = format.format(mGiftDetailEntity.getTime().getEnd());
+                SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
+                String start = format.format((mGiftDetailEntity.getTime().getStart() * 1000));
+                String end = format.format((mGiftDetailEntity.getTime().getEnd() * 1000));
 
                 TextView tvTime = new TextView(mContext);
                 tvTime.setTextColor(Color.parseColor("#717171"));
-                tvTime.setText("领取时间：" + start +  "-" + end);
+                tvTime.setText("领取时间：" + start +  " - " + end);
                 holder.gamedetail_item_news_list.addView(tvTime);
             }
         } else if (mGiftDetailEntity.getDes() != null && position == getItemCount() -1) {
             holder.gamedetail_item_news_title.setText("使用说明");
             TextView desTv = new TextView(mContext);
             desTv.setTextColor(Color.parseColor("#717171"));
-            desTv.setText(mGiftDetailEntity.getDes());
+            desTv.setText(Html.fromHtml(mGiftDetailEntity.getDes()));
             holder.gamedetail_item_news_list.addView(desTv);
         }
     }
@@ -160,11 +176,102 @@ public class GiftDetailAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         holder.giftGameIcon.setImageURI(mGiftEntity.getIcon());
         holder.giftName.setText(mGiftEntity.getName());
         holder.giftGameName.setText(mGiftEntity.getGame().getName() + PlatformUtils.getInstance(mContext)
-                .getPlatformName(mGiftEntity.getPlatform()));
+                .getPlatformName(mGiftEntity.getPlatform()) + "版");
+
+        int count = (int)(((float)mGiftEntity.getAvailable()/(float)mGiftEntity.getTotal()) * 100);
+        Spanned content = null;
+        if ("coming".equals(mGiftEntity.getGiftStatus()) || "finish".equals(mGiftEntity.getGiftStatus())) {
+            content = Html.fromHtml("剩余：--");
+        } else if ("ling".equals(mGiftEntity.getGiftStatus())) {
+            content = Html.fromHtml("剩余：" + "<font color=\"#06D0A8\">" + count + "%" + "</font>");
+        } else if ("tao".equals(mGiftEntity.getGiftStatus())) {
+            content = Html.fromHtml("剩余：" + "<font color=\"#ffb13c\">" + count + "%" + "</font>");
+        } else if ("used_up".equals(mGiftEntity.getGiftStatus())) {
+            content = Html.fromHtml("剩余：0%  ");
+        }
+
+        //已领取或已淘号
+        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) {
+                        if (mGiftDetailEntity.getInstallRequired()) {
+                            DialogUtils.showWarningDialog(mContext, "复制成功", "礼包码：" + giftInfo.getGiftCode() +
+                                    "\n请尽快使用，礼包码将于60分钟后进入淘号池"
+                                    , "关闭", "启动游戏"
+                                    , 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.copyLink(giftInfo.getGiftCode(), mContext);
+                    }
+                });
+
+                Spanned giftCode;
+                if ("ling".equals(giftInfo.getGiftStatus())) {
+                    giftCode =  Html.fromHtml("已领取：" + "<font color=\"#00B7FA\">" +giftInfo.getGiftCode()+ "</font>");
+                    if (count == 0) {
+                        content = Html.fromHtml("剩余：" + "<font color=\"#9A9A9A\">" + count + "%" + "</font>");
+                    } else {
+                        content = Html.fromHtml("剩余：" + "<font color=\"#06D0A8\">" + count + "%" + "</font>");
+                    }
+                } else {
+                    giftCode =  Html.fromHtml("已淘号：" + "<font color=\"#ffb13c\">" +giftInfo.getGiftCode()+ "</font>");
+                    content = Html.fromHtml("剩余：" + count + "%" );
+                }
+                holder.giftCode.setVisibility(View.VISIBLE);
+                holder.giftCode.setText(giftCode);
+                holder.giftDes.setText(content);
+                return;
+            }
+        }
+
+        holder.giftDes.setText(content);
+
+        if (mGiftEntity.getGiftStatus() != null && mGiftDetailEntity != null) {
+            GiftUtils.initGiftBtn(holder.giftCopyBtn, mGiftEntity, mGiftDao, mGiftDetailEntity.getInstallRequired(), this);
+        }
+
+        // 判断按钮状态是否为空(礼包详情进入)，重新获取
+        if (TextUtils.isEmpty(content)) {
+            GiftUtils.getGiftStatus(mGiftEntity.getId(), new GiftUtils.PostGiftListener() {
+                @Override
+                public void postSucced(Object response) {
+                    List<GiftStatusEntity> statusList = (List<GiftStatusEntity>) response;
+                    if (statusList.size() == 0) return;
+                    mGiftEntity.setGiftStatus(statusList.get(0).getStatus());
+                    mGiftEntity.setAvailable(statusList.get(0).getAvailable());
+                    mGiftEntity.setTotal(statusList.get(0).getTotal());
+                    notifyItemChanged(0);
+                }
+
+                @Override
+                public void postFailed(Throwable error) {
+
+                }
+            });
+        }
     }
 
-    public GiftDetailEntity getGiftDetailEntity() {
-        return mGiftDetailEntity;
+    public GiftEntity getGiftEntity() {
+        return mGiftEntity;
     }
 
+    //初始化获取数据库的列表
+    public void initGiftDao() {
+        mGiftDao = new GiftDao(mContext);
+        mGiftInfos = mGiftDao.getAll();
+    }
 }
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 cbdfcc32ff..fe7c4f616d 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
@@ -39,6 +39,28 @@ public class GiftInfo  implements Serializable {
     @DatabaseField(columnName = "giftCode")
     private String giftCode;
 
+    @DatabaseField(columnName = "available")
+    private int available;
+
+    @DatabaseField(columnName = "total")
+    private int total;
+
+    public int getAvailable() {
+        return available;
+    }
+
+    public void setAvailable(int available) {
+        this.available = available;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
     public String getGiftCode() {
         return giftCode;
     }
@@ -111,9 +133,8 @@ public class GiftInfo  implements Serializable {
         this.gameName = gameName;
     }
 
-
     public GiftInfo(String giftId, String content, String icon, String name, String platform, String giftStatus
-            , String gameId, String gameName, String giftCode) {
+            , String gameId, String gameName, String giftCode, int available, int total) {
         this.giftId = giftId;
         this.content = content;
         this.icon = icon;
@@ -123,6 +144,8 @@ public class GiftInfo  implements Serializable {
         this.gameId = gameId;
         this.gameName = gameName;
         this.giftCode = giftCode;
+        this.available = available;
+        this.total = total;
     }
 
     public GiftInfo() {
@@ -141,6 +164,8 @@ public class GiftInfo  implements Serializable {
                 ", gameId='" + gameId + '\'' +
                 ", gameName='" + gameName + '\'' +
                 ", giftCode='" + giftCode + '\'' +
+                ", available='" + available + '\'' +
+                ", total='" + total + '\'' +
                 '}';
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
index 9064aa8f3c..a5b147414c 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
+++ b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
@@ -37,6 +37,47 @@ public class ConcernEntity {
 
     private int itemHeight;
 
+    private String type;
+
+    @SerializedName("game_id")
+    private String gameId;
+
+    private String platform;
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getGameId() {
+        return gameId;
+    }
+
+    public void setGameId(String gameId) {
+        this.gameId = gameId;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
     public int getItemHeight() {
         return itemHeight;
     }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/GiftDetailEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GiftDetailEntity.java
index 2eb232559a..80cc0a8b33 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/GiftDetailEntity.java
+++ b/app/src/main/java/com/gh/gamecenter/entity/GiftDetailEntity.java
@@ -51,23 +51,23 @@ public class GiftDetailEntity {
 
     public class GiftDetailTimeEntity {
 
-        private int end;
+        private long end;
 
-        private int start;
+        private long start;
 
-        public void setEnd(int end) {
+        public void setEnd(long end) {
             this.end = end;
         }
 
-        public int getEnd() {
+        public long getEnd() {
             return end;
         }
 
-        public void setStart(int start) {
+        public void setStart(long start) {
             this.start = start;
         }
 
-        public int getStart() {
+        public long getStart() {
             return start;
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java
index 02e848c663..0c3db70df1 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java
+++ b/app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java
@@ -10,6 +10,9 @@ public class GiftEntity {
     @SerializedName("_id")
     private String Id;
 
+    @SerializedName("libao_id")
+    private String giftId;
+
     private String content;
 
     private GiftGameEntity game;
@@ -20,8 +23,57 @@ public class GiftEntity {
 
     private String platform;
 
+    @SerializedName("type")
     private String giftStatus;
 
+    private String code;
+
+    private int available;
+
+    private int total;
+
+    private String packageName;
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public int getAvailable() {
+        return available;
+    }
+
+    public void setAvailable(int available) {
+        this.available = available;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public String getGiftId() {
+        return giftId;
+    }
+
+    public void setGiftId(String giftId) {
+        this.giftId = giftId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getGiftStatus() {
         return giftStatus;
     }
@@ -78,14 +130,18 @@ public class GiftEntity {
         return platform;
     }
 
-    public GiftEntity(String id, String content, GiftGameEntity game, String icon, String name
-            , String platform, String giftStatus) {
+    public GiftEntity(String id, String giftId, String content, GiftGameEntity game, String icon, String name
+            , String platform, String giftStatus, String code, int available, int total) {
         Id = id;
+        this.giftId = giftId;
         this.content = content;
         this.game = game;
         this.icon = icon;
         this.name = name;
         this.platform = platform;
         this.giftStatus = giftStatus;
+        this.code = code;
+        this.available = available;
+        this.total = total;
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/GiftStatusEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GiftStatusEntity.java
index 4d586c5d4f..5ae3867c74 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/GiftStatusEntity.java
+++ b/app/src/main/java/com/gh/gamecenter/entity/GiftStatusEntity.java
@@ -12,6 +12,26 @@ public class GiftStatusEntity {
 
     private String status;
 
+    private int available;
+
+    private int total;
+
+    public int getAvailable() {
+        return available;
+    }
+
+    public void setAvailable(int available) {
+        this.available = available;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift1Fragment.java b/app/src/main/java/com/gh/gamecenter/gift/Gift1Fragment.java
index 531bd99c3e..6189e4b790 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift1Fragment.java
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.gift;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -76,6 +77,15 @@ public class Gift1Fragment extends BaseFragment implements SwipeRefreshLayout.On
         });
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == 0x123 && adapter.getSkipPosition() != -1) {
+            // 更新对应位置
+            adapter.notifyItemChanged(adapter.getSkipPosition());
+            adapter.setSkipPosition(-1);
+        }
+    }
+
     @Override
     public void onRefresh() {
         handler.postDelayed(runnable, 1000);
@@ -108,9 +118,9 @@ public class Gift1Fragment extends BaseFragment implements SwipeRefreshLayout.On
     public void loadEmpty() {
         mRefreshLayout.setRefreshing(false);
         mLoadingLayout.setVisibility(View.GONE);
-        mRecyclerView.setVisibility(View.GONE);
+//        mRecyclerView.setVisibility(View.GONE);
         mEmptyLayout.setVisibility(View.VISIBLE);
-        mRefreshLayout.setEnabled(false);
+//        mRefreshLayout.setEnabled(false);
 
         if (mIsSearch) {
             mEmptyTv.setText("sorry，没找到相关礼包");
@@ -121,6 +131,9 @@ public class Gift1Fragment extends BaseFragment implements SwipeRefreshLayout.On
 
     @Override
     public void search(boolean isSearch, String searchKey) { //搜索回调
+        if (mEmptyLayout.getVisibility() == View.VISIBLE) {
+            mEmptyLayout.setVisibility(View.GONE);
+        }
         mIsSearch = isSearch;
         mSearckKey = searchKey;
         changeAdapter(false);
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 5ec857c206..f803955b54 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
@@ -19,6 +19,7 @@ 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.db.GiftDao;
+import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftEntity;
 import com.gh.gamecenter.entity.GiftStatusEntity;
 import com.gh.gamecenter.listener.OnCallBackListener;
@@ -37,7 +38,9 @@ import rx.schedulers.Schedulers;
  * Created by khy on 2016/12/12.
  */
 public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
     private Context mContext;
+    private Gift1Fragment gift1Fragment;
 
     private OnCallBackListener mCallBackListener;
     private OnSearchCallBackListener mSearchListener;
@@ -48,6 +51,8 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private String mSerchKey;
 
+    private int skipPosition;
+
     private boolean mIsSearch;
     private boolean isLoading;
     private boolean isOver;
@@ -55,6 +60,7 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     public Gift1FragmentAdapter(Gift1Fragment gift1Fragment, boolean isSearch, String key) {
         this.mContext = gift1Fragment.getContext();
+        this.gift1Fragment = gift1Fragment;
         this.mCallBackListener = gift1Fragment;
         this.mSearchListener = gift1Fragment;
         this.mIsSearch = isSearch;
@@ -64,6 +70,8 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         mGiftDao = new GiftDao(mContext);
 
+        skipPosition = -1;
+
         if (isSearch) {
             addGiftList(true, 0);
         }
@@ -74,7 +82,7 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         isLoading = true;
 
-        Observable<List<GiftEntity>> giftApi;
+        final Observable<List<GiftEntity>> giftApi;
         if (isSearch) {
             giftApi = RetrofitManager.getApi().getSearchGift(mSerchKey, offset);
         } else {
@@ -108,12 +116,16 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                         }
 
                         isLoading = false;
-                        getGiftStatus(response);
+
+                        if (response.size() != 0) {
+                            getGiftStatus(response);
+                        }
                     }
 
                     @Override
                     public void onFailure(Throwable e) {
                         super.onFailure(e);
+                        Utils.log("getGift==" + e.toString());
                         mCallBackListener.loadError();
                         isLoading = false;
                     }
@@ -133,13 +145,26 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GiftUtils.getGiftStatus(ids, new GiftUtils.PostGiftListener() {
             @Override
             public void postSucced(Object response) {
-                for (GiftEntity giftEntity : mGiftList) {
-                    for (GiftStatusEntity giftStatusEntity : (List<GiftStatusEntity>) response) {
-                        if (giftEntity.getId().equals(giftStatusEntity.getId())) {
-                            giftEntity.setGiftStatus(giftStatusEntity.getStatus());
+                List<GiftStatusEntity> statusList = (List<GiftStatusEntity>) response;
+
+                for (GiftInfo giftInfo : mGiftDao.getAll()) {
+                    for (int i = 0; i < statusList.size(); i++) {
+                        if (giftInfo.getGiftId().equals(statusList.get(i).getId())) {
+                            statusList.get(i).setStatus("check");
                         }
                     }
                 }
+
+                for (GiftEntity giftEntity : mGiftList) {
+                    for (GiftStatusEntity giftStatusEntity : statusList) {
+                        if (giftEntity.getId().equals(giftStatusEntity.getId())) {
+                            giftEntity.setGiftStatus(giftStatusEntity.getStatus());
+                            giftEntity.setAvailable(giftStatusEntity.getAvailable());
+                            giftEntity.setTotal(giftStatusEntity.getTotal());
+                        }
+                    }
+                }
+
                 notifyDataSetChanged();
             }
 
@@ -166,7 +191,7 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         View view;
         switch (viewType) {
             case ItemViewType.SEARCH_NORMAL:
-                view = LayoutInflater.from(mContext).inflate(R.layout.game_news_search_item, parent, false);
+                view = LayoutInflater.from(mContext).inflate(R.layout.gift_item_search, parent, false);
                 return new GameNewsSearchViewHolder(view);
             case ItemViewType.LOADING:
                 view = LayoutInflater.from(mContext).inflate(R.layout.refresh_footerview, parent, false);
@@ -190,6 +215,9 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     @Override
     public int getItemCount() {
+        if (mGiftList.size() == 0) {
+            return 1;
+        }
         return mGiftList.size() + 2;
     }
 
@@ -228,7 +256,6 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             holder.game_news_tv_search.setText("搜索");
         }
 
-        holder.game_news_et_search.setBackgroundResource(R.drawable.gift_search_bg);
         holder.game_news_tv_search.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -247,23 +274,37 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         });
     }
 
-    private void initGiftViewHolder(GiftNormalViewHolder holder, int position) {
+    private void initGiftViewHolder(final GiftNormalViewHolder holder, final int position) {
         final GiftEntity giftEntity = mGiftList.get(position - 1);
         holder.giftName.setText(giftEntity.getName());
-        holder.giftDes.setText(giftEntity.getContent());
-        holder.giftGameName.setText(giftEntity.getGame().getName() + PlatformUtils.getInstance(mContext)
+        holder.giftGameName.setText(giftEntity.getGame().getName() + " - " + PlatformUtils.getInstance(mContext)
                 .getPlatformName(giftEntity.getPlatform()));
         holder.giftGameIcon.setImageURI(giftEntity.getIcon());
+
+        String content ;
+        if (giftEntity.getContent().contains("<br/>")) {
+            content = giftEntity.getContent().replaceAll("<br/>", " ");
+        } else {
+            content = giftEntity.getContent();
+        }
+        holder.giftDes.setText(content);
+
         if (giftEntity.getGiftStatus() != null) {
-            GiftUtils.initGiftBtn(holder.giftBtnStatus, giftEntity, mGiftDao);
+            GiftUtils.initGiftBtn(holder.giftBtnStatus, giftEntity, mGiftDao, false, null);
+            holder.giftBtnStatus.setClickable(false);
+            String tv = holder.giftBtnStatus.getText().toString();
+            if ("已结束".equals(tv) || "已领光".equals(tv)) {
+                holder.giftBtnStatus.setClickable(true);
+            }
         }
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                skipPosition = position;
                 AppController.put("giftEntity", giftEntity);
                 Intent intent = new Intent(mContext, GiftDetailActivity.class);
-                mContext.startActivity(intent);
+                gift1Fragment.startActivityForResult(intent, 0x123);
             }
         });
     }
@@ -293,6 +334,14 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         return mGiftList.size();
     }
 
+    public int getSkipPosition() {
+        return skipPosition;
+    }
+
+    public void setSkipPosition(int position) {
+        skipPosition = position;
+    }
+
     public interface OnSearchCallBackListener {
         void search(boolean isSearch, String searchKey);
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift2Fragment.java b/app/src/main/java/com/gh/gamecenter/gift/Gift2Fragment.java
index 68519f3aab..5ad4177e32 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift2Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift2Fragment.java
@@ -1,5 +1,6 @@
 package com.gh.gamecenter.gift;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -67,6 +68,15 @@ public class Gift2Fragment extends BaseFragment implements SwipeRefreshLayout.On
         });
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == 0x123 && adapter.getSkipPosition() != -1) {
+            // 更新对应位置
+            adapter.notifyItemChanged(adapter.getSkipPosition());
+            adapter.setSkipPosition(-1);
+        }
+    }
+
     @Override
     public void onRefresh() {
         handler.postDelayed(runnable, 1000);
@@ -100,7 +110,7 @@ public class Gift2Fragment extends BaseFragment implements SwipeRefreshLayout.On
         mRefreshLayout.setRefreshing(false);
         mLoadingLayout.setVisibility(View.GONE);
         mEmptyLayout.setVisibility(View.VISIBLE);
-        mRefreshLayout.setEnabled(false);
+//        mRefreshLayout.setEnabled(false);
     }
 
     // 资讯Fragment界面切换事件
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 152287b789..fe48aba664 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
@@ -13,6 +13,7 @@ import com.gh.common.constant.ItemViewType;
 import com.gh.common.util.ConcernUtils;
 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;
@@ -21,6 +22,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.GiftNormalViewHolder;
 import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.ConcernInfo;
+import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftEntity;
 import com.gh.gamecenter.entity.GiftStatusEntity;
 import com.gh.gamecenter.listener.OnCallBackListener;
@@ -49,22 +51,30 @@ import rx.schedulers.Schedulers;
  * Created by khy on 2016/12/12.
  */
 public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
     private Context mContext;
+    private Gift2Fragment gift2Fragment;
 
     private OnCallBackListener mCallBackListener;
 
     private List<GiftEntity> mGiftList;
+    private List<String> gameIdList;
 
     private boolean isLoading;
     private boolean isOver;
     private boolean isNetworkError;
+
     private String key;
     private String ids;
-    private List<String> gameIdList;
+
+    private int skipPosition;
+
     private GiftDao mGiftDao;
 
+
     public Gift2FragmentAdapter(Gift2Fragment gift2Fragment) {
         this.mContext = gift2Fragment.getContext();
+        this.gift2Fragment = gift2Fragment;
         this.mCallBackListener = gift2Fragment;
 
         mGiftList = new ArrayList<>();
@@ -72,6 +82,8 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         mGiftDao = new GiftDao(mContext);
 
+        skipPosition = -1;
+
         isLoading = false;
         isNetworkError = false;
         isOver = false;
@@ -79,9 +91,11 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     // 加载数据
     public void addList(final int offset) {
+
         if (isLoading) {
             return;
         }
+
         isLoading = true;
         if (TextUtils.isEmpty(key) || TextUtils.isEmpty(ids)) {
             ObservableUtil.computation(new Observable.OnSubscribe<String>() {
@@ -167,7 +181,10 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                         }
                         notifyDataSetChanged();
 
-                        getGiftStatus(response);
+                        if (response.size() != 0) {
+                            getGiftStatus(response);
+                        }
+
                     }
 
                     @Override
@@ -206,7 +223,7 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                     public void onResponse(List<GiftEntity> response) {
                         super.onResponse(response);
                         mGiftList.addAll(response);
-                        mCallBackListener.loadDone();
+
                         isLoading = false;
                         if (response.size() < 20) {
                             isOver = true;
@@ -219,7 +236,9 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                         }
                         notifyDataSetChanged();
 
-                        getGiftStatus(response);
+                        if (response.size() != 0) {
+                            getGiftStatus(response);
+                        }
 
                     }
 
@@ -246,10 +265,22 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         GiftUtils.getGiftStatus(ids, new GiftUtils.PostGiftListener() {
             @Override
             public void postSucced(Object response) {
+                List<GiftStatusEntity> statusList = (List<GiftStatusEntity>) response;
+
+                for (GiftInfo giftInfo : mGiftDao.getAll()) {
+                    for (int i = 0; i < statusList.size(); i++) {
+                        if (giftInfo.getGiftId().equals(statusList.get(i).getId())) {
+                            statusList.get(i).setStatus("check");
+                        }
+                    }
+                }
+
                 for (GiftEntity giftEntity : mGiftList) {
-                    for (GiftStatusEntity giftStatusEntity : (List<GiftStatusEntity>) response) {
+                    for (GiftStatusEntity giftStatusEntity : statusList) {
                         if (giftEntity.getId().equals(giftStatusEntity.getId())) {
                             giftEntity.setGiftStatus(giftStatusEntity.getStatus());
+                            giftEntity.setAvailable(giftStatusEntity.getAvailable());
+                            giftEntity.setTotal(giftStatusEntity.getTotal());
                         }
                     }
                 }
@@ -345,22 +376,37 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     }
 
-    private void initGiftViewHolder(GiftNormalViewHolder holder, int position) {
+    private void initGiftViewHolder(final GiftNormalViewHolder holder, final int position) {
         final GiftEntity giftEntity = mGiftList.get(position - 1);
         holder.giftName.setText(giftEntity.getName());
-        holder.giftDes.setText(giftEntity.getContent());
         holder.giftGameIcon.setImageURI(giftEntity.getIcon());
+        holder.giftGameName.setText(giftEntity.getGame().getName() + " - " + PlatformUtils.getInstance(mContext)
+                .getPlatformName(giftEntity.getPlatform()));
+
+        String content ;
+        if (giftEntity.getContent().contains("<br/>")) {
+            content = giftEntity.getContent().replaceAll("<br/>", " ");
+        } else {
+            content = giftEntity.getContent();
+        }
+        holder.giftDes.setText(content);
 
         if (giftEntity.getGiftStatus() != null) {
-            GiftUtils.initGiftBtn(holder.giftBtnStatus, giftEntity, mGiftDao);
+            GiftUtils.initGiftBtn(holder.giftBtnStatus, giftEntity, mGiftDao, false, null);
+            holder.giftBtnStatus.setClickable(false);
+            String tv = holder.giftBtnStatus.getText().toString();
+            if ("已结束".equals(tv) || "已领光".equals(tv)) {
+                holder.giftBtnStatus.setClickable(true);
+            }
         }
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                skipPosition = position;
                 AppController.put("giftEntity", giftEntity);
                 Intent intent = new Intent(mContext, GiftDetailActivity.class);
-                mContext.startActivity(intent);
+                gift2Fragment.startActivityForResult(intent, 0x123);
             }
         });
     }
@@ -384,4 +430,12 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
     public int getGiftListSize() {
         return mGiftList.size();
     }
+
+    public int getSkipPosition() {
+        return skipPosition;
+    }
+
+    public void setSkipPosition(int position) {
+        skipPosition = position;
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/gift/Gift3Fragment.java b/app/src/main/java/com/gh/gamecenter/gift/Gift3Fragment.java
index c0a10606e9..1511c308e2 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift3Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift3Fragment.java
@@ -14,21 +14,15 @@ import com.gh.gamecenter.R;
 import com.gh.gamecenter.eventbus.EBReuse;
 
 import butterknife.BindView;
-import butterknife.OnClick;
 
 /**
  * Created by khy on 2016/12/12.
  */
 public class Gift3Fragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener {
 
-    @BindView(R.id.gift3_srl_refresh)
-    SwipeRefreshLayout mRefreshLayout;
-    @BindView(R.id.gift3_rv_list)
-    RecyclerView mRecyclerView;
-    @BindView(R.id.gift3_pb_loading)
-    ProgressBarCircularIndeterminate mLoadingLayout;
-    @BindView(R.id.reuse_no_connection)
-    LinearLayout mNoConnectionLayout;
+    @BindView(R.id.gift3_srl_refresh) SwipeRefreshLayout mRefreshLayout;
+    @BindView(R.id.gift3_rv_list) RecyclerView mRecyclerView;
+    @BindView(R.id.gift3_pb_loading) ProgressBarCircularIndeterminate mLoadingLayout;
     @BindView(R.id.reuse_none_data) LinearLayout mEmptyLayout;
 
     private LinearLayoutManager mLayoutManager;
@@ -65,36 +59,18 @@ public class Gift3Fragment extends BaseFragment implements SwipeRefreshLayout.On
         handler.postDelayed(runnable, 1000);
     }
 
-    @OnClick(R.id.reuse_no_connection)
-    public void reconnection() { // 重新连接
-        mRefreshLayout.setRefreshing(true);
-        mRecyclerView.setVisibility(View.VISIBLE);
-        mLoadingLayout.setVisibility(View.VISIBLE);
-        mNoConnectionLayout.setVisibility(View.GONE);
-        handler.postDelayed(runnable, 1000);
+    @Override
+    public void loadEmpty() { // 数据为空回调
+        mRefreshLayout.setRefreshing(false);
+        mLoadingLayout.setVisibility(View.GONE);
+        mEmptyLayout.setVisibility(View.VISIBLE);
     }
 
     @Override
     public void loadDone() { // 数据加载成功回调
         mRefreshLayout.setRefreshing(false);
         mLoadingLayout.setVisibility(View.GONE);
-    }
-
-    @Override
-    public void loadError() { // 数据加载失败回调
-        mRefreshLayout.setRefreshing(false);
-        mLoadingLayout.setVisibility(View.GONE);
-        mRecyclerView.setVisibility(View.GONE);
-        mNoConnectionLayout.setVisibility(View.VISIBLE);
-    }
-
-    @Override
-    public void loadEmpty() { // 数据为空回调
-        mRefreshLayout.setRefreshing(false);
-        mLoadingLayout.setVisibility(View.GONE);
-        mRecyclerView.setVisibility(View.GONE);
-        mEmptyLayout.setVisibility(View.VISIBLE);
-        mRefreshLayout.setEnabled(false);
+        mEmptyLayout.setVisibility(View.GONE);
     }
 
     // 礼包数据库数量改变事件
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 084fb82856..df1ae7655f 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift3FragmentAdapter.java
@@ -3,12 +3,15 @@ package com.gh.gamecenter.gift;
 import android.content.Context;
 import android.content.Intent;
 import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.gh.base.AppController;
 import com.gh.common.util.GiftUtils;
+import com.gh.common.util.PlatformUtils;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GiftNormalViewHolder;
@@ -16,6 +19,7 @@ import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.GiftEntity;
 import com.gh.gamecenter.entity.GiftGameEntity;
+import com.gh.gamecenter.listener.OnCallBackListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,14 +28,18 @@ import java.util.List;
  * Created by khy on 2016/12/12.
  */
 public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
     private Context mContext;
 
-    private List<GiftEntity> mGiftList;
-    private GiftDao mGiftDao;
+    private OnCallBackListener mCallBackListener;
 
+    private List<GiftEntity> mGiftList;
+
+    private GiftDao mGiftDao;
 
     public Gift3FragmentAdapter(Gift3Fragment gift3Fragment) {
         this.mContext = gift3Fragment.getContext();
+        this.mCallBackListener = gift3Fragment;
 
         mGiftList = new ArrayList<>();
 
@@ -42,16 +50,26 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         mGiftList.clear();
         mGiftDao = new GiftDao(mContext);
         List<GiftInfo> giftInfos = mGiftDao.getAll();
+
         if (giftInfos == null) {
+            mCallBackListener.loadEmpty();
             return;
         }
-        for (int i = 0; i < giftInfos.size(); i++) {
+
+        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.getContent(), giftGameEntity, giftInfo.getIcon()
-                    , giftInfo.getName(), giftInfo.getPlatform() ,giftInfo.getGiftStatus());
+            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);
         }
+
+        if (mGiftList.size() == 0) {
+            mCallBackListener.loadEmpty();
+        } else {
+            mCallBackListener.loadDone();
+        }
         notifyDataSetChanged();
     }
 
@@ -67,11 +85,27 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         final GiftEntity giftEntity = mGiftList.get(position );
         viewHolder.giftName.setText(giftEntity.getName());
-        viewHolder.giftDes.setText(giftEntity.getContent());
+
         viewHolder.giftGameIcon.setImageURI(giftEntity.getIcon());
 
-        if (giftEntity.getGiftStatus() != null) {
-            GiftUtils.initGiftBtn(viewHolder.giftBtnStatus, giftEntity, mGiftDao);
+        viewHolder.giftGameName.setText(giftEntity.getGame().getName() + " - " + PlatformUtils.getInstance(mContext)
+                .getPlatformName(giftEntity.getPlatform()));
+
+        if (giftEntity.getCode() != null ) {
+            Spanned content;
+            if ("ling".equals(giftEntity.getGiftStatus())) {
+                content =  Html.fromHtml("已领取：" + "<font color=\"#00B7FA\">" +giftEntity.getCode()+ "</font>");
+            } else {
+                content =  Html.fromHtml("已淘号：" + "<font color=\"#ffb13c\">" +giftEntity.getCode()+ "</font>");
+            }
+            viewHolder.giftDes.setText(content);
+
+            viewHolder.giftBtnStatus.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    GiftUtils.copyLink(giftEntity.getCode(), mContext);
+                }
+            });
         }
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -82,6 +116,9 @@ public class Gift3FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                 mContext.startActivity(intent);
             }
         });
+
+        viewHolder.giftBtnStatus.setText("复制");
+        viewHolder.giftBtnStatus.setBackgroundResource(R.drawable.textview_blue_style);
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
index e8083b3e65..6d0ab87fc0 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
@@ -131,6 +131,10 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
             // 更新对应位置
             adapter.notifyItemChanged(adapter.getSkipPosition());
             adapter.setSkipPosition(-1);
+        } else if (requestCode == 0x122 && adapter.getSkipPosition() != -1) {
+            adapter.initGiftDao();
+            adapter.notifyItemChanged(adapter.getSkipPosition());
+            adapter.setSkipPosition(-1);
         }
     }
 
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 0325ce4626..c23774432a 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -17,10 +17,13 @@ import com.gh.common.util.ConcernContentUtils;
 import com.gh.common.util.ConcernUtils;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.GiftUtils;
 import com.gh.common.util.MD5Utils;
 import com.gh.common.util.NewsUtils;
+import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.TokenUtils;
 import com.gh.common.view.CardLinearLayout;
+import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.MessageDetailActivity;
 import com.gh.gamecenter.NewsDetailActivity;
 import com.gh.gamecenter.R;
@@ -29,9 +32,14 @@ import com.gh.gamecenter.ShareCardPicActivity;
 import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder;
+import com.gh.gamecenter.db.GiftDao;
 import com.gh.gamecenter.db.info.ConcernInfo;
+import com.gh.gamecenter.db.info.GiftInfo;
 import com.gh.gamecenter.entity.CommentnumEntity;
 import com.gh.gamecenter.entity.ConcernEntity;
+import com.gh.gamecenter.entity.GiftEntity;
+import com.gh.gamecenter.entity.GiftGameEntity;
+import com.gh.gamecenter.entity.GiftStatusEntity;
 import com.gh.gamecenter.entity.ViewsEntity;
 import com.gh.gamecenter.listener.OnCallBackListener;
 import com.gh.gamecenter.manager.CommentManager;
@@ -71,10 +79,15 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private News1Fragment fragment;
     private Context context;
+
     private OnCallBackListener listener;
 
     private List<ConcernEntity> concernList;
     private List<String> gameIdList;
+    private List<GiftStatusEntity> giftStatusList;
+
+    private  List<GiftInfo> giftInfo;
+    private  GiftDao giftDao;
 
     private String key;
     private String ids;
@@ -95,6 +108,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
         concernList = new ArrayList<>();
         gameIdList = new ArrayList<>();
+        giftStatusList = new ArrayList<>();
 
         itemCount = 0;
         skipPosition = -1;
@@ -103,6 +117,9 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         isOver = false;
         isLoading = false;
 
+        giftDao = new GiftDao(context);
+        giftInfo = giftDao.getAll();
+
         cardMargin = (int) context.getResources().getDimension(R.dimen.cardview_margin);
     }
 
@@ -189,8 +206,10 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                                         notifyDataSetChanged();
                                     }
 
+                                    getGiftStatus(response);
                                     getNewsViews(response, offset);
                                     getNewsCommentnum(response, offset);
+
                                 } else {
                                     isOver = true;
                                     notifyItemChanged(getItemCount() - 1);
@@ -261,6 +280,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                             getNewsViews(response, offset);
                             getNewsCommentnum(response, offset);
+                            getGiftStatus(response);
                         } else {
                             isOver = true;
                             notifyItemChanged(getItemCount() - 1);
@@ -293,6 +313,33 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                 });
     }
 
+    //获取礼包状态
+    private void getGiftStatus(List<ConcernEntity> response) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0, size = response.size(); i < size; i++) {
+            if ("libao".equals(response.get(i).getType())){
+                builder.append(response.get(i).getId());
+                builder.append("-");
+            }
+        }
+        builder.deleteCharAt(builder.length() - 1);
+        String ids = builder.toString();
+
+        GiftUtils.getGiftStatus(ids, new GiftUtils.PostGiftListener() {
+            @Override
+            public void postSucced(Object response) {
+                giftStatusList = (List<GiftStatusEntity>) response;
+                notifyDataSetChanged();
+            }
+
+            @Override
+            public void postFailed(Throwable error) {
+
+            }
+        });
+    }
+
+
     // 去除重复数据
     private static List<ConcernEntity> removeDuplicateData(List<ConcernEntity> sourceList, List<ConcernEntity> rawList) {
         if (sourceList == null || sourceList.isEmpty()
@@ -492,6 +539,63 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         viewHolder.title.setText(concernEntity.getGameName());
         NewsUtils.setNewsPublishOn(viewHolder.time, concernEntity.getTime());
 
+        if ("libao".equals(concernEntity.getType())) {
+            String giftCode = null;
+            viewHolder.imgLayout.removeAllViews();
+            viewHolder.content.setText(Html.fromHtml(concernEntity.getName() + "-" + PlatformUtils.getInstance(context)
+                    .getPlatformName(concernEntity.getPlatform()) + " (" + concernEntity.getContent() + ")" ));
+            viewHolder.comment.setVisibility(View.GONE);
+            viewHolder.share.setVisibility(View.GONE);
+            viewHolder.link.setImageResource(R.drawable.gift_icon);
+
+            for (GiftStatusEntity giftStatusEntity : giftStatusList) {
+                if (giftStatusEntity.getId().equals(concernEntity.getId())) {
+                    for (GiftInfo info : giftInfo) {
+                        if (info.getGiftId().equals(concernEntity.getId())) {
+                            viewHolder.read.setText("已领取");
+                            giftCode = info.getGiftCode();
+                            break;
+                        }
+                    }
+
+                    if ("已领取".equals(viewHolder.read.getText().toString())) {
+                        break;
+                    }
+
+                    if ("finish".equals(giftStatusEntity.getStatus())) {
+                        viewHolder.read.setText("已结束");
+                    } else {
+                        viewHolder.read.setText(Html.fromHtml("<font color=\"#00B7FA\">" + "点击领取" + "</font>"));
+                    }
+                    break;
+                }
+            }
+
+            final String finalGiftCode = giftCode;
+            viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    for (GiftStatusEntity giftStatusEntity : giftStatusList) {
+                        if (concernEntity.getId().equals(giftStatusEntity.getId())) {
+                            GiftEntity giftEntity = new GiftEntity(concernEntity.getId(), concernEntity.getId()
+                                    , concernEntity.getContent(), new GiftGameEntity(concernEntity.getGameId()
+                                    , concernEntity.getGameName()), concernEntity.getGameIcon(), concernEntity.getName()
+                                    , concernEntity.getPlatform(), giftStatusEntity.getStatus(), finalGiftCode
+                                    , giftStatusEntity.getAvailable(), giftStatusEntity.getTotal());
+                            AppController.put("giftEntity", giftEntity);
+                        }
+                    }
+                    skipPosition = viewHolder.getPosition();
+                    Intent intent = new Intent(context, GiftDetailActivity.class);
+                    fragment.startActivityForResult(intent, 0x122);
+                }
+            });
+            return;
+        }
+
+        viewHolder.comment.setVisibility(View.VISIBLE);
+        viewHolder.share.setVisibility(View.VISIBLE);
+
         if (concernEntity.getBrief() != null) {
             viewHolder.content.setText(Html.fromHtml(concernEntity.getBrief()));
             viewHolder.content.setMaxLines(100);
@@ -645,6 +749,12 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
         return itemCount + 1;
     }
 
+    //初始化获取数据库的列表
+    public void initGiftDao() {
+        giftDao = new GiftDao(context);
+        giftInfo = giftDao.getAll();
+    }
+
     public int getConcernListSize() {
         return concernList.size();
     }
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 6921239bf5..0f3c85f1bb 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
@@ -173,7 +173,7 @@ public interface ApiService {
     Observable<List<GiftEntity>> getGift(@Query("offset") int offset); //获取礼包列表数据
 
     @GET("libao?limit=20")
-    Observable<List<GiftEntity>> getSearchGift(@Query("search") String searchKey, @Query("offset") int offset); //搜索礼包列表数据
+    Observable<List<GiftEntity>> getSearchGift(@Query("keyword") String searchKey, @Query("offset") int offset); //搜索礼包列表数据
 
     @GET("libao/{gift_Id}/detail")
     Observable<GiftDetailEntity> getGiftDetail(@Path("gift_Id") String giftId); //获取礼包详情数据
diff --git a/app/src/main/res/drawable-hdpi/gift_icon.png b/app/src/main/res/drawable-hdpi/gift_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbc7bde91194762a4279471653da2fbd927d32ea
GIT binary patch
literal 1676
zcmaJ?dr;GM9IwC-Dr`DEPMm{Se9tsVn}()P1==bF3WzAo`5<iqRA^JvbQF{~Qztle
zfFh!TgUOxBal*K%8!u5#MV(W}hKEBoL=R;;bRxrTDNyGhp1I`r{C>XQ&-ZotJTiQR
zJAW3R$K$!HgOyR-Jm2=YICEpQ{6P&jd9tclb`>4ZrVtFp3nXbR1*i=~0u@COWa{RN
zls}K>xJ@4&%f@QLWIEa)By2K5tHH#fc|8ARRuiF1qF6vnCFqTE!5?Rv1c08D3t}W1
zSYuL9iTdC)hFX;t9<57D(&40F*;2sYD&rIwD3$=MhGe5zW|a%Z^vbxk?HCdOV<K#l
zTrf^5Ruc&*XodnLLJZU)ViDkr3lRw}lA=oh5sY9Ej6w(wB4Qc$qA)P=2smpD883@c
zE}yW)?c{<)mNm&BC?zFDm?9R^Oah0+aR?ScA`!?*faX*qOISgp*~hLyNttzw-o)x@
zBVf}=XlV;87jR6+T`-t5npcXA=7~UYA%m=h2||Q0WH8wL8k07&QPlr5-Y9L3PBl?b
z6lJC@jE>7kypJ8s#qRBfY=RscSp=i!l0qaaX`RJD8CkVbF5qs2q@I+C#l9pAV>pOm
zQUuh+qd17eA~7f?NUel`2?V7`yPh}UQ4|kUN)$*?kQ7A_6(+@el?tV5xdM@@q(Kse
z9ji8)S;DBJ?6&os?FlUWR;*0HPy|ae(KMZGuY$-#nx)N&v<XlsY+08GCBVWMy^*9-
z%!_P^8uwdCG5Sv_aydgAfU!u+^lxB+i{d3HhLa!(<MALSLVZC3=fa?aQACGI5mbxf
zf(bnNS_H={l{?`)G1&>pq+%V6AzTIGFiL_5LSY~w(vl#q<wi+7Ce|Vn0mM;+Y{m0h
zG1-r}3bid?wFb9&)m)U3>nMh6oofU9+dQ5_nOYebZS8tkq6uCdIHNtiv?6lTfynpg
z=4h+4XZ9W~YU_Fmh+C%?to!Z<m3LmHz&RZ#I_ROw&c8pUMd@~@b(iNf<($1ei<ydI
z{;c8<u<iNCd!x{7ujlLg8}IGR-_kQV;a>NF7r!15C){fcKxb*X3K~=%t#@m0)ZK2j
znBINp<lRg?zFJfg2PZ-uEk%1e%cF0u&Wh<-XiZAH@TKI)7C?D2OFg15_a?jQ^$uT^
zT{m9+b|tZ;SwA8!cbd&hKXH3X&4v00??eQ+S3CJOuc*CNS^E+Q_;-GZ^U4dI{sU0f
zqo=!bv4a`>=2eBQ8Lmz1hBKSfM?!9THZ~i6TJ&T=px1EQnR93AzV=CW*jkn8RW`Lr
z?l5iSnAC(^c8n_#k8Y?}i{~Y~*XQ?d%<|aRWKLM@=df1gmxSHQ&%2-LxG`)n<eQ<v
zA0zsNA3EW2dCxvMUAB)`93*SmGxJy>v?;9Q)JKAh6IFk^@ePL$Iq1q)6jXFA6(4Fp
z5jV(t7Pr^(alzTx<MY)8Ey4!P!{D55hwW$=n6<uCH|o^BqwxDloxQFDfA;ua^{DG7
zZ-uumIoLm#pU9S6`mH^r_HtO|@zRRQ@Z#<Pu!?%*AH^EJIF@tD&&_rH2a|VOax*XX
zF(=!eSdt%Pru1zqg*u9Ax9)%W`}rr9B^wvCT*}|zIDGv2X6J>|`$Ee@%#KyLxyHPC
zL*YlNi#=b4^rp_7+UGL#3w_RYO}bCnF4w9Zg|+$R`}!#iO1t7U?`O9SE*Xz^qP;Ul
zp9dTo=CAz=Zdsci!E|iT@EZE;MeA0=%OzA@?%lm#v)MfNeCbGT<+P5P!WPBR*}a_&
zH|89^+&JB%!O=hEG+)(I6%&d#WZxzI*2LBQgO5gJP2yqw*>|pl)<CxZgIX1?tO<(C
F`41zWgVF#1

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 2c7489ecfa..8339deab7e 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -70,6 +70,7 @@
             android:layout_centerInParent="true"/>
 
         <include layout="@layout/reuse_no_connection" />
+        <include layout="@layout/reuse_none_data" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/common_hintdialog.xml b/app/src/main/res/layout/common_hintdialog.xml
new file mode 100644
index 0000000000..7f44c82857
--- /dev/null
+++ b/app/src/main/res/layout/common_hintdialog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/hintdialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:text="提示标题"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:gravity="center_vertical"
+        android:paddingLeft="20dp"
+        android:textColor="#3a3a3a"/>
+
+    <View
+        android:layout_width="321dp"
+        android:layout_height="1dp"
+        android:background="#E5E5E5"/>
+
+    <TextView
+        android:id="@+id/hintdialog_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="提示内容"
+        android:textSize="16sp"
+        android:gravity="center_vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="20dp"
+        android:paddingBottom="20dp"
+        android:lineSpacingMultiplier="1.3"/>
+
+    <TextView
+        android:id="@+id/hintdialog_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_weight="1"
+        android:background="@color/theme"
+        android:gravity="center"
+        android:text="知道了"
+        android:textColor="#fff"
+        android:textSize="18sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gift3.xml b/app/src/main/res/layout/fragment_gift3.xml
index eae2178f2c..c1d9f53de3 100644
--- a/app/src/main/res/layout/fragment_gift3.xml
+++ b/app/src/main/res/layout/fragment_gift3.xml
@@ -21,7 +21,6 @@
         android:layout_centerInParent="true"
         android:background="@color/theme" />
 
-    <include layout="@layout/reuse_no_connection"/>
     <include layout="@layout/reuse_none_data"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gift_item_search.xml b/app/src/main/res/layout/gift_item_search.xml
new file mode 100644
index 0000000000..70ac8a5f93
--- /dev/null
+++ b/app/src/main/res/layout/gift_item_search.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="38dp"
+    android:gravity="center_vertical"
+    android:layout_marginLeft="35dp"
+    android:layout_marginRight="35dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="11dp">
+
+    <EditText
+        android:id="@+id/game_news_et_search"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/gift_search_bg"
+        android:hint="请输入关键字"
+        android:imeOptions="actionSearch"
+        android:paddingLeft="5dp"
+        android:paddingRight="53dp"
+        android:singleLine="true"
+        android:textColorHint="@color/hint"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/game_news_tv_search"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/news_search_btn"
+        android:text="搜索"
+        android:textSize="14sp"
+        android:gravity="center"
+        android:textColor="@android:color/white"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/giftdetail_item_top.xml b/app/src/main/res/layout/giftdetail_item_top.xml
index 43284d1709..16a47a3bf2 100644
--- a/app/src/main/res/layout/giftdetail_item_top.xml
+++ b/app/src/main/res/layout/giftdetail_item_top.xml
@@ -45,8 +45,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/title"
                     android:textSize="16sp"
-                    android:singleLine="true"
-                    android:text="暖床萌萌大礼包"/>
+                    android:singleLine="true" />
 
                 <TextView
                     android:id="@+id/giftdetail_game_name"
@@ -56,8 +55,7 @@
                     android:textSize="12sp"
                     android:layout_marginTop="6dp"
                     android:layout_marginBottom="8dp"
-                    android:singleLine="true"
-                    android:text="刀塔传奇"/>
+                    android:singleLine="true" />
 
                 <TextView
                     android:id="@+id/giftdetail_des"
@@ -65,8 +63,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/title"
                     android:textSize="12sp"
-                    android:singleLine="true"
-                    android:text="绑定金币20"/>
+                    android:singleLine="true" />
 
             </LinearLayout>
 
@@ -77,6 +74,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="10dp"
+                android:gravity="center"
                 android:textColor="@android:color/white"/>
 
         </LinearLayout>

From df1eec07e5d5ae41f027d1dceb4d673cda7b695a Mon Sep 17 00:00:00 2001
From: khy <18814188563@163.com>
Date: Wed, 21 Dec 2016 10:53:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java  | 1 +
 .../main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java  | 1 +
 .../main/java/com/gh/gamecenter/news/News1FragmentAdapter.java  | 2 ++
 3 files changed, 4 insertions(+)

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 f803955b54..de1cbc1ff4 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift1FragmentAdapter.java
@@ -139,6 +139,7 @@ public class Gift1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             builder.append(response.get(i).getId());
             builder.append("-");
         }
+        if (builder.length() == 0) return;
         builder.deleteCharAt(builder.length() - 1);
         String ids = builder.toString();
 
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 fe48aba664..806aaefff1 100644
--- a/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gift/Gift2FragmentAdapter.java
@@ -259,6 +259,7 @@ public class Gift2FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             builder.append(response.get(i).getId());
             builder.append("-");
         }
+        if (builder.length() == 0) return;
         builder.deleteCharAt(builder.length() - 1);
         String ids = builder.toString();
 
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 c23774432a..95c6a398ef 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -22,6 +22,7 @@ import com.gh.common.util.MD5Utils;
 import com.gh.common.util.NewsUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.TokenUtils;
+import com.gh.common.util.Utils;
 import com.gh.common.view.CardLinearLayout;
 import com.gh.gamecenter.GiftDetailActivity;
 import com.gh.gamecenter.MessageDetailActivity;
@@ -322,6 +323,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
                 builder.append("-");
             }
         }
+        if (builder.length() == 0) return;
         builder.deleteCharAt(builder.length() - 1);
         String ids = builder.toString();