Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
Jack
2020-02-03 17:55:28 +08:00
parent ac819893d4 118936845e
commit 1fdafeec4e
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/base/fragment/BaseFragment.java
View File

@ -52,7 +52,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
protected boolean isEverPause;
@NonNull
protected String mEntrance;
protected String mEntrance = "";
protected final Handler mBaseHandler = new BaseFragment.BaseHandler(this);

4
app/src/main/java/com/gh/common/util/TextHelper.kt
View File

@ -91,8 +91,8 @@ object TextHelper {
}
@JvmStatic
fun highlightTextThatIsWrappedInsideWrapperByDefault(textView: TextView, text: String) {
textView.text = getHighlightedSpannableStringThatIsWrappedInsideWrapper(textView.context, text, "###", R.color.theme, object : SimpleCallback<String> {
fun highlightTextThatIsWrappedInsideWrapperByDefault(textView: TextView, text: String?) {
textView.text = getHighlightedSpannableStringThatIsWrappedInsideWrapper(textView.context, text ?: "", "###", R.color.theme, object : SimpleCallback<String> {
override fun onCallback(arg: String) {
val application = HaloApp.getInstance().application
val cmb = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

6
app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java
View File

@ -61,6 +61,9 @@ public abstract class ListAdapter<DataType> extends BaseRecyclerAdapter {
@Override
public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
if (oldItemPosition >= mEntityList.size()) return false;
if (newItemPosition >= updateData.size()) return false;
DataType oldItem = mEntityList.get(oldItemPosition);
DataType newItem = updateData.get(newItemPosition);
return ListAdapter.this.areItemsTheSame(oldItem, newItem);
@ -68,6 +71,9 @@ public abstract class ListAdapter<DataType> extends BaseRecyclerAdapter {
@Override
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
if (oldItemPosition >= mEntityList.size()) return false;
if (newItemPosition >= updateData.size()) return false;
DataType oldItem = mEntityList.get(oldItemPosition);
DataType newItem = updateData.get(newItemPosition);
return ListAdapter.this.areContentsTheSame(oldItem, newItem);

2
app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
View File

@ -204,7 +204,7 @@ class UserHomeFragment : NormalFragment() {
val titleList = listOf("游戏评论", "问答", "视频")
viewpager.offscreenPageLimit = fragmentList.size
viewpager.adapter = FragmentAdapter(fragmentManager, fragmentList, titleList)
viewpager.adapter = FragmentAdapter(childFragmentManager, fragmentList, titleList)
viewpager.currentItem = position
viewpager.doOnPageSelected { MtaHelper.onEvent("个人主页详情", "个人主页详情", titleList[it]) }
tabLayout.setupWithViewPager(viewpager)

3
app/src/main/java/com/gh/gamecenter/qa/search/AskSearchFragment.java
View File

@ -91,7 +91,8 @@ public class AskSearchFragment extends BaseFragment_TabLayout {
if (fragment instanceof BaseAskSearchFragment) {
((BaseAskSearchFragment) fragment).search(key);
Bundle arguments = fragment.getArguments();
if (arguments != null) {
// 处于 state saved 状态的 fragment 不可 setArguments
if (arguments != null && !fragment.isStateSaved()) {
arguments.putString(EntranceUtils.KEY_SEARCHKEY, key);
fragment.setArguments(arguments);
}