diff --git a/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java b/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java index 6a5fb723b6..d385817fae 100644 --- a/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java +++ b/app/src/main/java/com/gh/common/util/GetLoginDataUtils.java @@ -173,7 +173,9 @@ public class GetLoginDataUtils { } public void WCLofinCallBack(JSONObject content) { - mLoginListener.OnLoginData(content, LoginTag.wechat); + if (mLoginListener != null) { + mLoginListener.OnLoginData(content, LoginTag.wechat); + } } public void onWeiboCallback(int requestCode, int resultCode, Intent data) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java index 88225438f3..99030024b9 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java @@ -20,6 +20,7 @@ import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AskTagGroupsEntity; import com.gh.gamecenter.ask.viewmodel.AskQuestionsNewViewModel; +import com.halo.assistant.HaloApp; import com.lightgame.view.NoScrollableViewPager; import java.util.List; @@ -48,8 +49,6 @@ public class AskQuestionsNewFragment extends BaseFragment { @BindView(R.id.list_loading) View mLoading; - public static final String ASK_QUESTIONS_TYPE = "ask_questions_type"; - private AskQuestionsNewViewModel mModel; private List mTagGroupsList; @@ -71,14 +70,14 @@ public class AskQuestionsNewFragment extends BaseFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - final AskQuestionsNewViewModel.Factory factory = new AskQuestionsNewViewModel.Factory(getActivity().getApplication()); + final AskQuestionsNewViewModel.Factory factory = new AskQuestionsNewViewModel.Factory(HaloApp.getInstance().getApplication()); mModel = ViewModelProviders.of(this, factory) .get(AskQuestionsNewViewModel.class); subscribeUi(mModel); } private void subscribeUi(AskQuestionsNewViewModel viewModel) { - viewModel.getTagGroupsObserable().observe(this, new Observer>() { + viewModel.getTagGroupsObservable().observe(this, new Observer>() { @Override public void onChanged(@Nullable List tagGroups) { mTagGroupsList = tagGroups; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java index c8ec999e63..d924d07cf0 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java @@ -68,7 +68,7 @@ public class AskTabOrderFragment extends NormalFragment { mViewModel = ViewModelProviders.of(this, factory) .get(AskQuestionsNewViewModel.class); - mViewModel.getTagGroupsObserable().observe(this, new Observer>() { + mViewModel.getTagGroupsObservable().observe(this, new Observer>() { @Override public void onChanged(@Nullable List askTagGroups) { if (askTagGroups != null) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewViewModel.java b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewViewModel.java index d557a98961..646d90c1b0 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewViewModel.java @@ -32,7 +32,7 @@ public class AskQuestionsNewViewModel extends AndroidViewModel { mRepository.cacheAndNotifyTagGroups(tagGroups); } - public LiveData> getTagGroupsObserable() { + public LiveData> getTagGroupsObservable() { return mObserableTagGroupsList; }