From 00deba962e35243bfb03ed8bef1cc69b290c435d Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 5 Jul 2018 11:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2BUG=20=20GH?= =?UTF-8?q?=5FTEST=E6=B8=A0=E9=81=93=E5=8F=B7=E8=87=AA=E5=8A=A8=E5=BC=84?= =?UTF-8?q?=E6=88=90=E5=88=B7=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/BaseDialogWrapperFragment.java | 4 +- .../com/gh/common/util/TimestampUtils.java | 62 ++++++++++--------- .../gamecenter/qa/ask/QuestionEditActivity.kt | 11 ++-- .../detail/QuestionsDetailAdapter.java | 1 + .../detail/QuestionsDetailFragment.java | 1 - 5 files changed, 43 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java b/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java index 107a84b43e..ced453abcf 100644 --- a/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java +++ b/app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java @@ -42,7 +42,9 @@ public class BaseDialogWrapperFragment extends BaseDialogFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getChildFragmentManager().beginTransaction().replace(R.id.fragment_placeholder, mFragmentToWrap).commitNowAllowingStateLoss(); + if (mFragmentToWrap != null) { + getChildFragmentManager().beginTransaction().replace(R.id.fragment_placeholder, mFragmentToWrap).commitNowAllowingStateLoss(); + } } @Override diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java index 5cf2b31dee..b89b86ab0e 100644 --- a/app/src/main/java/com/gh/common/util/TimestampUtils.java +++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java @@ -4,6 +4,7 @@ import android.support.v4.util.ArrayMap; import android.text.TextUtils; import com.gh.common.constant.Constants; +import com.halo.assistant.HaloApp; import java.util.regex.Pattern; @@ -41,39 +42,40 @@ public class TimestampUtils { */ public static String addTimestamp(String url) { -// // TODO: 22/12/17 刷新版 -// if (TextUtils.isEmpty(url)) { -// return url; -// } -// if (url.contains("?")) { -// String u = url + "×tamp=" + System.currentTimeMillis(); -// return u; -// } else { -// String u = url + "?timestamp=" + System.currentTimeMillis(); -// return u; -// } - - if (TextUtils.isEmpty(url)) { - return url; - } - int cd = 0; - for (String key : getCdMap().keySet()) { - if (Pattern.matches(key, url)) { - cd = getCdMap().get(key); - break; + if ("GH_TEST".equals(HaloApp.getInstance().getChannel())) { + if (TextUtils.isEmpty(url)) { + return url; + } + if (url.contains("?")) { + String u = url + "×tamp=" + System.currentTimeMillis(); + return u; + } else { + String u = url + "?timestamp=" + System.currentTimeMillis(); + return u; } - } - if (cd == 0) { - return url; - } - if (url.contains("?")) { - String u = url + "×tamp=" + getTimestamp(url, cd); -// Utils.log("url = " + u); - return u; } else { - String u = url + "?timestamp=" + getTimestamp(url, cd); + if (TextUtils.isEmpty(url)) { + return url; + } + int cd = 0; + for (String key : getCdMap().keySet()) { + if (Pattern.matches(key, url)) { + cd = getCdMap().get(key); + break; + } + } + if (cd == 0) { + return url; + } + if (url.contains("?")) { + String u = url + "×tamp=" + getTimestamp(url, cd); // Utils.log("url = " + u); - return u; + return u; + } else { + String u = url + "?timestamp=" + getTimestamp(url, cd); +// Utils.log("url = " + u); + return u; + } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/ask/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/ask/QuestionEditActivity.kt index 8abf5cb0ab..6a4ef3abda 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/ask/QuestionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/ask/QuestionEditActivity.kt @@ -74,6 +74,7 @@ class QuestionEditActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + setToolbarMenu(R.menu.menu_question_post) mViewModel = ViewModelProviders.of(this).get(QuestionEditViewModel::class.java) mBinding = DataBindingUtil.bind(mContentView) @@ -83,14 +84,14 @@ class QuestionEditActivity : BaseActivity() { val detailEntity = intent.getParcelableExtra(QuestionsDetailEntity.TAG) if (detailEntity != null) { // 问题编辑 mViewModel?.questionEntity = detailEntity - mViewModel?.title = detailEntity.title mViewModel?.content = detailEntity.description mViewModel?.picList?.postValue(detailEntity.images as MutableList?) + if (mViewModel?.title.isNullOrEmpty()) mViewModel?.title = detailEntity.title } else { // 新增问题 var searchKey = intent.getStringExtra(EntranceUtils.KEY_QUESTIONS_SEARCH_KEY) if (!searchKey.isNullOrEmpty() && searchKey.length > QuestionEditViewModel.QUESTION_TITLE_MAX_LENGTH) searchKey = searchKey.substring(0, QuestionEditViewModel.QUESTION_TITLE_MAX_LENGTH) - mViewModel?.title = searchKey + if (mViewModel?.title.isNullOrEmpty()) mViewModel?.title = searchKey } } @@ -146,8 +147,10 @@ class QuestionEditActivity : BaseActivity() { }) mViewModel?.titleTags?.observe(this, Observer> { - val dialog = BaseDialogWrapperFragment.getInstance(TagsSelectFragment.getInstance(), false) - dialog.show(supportFragmentManager, null) + if (supportFragmentManager.findFragmentByTag(TagsSelectFragment::javaClass.name) == null) { + val dialog = BaseDialogWrapperFragment.getInstance(TagsSelectFragment.getInstance(), false) + dialog.show(supportFragmentManager, TagsSelectFragment::javaClass.name) + } }) mViewModel?.picList?.observe(this, Observer { it -> diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java index d448d1a4e6..5d39d75ccf 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java @@ -286,5 +286,6 @@ public class QuestionsDetailAdapter extends ListAdapter { void setDataStatus(boolean isNoneData) { mIsNoneData = isNoneData; + notifyDataSetChanged(); } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java index 1ee1b8360d..b063ba5d8b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java @@ -172,7 +172,6 @@ public class QuestionsDetailFragment extends ListFragment