diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e7917ebf7e..5a60a5f778 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -89,8 +89,7 @@ android:screenOrientation = "portrait" /> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_SEARCHKEY, mSearchKey); - NormalActivity.startFragment(this, QuestionsEditFragment.class, bundle); + startActivity(QuestionEditActivity.getIntent(this, mSearchKey)); }); } } diff --git a/app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java b/app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java new file mode 100644 index 0000000000..ddf6f9fdcd --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java @@ -0,0 +1,17 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; + +import com.gh.gamecenter.ask.AskTabOrderFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class AskTabOrderActivity extends NormalActivity { + + public static Intent getIntent(Context context) { + return getTargetIntent(context, AskTabOrderActivity.class, AskTabOrderFragment.class); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index 92519d513d..5f974b44a9 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -21,7 +21,7 @@ public class CollectionActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(CollectionActivity.class) // .setFragment(CollectionWrapperFragment.class).setArgs(args).build(); - return getIntent(context, CollectionWrapperFragment.class, args); + return getTargetIntent(context, CollectionActivity.class, CollectionWrapperFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 54ad5642aa..b535b86092 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -20,7 +20,7 @@ public class CommentDetailActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(CommentDetailActivity.class) // .setFragment(CommentDetailFragment.class).setArgs(args).build(); - return getIntent(context, CommentDetailFragment.class, args); + return getTargetIntent(context, CommentDetailActivity.class, CommentDetailFragment.class, args); } public static Intent getAnswerCommentIntent(Context context, String commentId, String answerId) { @@ -30,7 +30,7 @@ public class CommentDetailActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(CommentDetailActivity.class) // .setFragment(CommentDetailFragment.class).setArgs(args).build(); - return getIntent(context, AnswerCommentConversationFragment.class, args); + return getTargetIntent(context, CommentDetailActivity.class, AnswerCommentConversationFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/CommunitiesSelectActivity.java b/app/src/main/java/com/gh/gamecenter/CommunitiesSelectActivity.java new file mode 100644 index 0000000000..50109c3fa8 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/CommunitiesSelectActivity.java @@ -0,0 +1,17 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; + +import com.gh.gamecenter.ask.SelectGameFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class CommunitiesSelectActivity extends NormalActivity { + + public static Intent getIntent(Context context) { + return getTargetIntent(context, CommunitiesSelectActivity.class, SelectGameFragment.class); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/CommunitySubjectActivity.java b/app/src/main/java/com/gh/gamecenter/CommunitySubjectActivity.java new file mode 100644 index 0000000000..9d81204954 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/CommunitySubjectActivity.java @@ -0,0 +1,21 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.gamecenter.ask.entity.AskSubjectEntity; +import com.gh.gamecenter.ask.subject.AskSubjectFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class CommunitySubjectActivity extends NormalActivity { + + public static Intent getIntent(Context context, AskSubjectEntity entity) { + Bundle bundle = new Bundle(); + bundle.putParcelable(AskSubjectEntity.TAG, entity); + return getTargetIntent(context, CommunitySubjectActivity.class, AskSubjectFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 958bb9b996..9d5e627dfb 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -21,7 +21,7 @@ public class ConcernActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(ConcernActivity.class) // .setFragment(MyConcernFragment.class).setArgs(args).build(); - return getIntent(context, MyConcernFragment.class, args); + return getTargetIntent(context, ConcernActivity.class, MyConcernFragment.class, args); } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java new file mode 100644 index 0000000000..9f9c0f0f30 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java @@ -0,0 +1,17 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; + +import com.gh.gamecenter.info.ConcernFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class ConcernInfoActivity extends NormalActivity { + + public static Intent getIntent(Context context) { + return getTargetIntent(context, ConcernInfoActivity.class, ConcernFragment.class); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 35fec08f66..3920577023 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -33,7 +33,7 @@ public class DownloadManagerActivity extends NormalActivity { Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_URL, url); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return getIntent(context, DownloadFragment.class, bundle); + return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle); } public static Intent getDownloadMangerIntent(Context context, int position, String entrance) { @@ -43,7 +43,7 @@ public class DownloadManagerActivity extends NormalActivity { Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, position); - return getIntent(context, DownloadFragment.class, bundle); + return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle); } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index be8261e658..467e72e43b 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -29,7 +29,7 @@ public class GameDetailActivity extends NormalActivity { bundle.putParcelable(GameEntity.TAG, gameEntity); // context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) // .setFragment(GameDetailFragment.class).setArgs(bundle).build()); - context.startActivity(getIntent(context, GameDetailFragment.class, bundle)); + context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle)); } /** @@ -41,7 +41,7 @@ public class GameDetailActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); // context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) // .setFragment(GameDetailFragment.class).setArgs(bundle).build()); - context.startActivity(getIntent(context, GameDetailFragment.class, bundle)); + context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle)); } } diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index d02ce405f3..25925c49c2 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -30,7 +30,7 @@ public class GameNewsActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(GameNewsActivity.class) // .setFragment(GameNewsSearchFragment.class).setArgs(args).build(); - return getIntent(context, GameNewsSearchFragment.class, args); + return getTargetIntent(context, GameNewsActivity.class, GameNewsSearchFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java new file mode 100644 index 0000000000..04ea08075f --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java @@ -0,0 +1,16 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; + +import com.gh.gamecenter.info.InfoWrapperFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class InfoActivity extends NormalActivity { + public static Intent getIntent(Context context) { + return getTargetIntent(context, InfoActivity.class, InfoWrapperFragment.class); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 4f56968583..bd9629b67c 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -4,25 +4,9 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; -import android.view.Gravity; -import android.view.View; -import android.widget.RelativeLayout; -import android.widget.TextView; -import com.gh.base.BaseActivity; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.eventbus.EBKaiFuReset; -import com.gh.gamecenter.kaifu.KaiFuFragment; import com.gh.gamecenter.kaifu.KaiFuWrapperFragment; -import com.halo.assistant.ui.IntentFactory; - -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import butterknife.BindView; /** * Created by khy on 18/08/17. @@ -37,7 +21,7 @@ public class KaiFuActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(KaiFuActivity.class) // .setFragment(KaiFuWrapperFragment.class).setArgs(args).build(); - return getIntent(context, KaiFuWrapperFragment.class, args); + return getTargetIntent(context, KaiFuActivity.class, KaiFuWrapperFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 7bace7f314..1c1ad6793f 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -21,7 +21,7 @@ public class LibaoActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(LibaoActivity.class) // .setFragment(LibaoWrapperFragment.class).setArgs(args).build(); - return getIntent(context, LibaoFragment.class, args); + return getTargetIntent(context, LibaoActivity.class, LibaoFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index d2f18d78fc..9a4581c565 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -19,7 +19,7 @@ public class MessageActivity extends NormalActivity { // .setFragment(MessageCenterFragment.class).build(); Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return getIntent(context, MessageFragment.class, bundle); + return getTargetIntent(context, MessageActivity.class, MessageFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 9e0f823ccf..1da8efd44e 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -24,7 +24,7 @@ public class MessageDetailActivity extends NormalActivity { intent.putExtra("openSoftInput", true); intent.putExtra(CommentEntity.TAG, entity); - return getIntent(context, MessageDetailFragment.class, intent.getExtras()); + return getTargetIntent(context, MessageDetailActivity.class, MessageDetailFragment.class, intent.getExtras()); } public static Intent getIntentByEntity(Context context, ConcernEntity concernEntity, String entrance) { @@ -33,7 +33,7 @@ public class MessageDetailActivity extends NormalActivity { HaloApp.put(ConcernEntity.TAG, concernEntity); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); // return intent; - return getIntent(context, MessageDetailFragment.class, intent.getExtras()); + return getTargetIntent(context, MessageDetailActivity.class, MessageDetailFragment.class, intent.getExtras()); } public static Intent getIntentById(Context context, String newsId, Integer commentNum, Boolean openSoftInput, String entrance) { @@ -43,7 +43,7 @@ public class MessageDetailActivity extends NormalActivity { intent.putExtra("commentNum", commentNum); intent.putExtra("openSoftInput", openSoftInput); // return intent; - return getIntent(context, MessageDetailFragment.class, intent.getExtras()); + return getTargetIntent(context, MessageDetailActivity.class, MessageDetailFragment.class, intent.getExtras()); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java new file mode 100644 index 0000000000..31eade016e --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java @@ -0,0 +1,21 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.message.MessageNormalFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class MessageInviteActivity extends NormalActivity { + + public static Intent getIntent(Context context, String messageType) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_MESSAGE_TYPE, messageType); + return getTargetIntent(context, MessageInviteActivity.class, MessageNormalFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java new file mode 100644 index 0000000000..2d255b10a4 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java @@ -0,0 +1,17 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; + +import com.gh.gamecenter.message.KeFuFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class MessageKeFuActivity extends NormalActivity { + + public static Intent getIntent(Context context) { + return getTargetIntent(context, MessageKeFuActivity.class, KeFuFragment.class); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java new file mode 100644 index 0000000000..e8d95243c2 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java @@ -0,0 +1,21 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.message.MessageNormalFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class MessageVoteActivity extends NormalActivity { + + public static Intent getIntent(Context context, String messageType) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_MESSAGE_TYPE, messageType); + return getTargetIntent(context, MessageVoteActivity.class, MessageNormalFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/MyAskActivity.java b/app/src/main/java/com/gh/gamecenter/MyAskActivity.java new file mode 100644 index 0000000000..5f6ef792b9 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/MyAskActivity.java @@ -0,0 +1,21 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.ask.myask.MyAskWrapperFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class MyAskActivity extends NormalActivity { + + public static Intent getIntent(Context context) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ENTRANCE, "(我的光环)+(我的问答)"); + return getTargetIntent(context, MyAskActivity.class, MyAskWrapperFragment.class, bundle); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 4b0b9023f2..9fd4fa884f 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -25,7 +25,7 @@ public class NewsSearchActivity extends NormalActivity { // return new IntentFactory.Builder(context) // .setActivity(NewsSearchActivity.class) // .setFragment(GameNewsSearchResultFragment.class).setArgs(args).build(); - return getIntent(context, GameNewsSearchResultFragment.class, args); + return getTargetIntent(context, NewsSearchActivity.class, GameNewsSearchResultFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index 9e3843e35e..824d461e73 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -1,6 +1,5 @@ package com.gh.gamecenter; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -25,7 +24,7 @@ import butterknife.BindView; * Created by khy on 17/10/17. */ -public class NormalActivity extends BaseActivity implements ToolbarController, Toolbar.OnMenuItemClickListener { +public abstract class NormalActivity extends BaseActivity implements ToolbarController, Toolbar.OnMenuItemClickListener { @BindView(R.id.normal_toolbar) Toolbar mNormalToolbar; @@ -49,21 +48,21 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T return intent; } - @Deprecated - protected static Intent getIntent(Context context, Class t, Bundle bundle) { - Intent intent = new Intent(context, NormalActivity.class); + + protected static Intent getTargetIntent(Context context, Class cls, Class t, Bundle bundle) { + Intent intent = new Intent(context, cls); intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); return intent; } - - public static void startFragment(Context context, Class t) { - Intent intent = new Intent(context, NormalActivity.class); + protected static Intent getTargetIntent(Context context, Class cls, Class t) { + Intent intent = new Intent(context, cls); intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - context.startActivity(intent); + return intent; } + public static void startFragmentNewTask(Context context, Class t, Bundle bundle) { Intent intent = new Intent(context, NormalActivity.class); intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); @@ -79,22 +78,6 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T context.startActivity(intent); } - public static void startFragmentForResult(Context context, Class t, int requestCode) { - Intent intent = new Intent(context, NormalActivity.class); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - if (context instanceof Activity) { - ((Activity) context).startActivityForResult(intent, requestCode); - } - } - - public static void startFragmentForResult(Context context, Class t, Bundle bundle, int requestCode) { - Intent intent = new Intent(context, NormalActivity.class); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); - if (context instanceof Activity) { - ((Activity) context).startActivityForResult(intent, requestCode); - } - } @Override diff --git a/app/src/main/java/com/gh/gamecenter/QuestionEditActivity.java b/app/src/main/java/com/gh/gamecenter/QuestionEditActivity.java new file mode 100644 index 0000000000..8f83f6a848 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/QuestionEditActivity.java @@ -0,0 +1,32 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.ask.QuestionsEditFragment; +import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; + +/** + * Created by khy on 10/04/18. + */ + +public class QuestionEditActivity extends NormalActivity { + + public static Intent getIntent(Context context, String searchKey) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_SEARCHKEY, searchKey); + return getTargetIntent(context, QuestionEditActivity.class, QuestionsEditFragment.class, bundle); + } + + public static Intent getIntent(Context context) { + return getTargetIntent(context, QuestionEditActivity.class, QuestionsEditFragment.class); + } + + public static Intent getIntent(Context context, QuestionsDetailEntity entity) { + Bundle bundle = new Bundle(); + bundle.putParcelable(QuestionsDetailEntity.TAG, entity); + return getTargetIntent(context, QuestionEditActivity.class, QuestionsEditFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java new file mode 100644 index 0000000000..8062c2ec9e --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java @@ -0,0 +1,24 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class QuestionsDetailActivity extends NormalActivity { + + public static final String TAG = "QuestionsDetailActivity"; + + public static Intent getIntent(Context context, String questionId, String entrance) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questionId); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + return getTargetIntent(context, QuestionsDetailActivity.class, QuestionsDetailFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/QuestionsInviteActivity.java b/app/src/main/java/com/gh/gamecenter/QuestionsInviteActivity.java new file mode 100644 index 0000000000..5733ff069a --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/QuestionsInviteActivity.java @@ -0,0 +1,21 @@ +package com.gh.gamecenter; + +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; +import com.gh.gamecenter.ask.questionsdetail.invite.QuestionsInviteWrapperFragment; + +/** + * Created by khy on 10/04/18. + */ + +public class QuestionsInviteActivity extends NormalActivity { + + public static Intent getIntent(Context context, QuestionsDetailEntity entity) { + Bundle bundle = new Bundle(); + bundle.putParcelable(QuestionsDetailEntity.TAG, entity); + return getTargetIntent(context, QuestionsInviteActivity.class, QuestionsInviteWrapperFragment.class, bundle); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 5536ca7015..5ecf614a2c 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -29,7 +29,7 @@ public class SettingActivity extends NormalActivity { Bundle args = new Bundle(); args.putString(EntranceUtils.KEY_ENTRANCE, entrance); args.putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate); - return getIntent(context, SettingsFragment.class, args); + return getTargetIntent(context, SettingActivity.class, SettingsFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 24de951450..3c781cbf28 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -8,8 +8,6 @@ import android.text.TextUtils; import com.gh.base.BaseActivity; import com.gh.common.util.EntranceUtils; import com.gh.common.util.PlatformUtils; -import com.gh.gamecenter.ask.AnswerDetailFragment; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; @@ -99,12 +97,12 @@ public class SkipActivity extends BaseActivity { bundle.putString(KEY_PACKAGENAME, uri.getQueryParameter(KEY_PACKAGENAME)); break; case HOST_ANSWER: - bundle.putString(KEY_TO, AnswerDetailFragment.TAG); + bundle.putString(KEY_TO, AnswerDetailActivity.TAG); bundle.putString(KEY_ANSWER_ID, id); bundle.putString(KEY_PACKAGENAME, uri.getQueryParameter(KEY_PACKAGENAME)); break; case HOST_QUESTION: - bundle.putString(KEY_TO, QuestionsDetailFragment.TAG); + bundle.putString(KEY_TO, QuestionsDetailActivity.TAG); bundle.putString(KEY_QUESTIONS_ID, id); break; diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index 9b444353a2..740e339db3 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -33,7 +33,7 @@ public class SubjectActivity extends NormalActivity { // .setArgs(args) // .setActivity(SubjectActivity.class) // .setFragment(SubjectWrapperFragment.class).start(); - context.startActivity(getIntent(context, SubjectWrapperFragment.class, args)); + context.startActivity(getTargetIntent(context, SubjectActivity.class, SubjectWrapperFragment.class, args)); } } diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java index e9bb1d2a00..401903ca18 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -22,7 +22,7 @@ public class UserInfoEditActivity extends NormalActivity { // .setArgs(args) // .setActivity(UserInfoEditActivity.class) // .setFragment(UserInfoEditFragment.class).build(); - return getIntent(context, UserInfoEditFragment.class, args); + return getTargetIntent(context, UserInfoEditActivity.class, UserInfoEditFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 8e4d5eb77c..f79f864769 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -24,7 +24,7 @@ public class VoteActivity extends NormalActivity { // .setArgs(intent.getExtras()) // .setActivity(VoteActivity.class) // .setFragment(VoteFragment.class).build(); - return getIntent(context, VoteFragment.class, args); + return getTargetIntent(context, VoteActivity.class, VoteFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 2e6d8b9e35..889bd244e9 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -35,7 +35,7 @@ public class WebActivity extends NormalActivity { Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title)); bundle.putString(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url)); - return getIntent(context, WebFragment.class, bundle); + return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle); } @NonNull @@ -56,7 +56,7 @@ public class WebActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_GAMENAME, toolBoxEntity.getName()); bundle.putParcelable(ToolBoxEntity.TAG, toolBoxEntity); bundle.putBoolean(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools); - return getIntent(context, WebFragment.class, bundle); + return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle); } @NonNull @@ -75,7 +75,7 @@ public class WebActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()); bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return getIntent(context, WebFragment.class, bundle); + return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle); } @NonNull @@ -94,7 +94,7 @@ public class WebActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName()); bundle.putString(EntranceUtils.KEY_NEWSID, newsEntity.getId()); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return getIntent(context, WebFragment.class, bundle); + return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle); } @NonNull @@ -107,7 +107,7 @@ public class WebActivity extends NormalActivity { // .setFragment(WebFragment.class).build(); Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_URL, url); - return getIntent(context, WebFragment.class, bundle); + return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java index 7c2ec1fad5..eb1fca3d53 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java @@ -35,14 +35,15 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.ShareUtils; import com.gh.common.view.RichEditor; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.AnswerDetailActivity; +import com.gh.gamecenter.AnswerEditActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.ViewImageActivity; import com.gh.gamecenter.ask.entity.AnswerDetailEntity; import com.gh.gamecenter.ask.entity.MeEntity; -import com.gh.gamecenter.ask.questionsdetail.AnswerEditFragment; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; +import com.gh.gamecenter.ask.entity.Questions; import com.gh.gamecenter.ask.viewmodel.AnswerDetailViewModel; import com.gh.gamecenter.databinding.FragmentAnswerDetailBinding; import com.gh.gamecenter.entity.UserEntity; @@ -373,10 +374,7 @@ public class AnswerDetailFragment extends NormalFragment { case R.id.answer_detail_title_answer_count_tv: case R.id.answer_detail_title: if (mDetailEntity != null) { - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, mDetailEntity.getQuestion().getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, mEntrance); - NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); + startActivity(QuestionsDetailActivity.getIntent(getContext(), mDetailEntity.getQuestion().getId(), mEntrance)); } break; case R.id.answer_detail_do_comment_container: @@ -393,16 +391,12 @@ public class AnswerDetailFragment extends NormalFragment { toast("当前已是你的回答"); break; case ANSWERED_NOT_MY_ANSWER: - Bundle answerDetailBundle = new Bundle(); - answerDetailBundle.putString(EntranceUtils.KEY_ANSWER_ID, mDetailEntity.getMe().getMyAnswerId()); - NormalActivity.startFragmentForResult(getContext(), AnswerDetailFragment.class, answerDetailBundle, ANSWER_PATCH_REQUEST); + startActivityForResult(AnswerDetailActivity.getIntent(getContext(), mDetailEntity.getMe().getMyAnswerId(), mEntrance), ANSWER_PATCH_REQUEST); break; case NOT_ANSWERED_YET: CheckLoginUtils.checkLogin(getContext(), () -> { - Bundle answerEditBundle = new Bundle(); - answerEditBundle.putString(EntranceUtils.KEY_QUESTIONS_ID, mDetailEntity.getQuestion().getId()); - answerEditBundle.putString(EntranceUtils.KEY_QUESTIONS_TITLE, mDetailEntity.getQuestion().getTitle()); - NormalActivity.startFragmentForResult(getActivity(), AnswerEditFragment.class, answerEditBundle, ANSWER_PATCH_REQUEST); + Questions question = mDetailEntity.getQuestion(); + startActivityForResult(AnswerEditActivity.getIntent(getContext(), question.getId(), question.getTitle()), ANSWER_PATCH_REQUEST); }); break; } @@ -422,11 +416,8 @@ public class AnswerDetailFragment extends NormalFragment { private void editContent() { if (mDetailEntity != null) { - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, mAnswerId); - bundle.putString(EntranceUtils.KEY_QUESTIONS_TITLE, mDetailEntity.getQuestion().getTitle()); - bundle.putString(EntranceUtils.KEY_ANSWER_CONTENT, mDetailEntity.getContent()); - NormalActivity.startFragmentForResult(getContext(), AnswerEditFragment.class, bundle, ANSWER_PATCH_REQUEST); + startActivityForResult(AnswerEditActivity.getIntent(getContext(), mAnswerId + , mDetailEntity.getQuestion().getTitle(), mDetailEntity.getContent()), ANSWER_PATCH_REQUEST); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java index c90427597d..1fd35acab4 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java @@ -16,7 +16,7 @@ import com.gh.base.adapter.FragmentAdapter; import com.gh.base.fragment.BaseFragment; import com.gh.common.constant.Config; import com.gh.gamecenter.AskSearchActivity; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.CommunitiesSelectActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.eventbus.EBReuse; @@ -94,7 +94,7 @@ public class AskFragment extends BaseFragment { public void onViewClicked(View view) { switch (view.getId()) { case R.id.ask_selectgame: - NormalActivity.startFragmentForResult(getContext(), SelectGameFragment.class, COMMUNITIES_SELECT_REQUEST); + startActivityForResult(CommunitiesSelectActivity.getIntent(getContext()), COMMUNITIES_SELECT_REQUEST); break; case R.id.ask_search: startActivity(AskSearchActivity.getIntent(getContext())); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java index e70840a307..9f95d78640 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java @@ -8,11 +8,10 @@ import android.view.View; import com.gh.common.util.AskLogUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.QuestionEditActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.Questions; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; @@ -54,7 +53,7 @@ public class AskQuestionsNewBodyFragment extends ListFragment { - NormalActivity.startFragment(getContext(), QuestionsEditFragment.class); + startActivity(QuestionEditActivity.getIntent(getContext())); }; } @@ -96,10 +95,7 @@ public class AskQuestionsNewBodyFragment extends ListFragment { - NormalActivity.startFragment(getContext(), AskTabOrderFragment.class); + startActivity(AskTabOrderActivity.getIntent(getContext())); }); } tab.setCustomView(tabView); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java index 341ef4b28c..4b7bfe940e 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java @@ -9,13 +9,13 @@ import android.view.View; import com.gh.common.util.AskLogUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.AnswerDetailActivity; +import com.gh.gamecenter.QuestionEditActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.entity.AskSubjectEntity; import com.gh.gamecenter.ask.entity.Questions; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadStatus; import com.gh.gamecenter.baselist.LoadType; @@ -60,7 +60,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment { - NormalActivity.startFragment(getContext(), QuestionsEditFragment.class); + startActivity(QuestionEditActivity.getIntent(getContext())); }; mListViewModel.getRefreshCount().observe(this, integer -> { @@ -151,19 +151,12 @@ public class AskQuestionsRecommendsFragment extends ListFragment { - Bundle bundle = new Bundle(); - bundle.putParcelable(AskSubjectEntity.TAG, entity); - NormalActivity.startFragment(mContext, AskSubjectFragment.class, bundle); + mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity)); }); return binding.getRoot(); } 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 1c11e17775..40c6b99cec 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java @@ -41,10 +41,9 @@ import com.gh.common.util.GsonUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.NetworkUtils; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; @@ -384,10 +383,7 @@ public class QuestionsEditFragment extends NormalFragment { getActivity().setResult(Activity.RESULT_OK, data); } else { JSONObject object = new JSONObject(response.string()); - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, object.getString("_id")); - bundle.putString(EntranceUtils.KEY_ENTRANCE, "(回答编辑)"); - NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); + startActivity(QuestionsDetailActivity.getIntent(getContext(), object.getString("_id"), "(回答编辑)")); } if (mTagDialog != null) mTagDialog.dismiss(); getActivity().finish(); 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 aa04790ca6..b71ac3549f 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditIndexFragment.java @@ -10,10 +10,9 @@ import android.view.View; import com.gh.common.util.EntranceUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.QuestionsIndexEntity; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadStatus; @@ -94,10 +93,7 @@ public class QuestionsEditIndexFragment extends ListFragment { if (mQuestionsDetailEntity != null && !TextUtils.isEmpty(mQuestionsDetailEntity.getMe().getMyAnswerId())) { - Bundle answerDetailBundle = new Bundle(); - answerDetailBundle.putString(EntranceUtils.KEY_ANSWER_ID, mQuestionsDetailEntity.getMe().getMyAnswerId()); - NormalActivity.startFragmentForResult(getContext(), AnswerDetailFragment.class, answerDetailBundle - , QUESTIONS_DETAIL_ANSWER_REQUEST); + Intent intent = AnswerDetailActivity.getIntent(getContext(), mQuestionsDetailEntity.getMe().getMyAnswerId(), + mEntrance + "+(问题详情)"); + startActivityForResult(intent, QUESTIONS_DETAIL_ANSWER_REQUEST); } else { - Bundle answerEditBundle = new Bundle(); - answerEditBundle.putString(EntranceUtils.KEY_QUESTIONS_ID, mQuestionsId); - answerEditBundle.putString(EntranceUtils.KEY_QUESTIONS_TITLE, getQuestionsTitle()); - NormalActivity.startFragmentForResult(getActivity(), AnswerEditFragment.class, answerEditBundle - , QUESTIONS_DETAIL_ANSWER_REQUEST); + startActivityForResult(AnswerEditActivity.getIntent(getContext(), mQuestionsId + , getQuestionsTitle()), QUESTIONS_DETAIL_ANSWER_REQUEST); } }); break; case R.id.questionsdetail_invite: - Bundle bundleInvite = new Bundle(); - bundleInvite.putParcelable(QuestionsDetailEntity.TAG, mQuestionsDetailEntity); - NormalActivity.startFragment(getContext(), QuestionsInviteWrapperFragment.class, bundleInvite); + startActivity(QuestionsInviteActivity.getIntent(getContext(), mQuestionsDetailEntity)); break; } @@ -312,9 +301,7 @@ public class QuestionsDetailFragment extends ListFragment { dialog.dismiss(); if ("编辑".equals(title.getText().toString())) { - Bundle bundle = new Bundle(); - bundle.putParcelable(QuestionsDetailEntity.TAG, mQuestionsDetailEntity); - NormalActivity.startFragmentForResult(getContext(), QuestionsEditFragment.class, bundle, QUESTIONS_EDIT_REQUEST); + startActivityForResult(QuestionEditActivity.getIntent(getContext(), mQuestionsDetailEntity), QUESTIONS_EDIT_REQUEST); } else { // 跳转意见反馈 SuggestionActivity.startSuggestionActivity(getContext(), 1, "report", "问题举报："); @@ -405,7 +392,7 @@ public class QuestionsDetailFragment extends ListFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java index 25eb48c245..cbde43534e 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java @@ -10,16 +10,14 @@ import android.view.View; import com.gh.common.util.AskLogUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.AnswerDetailActivity; +import com.gh.gamecenter.QuestionEditActivity; +import com.gh.gamecenter.QuestionsDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.ask.AnswerDetailFragment; -import com.gh.gamecenter.ask.QuestionsEditFragment; import com.gh.gamecenter.ask.entity.AskSearchEntity; import com.gh.gamecenter.ask.entity.Questions; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.LoadType; @@ -148,20 +146,14 @@ public class AskSearchFragment extends ListFragment { - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_SEARCHKEY, mSearchKey); - NormalActivity.startFragment(getContext(), QuestionsEditFragment.class, bundle); + startActivity(QuestionEditActivity.getIntent(getContext(), mSearchKey)); }); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java index b5c73e4f9c..032bbd9a44 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/subject/AskSubjectFragment.java @@ -6,11 +6,9 @@ import android.support.annotation.Nullable; import android.support.v7.widget.RecyclerView; import android.view.View; -import com.gh.common.util.EntranceUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.AnswerDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.ask.AnswerDetailFragment; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.entity.AskSubjectEntity; import com.gh.gamecenter.baselist.ListAdapter; @@ -85,10 +83,7 @@ public class AskSubjectFragment extends ListFragment break; } } + + public static void messageItemClickSkip(View view, MessageEntity entity, String tracers) { + if (view == null || entity == null) return; + Bundle bundle; + Context context = view.getContext(); + switch (entity.getType()) { + case "comment_vote": + if (view.getId() == R.id.message_original) { + Intent intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), tracers); + context.startActivity(intent); + } else if (view.getId() == R.id.message_item) { + Intent intent = MessageDetailActivity.getIntentById(context, + entity.getArticle().getId(), -1, false, tracers); + context.startActivity(intent); + } + break; + case "reply": + if (view.getId() == R.id.message_original) { + Intent intent = NewsDetailActivity.getIntentById(context, entity.getArticle().getId(), tracers); + context.startActivity(intent); + } else if (view.getId() == R.id.message_item) { + Intent intent = CommentDetailActivity.getIntent(context, entity.getDialogue().getFrom().getId()); + context.startActivity(intent); + } + break; + case "invited": + if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { + MessageEntity.Question question = entity.getQuestion(); + context.startActivity(QuestionsDetailActivity.getIntent(context, question.getId(), tracers)); + + Questions questions = new Questions(); + questions.setId(question.getId()); + questions.setTitle(question.getTitle()); + AskLogUtils.uploadQuestions(context, tracers, questions); + } + break; + case "answer": + case "follow_question": + if (view.getId() == R.id.message_original) { + MessageEntity.Question question = entity.getQuestion(); + context.startActivity(QuestionsDetailActivity.getIntent(context, question.getId(), tracers)); + + Questions questions = new Questions(); + questions.setId(question.getId()); + questions.setTitle(question.getTitle()); + AskLogUtils.uploadQuestions(context, tracers, questions); + } else if (view.getId() == R.id.message_item) { + context.startActivity(AnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), tracers)); + } + break; + case "answer_vote": + if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { + context.startActivity(AnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), tracers)); + } + break; + case "reply_answer_comment": + if (view.getId() == R.id.message_original) { + context.startActivity(AnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), tracers)); + } else if (view.getId() == R.id.message_item) { + Intent intent = CommentDetailActivity.getAnswerCommentIntent(context, entity.getDialogue().getFrom().getId(), entity.getAnswer().getId()); + context.startActivity(intent); + } + break; + case "answer_comment_vote": + case "answer_comment": + if (view.getId() == R.id.message_original) { + context.startActivity(AnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), tracers)); + } else if (view.getId() == R.id.message_item) { + // 打开评论管理 + context.startActivity(AnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), tracers, true)); + } + break; + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java index b7355f4f89..9ae51bdf91 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java @@ -1,21 +1,11 @@ package com.gh.gamecenter.message; import android.arch.lifecycle.ViewModelProviders; -import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.View; -import com.gh.common.util.AskLogUtils; import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.CommentDetailActivity; -import com.gh.gamecenter.MessageDetailActivity; -import com.gh.gamecenter.NewsDetailActivity; -import com.gh.gamecenter.NormalActivity; -import com.gh.gamecenter.R; -import com.gh.gamecenter.ask.AnswerDetailFragment; -import com.gh.gamecenter.ask.entity.Questions; -import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; import com.gh.gamecenter.baselist.NormalListViewModel; @@ -93,97 +83,7 @@ public class MessageNormalFragment extends ListFragment { - Bundle bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ENTRANCE, "(我的光环)+(我的问答)"); - NormalActivity.startFragment(getContext(), MyAskWrapperFragment.class, bundle); + startActivity(MyAskActivity.getIntent(getContext())); }); break; }