From 9ac373bf0e2c429dbd0e0d33bd033ecc042d64e6 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Fri, 27 Apr 2018 06:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.2=20RELE?=
 =?UTF-8?q?ASE=EF=BC=8820180427-0410=EF=BC=89=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/LibaoDetailActivity.java   | 16 +++++++++++-----
 .../gamecenter/adapter/LibaoDetailAdapter.java   |  6 +++++-
 .../gh/gamecenter/ask/QuestionsEditFragment.java |  2 ++
 .../ask/QuestionsEditIndexFragment.java          |  2 +-
 .../ask/questionsdetail/AnswerEditFragment.java  | 12 ++++++++----
 .../gamecenter/manager/RefreshTokenManager.java  |  3 +++
 .../game/GameNewsSearchResultFragment.java       |  1 +
 .../layout/fragment_game_news_search_result.xml  |  2 ++
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
index 133c772855..f69a386882 100644
--- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
@@ -370,10 +370,15 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
 
                     @Override
                     public void onFailure(HttpException e) {
-                        mLibaoDetailRv.setVisibility(View.GONE);
-                        mLlLoading.setVisibility(View.GONE);
-                        mLibaoDetailRv.setPadding(0, 0, 0, 0);
-                        mNoConnection.setVisibility(View.VISIBLE);
+                        if (e != null && e.code() == 404) {
+                            mLibaoDetailRv.setVisibility(View.GONE);
+                            mLlLoading.setVisibility(View.GONE);
+                            mLibaoDetailRv.setPadding(0, 0, 0, 0);
+                            mNoneDataTv.setText("天了噜~页面不见了");
+                            mNoneData.setVisibility(View.VISIBLE);
+                        } else {
+                            loadError();
+                        }
                     }
                 });
     }
@@ -451,8 +456,9 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
         mLibaoDetailRv.setVisibility(View.GONE);
         mLlLoading.setVisibility(View.GONE);
         mLibaoDetailRv.setPadding(0, 0, 0, 0);
-        mNoneDataTv.setText("天了噜~页面不见了");
+        mNoneDataTv.setText("页面不见了~");
         mNoneData.setVisibility(View.VISIBLE);
+        toast("内容可能已被删除");
     }
 
     // 领取/淘号失败，根据返回的时间重新倒数
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
index bd5b7fe828..feb924b154 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
@@ -88,7 +88,11 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
 
                     @Override
                     public void onFailure(HttpException e) {
-                        mOnRequestCallBackListener.loadEmpty();
+                        if (e != null && e.code() == 404) {
+                            mOnRequestCallBackListener.loadEmpty();
+                        } else {
+                            mOnRequestCallBackListener.loadError();
+                        }
                     }
                 });
     }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
index 318632d128..c73040c7db 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java
@@ -170,6 +170,8 @@ public class QuestionsEditFragment extends NormalFragment {
                 toast("标题至少6个字");
                 return;
             }
+            addQuestionsIndexFragment(null);
+            showSearchIndexLayout(false);
             CheckLoginUtils.checkLogin(getContext(), this::addTagByTitle);
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java
index 1db51c100e..3f7370dd40 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java
@@ -97,7 +97,7 @@ public class QuestionsEditIndexFragment extends ListFragment<QuestionsIndexEntit
     public void onLoadDone() {
         super.onLoadDone();
         Fragment parentFragment = getParentFragment();
-        if (parentFragment instanceof QuestionsEditFragment) {
+        if (parentFragment instanceof QuestionsEditFragment && !TextUtils.isEmpty(mSearchKey)) {
             ((QuestionsEditFragment) parentFragment).showSearchIndexLayout(true);
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java
index b50f556dc0..69a9606b47 100644
--- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerEditFragment.java
@@ -90,7 +90,7 @@ public class AnswerEditFragment extends NormalFragment {
     private String mQuestionsTitle;
     private boolean mOpenAnswerInNewPage;
 
-//    private String mCacheAnswerContent;
+    private String mCacheAnswerContent;
 
     private int mPostDraftsCount;
 
@@ -182,6 +182,7 @@ public class AnswerEditFragment extends NormalFragment {
         });
         if (!TextUtils.isEmpty(mAnswerId)) {
             setNavigationTitle(getString(R.string.answer_patch_title));
+            mCacheAnswerContent = mAnswerContent;
             mEditContent.setHtml(mAnswerContent, false);
         } else {
             setNavigationTitle(getString(R.string.answer_edit_title));
@@ -375,10 +376,13 @@ public class AnswerEditFragment extends NormalFragment {
 
     @Override
     public boolean onBackPressed() {
+        Utils.log("========::" + mCacheAnswerContent + "===" + mEditContent.getHtml());
+
         if (!TextUtils.isEmpty(mAnswerId)) {
             showPatchBackDialog();
             return true;
-        } else if (TextUtils.isEmpty(mEditContent.getHtml())) {
+        } else if (TextUtils.isEmpty(mEditContent.getHtml()) ||
+                !TextUtils.isEmpty(mCacheAnswerContent) && mCacheAnswerContent.equals(mEditContent.getHtml())) {
             return false;
         } else {
             showEditBackDialog();
@@ -448,7 +452,7 @@ public class AnswerEditFragment extends NormalFragment {
                             } else {
                                 mPostDraftsCount++;
                             }
-//                            mCacheAnswerContent = finalEditContent;
+                            mCacheAnswerContent = finalEditContent;
                         }
                     }
 
@@ -475,7 +479,7 @@ public class AnswerEditFragment extends NormalFragment {
                             String drafts = object.getString("content");
                             if (!TextUtils.isEmpty(drafts)) {
                                 mEditContent.setHtml(drafts, false);
-//                                mCacheAnswerContent = drafts;
+                                mCacheAnswerContent = drafts;
                             }
 
                             String answerId = object.getString("answer_id");
diff --git a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java
index a03dc4809e..02fba9d26f 100644
--- a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java
+++ b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java
@@ -2,6 +2,7 @@ package com.gh.gamecenter.manager;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 
 import com.gh.common.constant.Constants;
 import com.gh.common.util.DeviceUtils;
@@ -164,6 +165,7 @@ public class RefreshTokenManager {
         SINGLE_EXECUTOR.execute(new Runnable() {
             @Override
             public void run() {
+                if (TextUtils.isEmpty(tokenEntity.getId())) return;
                 if (mDatabase.loginTokenDao().updateToken(tokenEntity) <= 0) {
                     mDatabase.loginTokenDao().addToken(tokenEntity);
                 }
@@ -178,6 +180,7 @@ public class RefreshTokenManager {
         SINGLE_EXECUTOR.execute(new Runnable() {
             @Override
             public void run() {
+                if (TextUtils.isEmpty(userInfo.getId())) return;
                 if (mDatabase.userInfoDao().updateUserInfo(userInfo) <= 0) {
                     mDatabase.userInfoDao().addUserInfo(userInfo);
                 }
diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java
index ec3c1171e9..5f18272c37 100644
--- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java
+++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java
@@ -102,6 +102,7 @@ public class GameNewsSearchResultFragment extends NormalFragment {
         mNewsSearchRv.addItemDecoration(new VerticalItemDecoration(getContext(), 1, false));
 
         mNewsSearchEt.setText(mSearchKey);
+        mNewsSearchEt.setSelection(mSearchKey.length());
 
         loadNewsData(mPage);
 
diff --git a/app/src/main/res/layout/fragment_game_news_search_result.xml b/app/src/main/res/layout/fragment_game_news_search_result.xml
index db930f7d77..a98b674d6c 100644
--- a/app/src/main/res/layout/fragment_game_news_search_result.xml
+++ b/app/src/main/res/layout/fragment_game_news_search_result.xml
@@ -17,6 +17,7 @@
             android:id = "@+id/et_search"
             android:layout_width = "match_parent"
             android:layout_height = "match_parent"
+            android:layout_marginRight = "48dp"
             android:background = "@null"
             android:hint = "@string/game_detail_search_input"
             android:imeOptions = "actionSearch"
@@ -24,6 +25,7 @@
             android:paddingRight = "32dp"
             android:singleLine = "true"
             android:textColorHint = "@color/text_b2b2b2"
+            android:textCursorDrawable = "@drawable/cursor_color"
             android:textSize = "16sp" />
 
         <TextView