diff --git a/app/src/main/java/com/gh/common/util/InstallUtils.java b/app/src/main/java/com/gh/common/util/InstallUtils.java index 9f7ee2aeb7..a0da45148c 100644 --- a/app/src/main/java/com/gh/common/util/InstallUtils.java +++ b/app/src/main/java/com/gh/common/util/InstallUtils.java @@ -25,6 +25,7 @@ import java.util.Map; public class InstallUtils { private static final int MAX_TIME = 5 * 60 * 1000; + private static int INSTALL_WHAT = 20; private static Map installMap; private static Map uninstallMap; @@ -42,7 +43,7 @@ public class InstallUtils { handler = new Handler(context.getMainLooper()) { @Override public void handleMessage(Message msg) { - if (msg.what == 0x123 && packageManager != null) { + if (msg.what == INSTALL_WHAT && packageManager != null) { ArrayList list = new ArrayList<>(); List packageInfos = packageManager.getInstalledPackages(0); for (PackageInfo packageInfo : packageInfos) { @@ -82,7 +83,7 @@ public class InstallUtils { } if ((installMap != null && installMap.size() != 0) || (uninstallMap != null && uninstallMap.size() != 0)) { - sendEmptyMessageDelayed(0x123, 3000); + sendEmptyMessageDelayed(INSTALL_WHAT, 3000); } else { isRunning = false; } @@ -118,7 +119,7 @@ public class InstallUtils { return; } isRunning = true; - handler.sendEmptyMessageDelayed(0x123, 10000); + handler.sendEmptyMessageDelayed(INSTALL_WHAT, 10000); } public void removeInstall(String packageName) { diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index 895f3ccdb7..dfb06ef711 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -57,6 +57,8 @@ import java.util.Map; import butterknife.BindView; import butterknife.OnClick; +import static com.gh.gamecenter.KcSelectGameActivity.SEND_OVER_REQUEST; + /** * Created by khy on 2017/1/20. */ @@ -601,7 +603,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick closeSocket(); Intent resultIntent = new Intent(); resultIntent.putExtra("isFinish", true); - setResult(0x123, resultIntent); + setResult(SEND_OVER_REQUEST, resultIntent); finish(); } diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index 9468aba18b..d415bdce2e 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -72,6 +72,8 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte private List> sendData; // 传送成绩单数据 private List mFileSenderList; + public final static int KC_REPEAT_RESULT = 15; // 快传继续发送获取APK信息回调 + private boolean isSendOver; private boolean isDestroy; @@ -120,7 +122,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (resultCode == 0x130 && requestCode == 0x178) { + if (resultCode == KC_REPEAT_RESULT && requestCode == KC_REPEAT_RESULT) { mSenderAdapter.notifyDataSetChanged(); initUserData(); HaloApp.MAIN_EXECUTOR.execute(new Runnable() { @@ -478,7 +480,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte backHint(); break; case R.id.sender_keep_send: - startActivityForResult(KcSelectGameActivity.getIntent(this, true), 0x178); + startActivityForResult(KcSelectGameActivity.getIntent(this, true), KC_REPEAT_RESULT); break; default: break; diff --git a/app/src/main/java/com/gh/gamecenter/InstallActivity.java b/app/src/main/java/com/gh/gamecenter/InstallActivity.java index ed05b4707f..47f903a85b 100644 --- a/app/src/main/java/com/gh/gamecenter/InstallActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InstallActivity.java @@ -37,6 +37,7 @@ import butterknife.BindView; import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_btn; import static com.gh.gamecenter.R.id.reuse_nodata_skip_tv_hint; +import static com.gh.gamecenter.download.FileSendFragment.KC_REQUEST; /** * Created by khy on 15/06/17. @@ -85,7 +86,7 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap public void onActivityResult(int requestCode, int resultCode, Intent data) { // 分享成绩单 - if (requestCode == 0x170 || requestCode == 0x180) { + if (requestCode == KC_REQUEST) { DialogUtils.showKuaiChuanResult(this, new Handler(), requestCode, "shareKc.jpg"); } diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index 6376cf0dca..ab850dd37a 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -28,6 +28,8 @@ import java.util.List; import butterknife.BindView; +import static com.gh.gamecenter.FileSenderActivity.KC_REPEAT_RESULT; + /** * Created by khy on 2017/1/20. * 快传-选择游戏 @@ -49,6 +51,8 @@ public class KcSelectGameActivity extends BaseActivity { private KcSelectGameAdapter mAdapter; + public final static int SEND_OVER_REQUEST = 16; // 快传 传输完成后直接退出选择游戏(当前)页面 + private boolean mIsConn; private LinearLayoutManager layoutManager; private RelativeLayout.LayoutParams rparams; @@ -68,7 +72,7 @@ public class KcSelectGameActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 0x123) { + if (requestCode == SEND_OVER_REQUEST) { if (data != null && data.getExtras() != null && data.getExtras().getBoolean("isFinish")) { finish(); } @@ -114,11 +118,11 @@ public class KcSelectGameActivity extends BaseActivity { for (FileInfo fileInfo : selectData) { oldInfo.add(fileInfo); } - setResult(0x130); + setResult(KC_REPEAT_RESULT); finish(); } else { HaloApp.put("FileInfo", selectData); - startActivityForResult(ChooseReceiverActivity.getIntent(KcSelectGameActivity.this, false), 0x123); + startActivityForResult(ChooseReceiverActivity.getIntent(KcSelectGameActivity.this, false), SEND_OVER_REQUEST); } } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 8df8142584..0badb6893e 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -100,6 +100,7 @@ public class MainActivity extends BaseActivity { private SharedPreferences sp; private ConcernManager concernManager; + private static final int SKIP_SETTING_REQUEST= 14; private boolean isSkipped; public static boolean isNewFirstLaunch; @@ -344,7 +345,7 @@ public class MainActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 0x123) { + if (requestCode == SKIP_SETTING_REQUEST) { List installedList = getPackageManager().getInstalledPackages(0); if (installedList.isEmpty()) { toast("读取应用列表失败"); @@ -770,7 +771,7 @@ public class MainActivity extends BaseActivity { Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); Uri uri = Uri.fromParts("package", getPackageName(), null); intent.setData(uri); - startActivityForResult(intent, 0x123); + startActivityForResult(intent, SKIP_SETTING_REQUEST); } }, null); } else { diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 52adaa78d8..4bf531a999 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -28,6 +28,8 @@ import java.util.Date; import butterknife.BindView; import butterknife.OnClick; +import static com.gh.gamecenter.UserInfoActivity.USERINFO_CHANGE_REQUEST; + /** * Created by khy on 2017/2/10. */ @@ -36,6 +38,9 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o @BindView(R.id.skip_media_store) TextView mSkipMediaStore; + public final static int CROP_ICON_REQUEST = 12; + public final static int MEDIA_ICON_REQUEST = 13; + private SharedPreferences sp; @NonNull @@ -52,7 +57,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (data != null && requestCode == 0x123) { + if (data != null && requestCode == MEDIA_ICON_REQUEST) { Uri selectedImage = data.getData(); if (selectedImage == null) { return; @@ -72,8 +77,8 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o Utils.log("picturePath = " + picturePath); // 上传头像 Intent intent = CropImageActivity.getIntent(this, picturePath, "我的光环(选择头像)"); - startActivityForResult(intent, 0x124); - } else if (data != null && requestCode == 0x124) { + startActivityForResult(intent, CROP_ICON_REQUEST); + } else if (data != null && requestCode == CROP_ICON_REQUEST) { String url = data.getExtras().getString("url"); // Intent intent = new Intent(); // intent.putExtra("url", url); @@ -141,7 +146,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o } } Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - startActivityForResult(intent, 0x123); + startActivityForResult(intent, MEDIA_ICON_REQUEST); break; } } @@ -177,7 +182,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o @Override public void onChange() { - setResult(0x131); + setResult(USERINFO_CHANGE_REQUEST); finish(); } } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 15af81aca5..0de3acd8a3 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -16,6 +16,8 @@ import butterknife.OnClick; */ public class SuggestSelectActivity extends BaseActivity { + public final static int SUGGEST_TYPE_REQUEST = 11; // 只要进入反馈页面(下一个), 无论怎么回退当前页面都会退出 + @NonNull public static Intent getIntent(Context context) { Intent intent = new Intent(context, SuggestSelectActivity.class); @@ -30,7 +32,7 @@ public class SuggestSelectActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 0x121 && resultCode == 0x122) { + if (requestCode == SUGGEST_TYPE_REQUEST && resultCode == SUGGEST_TYPE_REQUEST) { finish(); } } @@ -71,7 +73,7 @@ public class SuggestSelectActivity extends BaseActivity { Intent intent = new Intent(this, SuggestionActivity.class); intent.putExtra("suggestType", type); - startActivityForResult(intent, 0x121); + startActivityForResult(intent, SUGGEST_TYPE_REQUEST); } } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 6baa9e47b5..65e7c6b239 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -78,6 +78,8 @@ import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.SuggestSelectActivity.SUGGEST_TYPE_REQUEST; + /** * Created by khy on 2017/3/31. */ @@ -109,6 +111,8 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt @BindView(R.id.suggest_scrollview) ScrollView mScrollView; + public static final int MEDIA_STORE_REQUEST = 1; + private SuggestPicAdapter mAdapter; private Dialog selectGameDialog; @@ -136,7 +140,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (data != null && requestCode == 0x233) { + if (data != null && requestCode == MEDIA_STORE_REQUEST) { Uri selectedImage = data.getData(); if (selectedImage == null) { return; @@ -546,7 +550,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt if ("ok".equals(response.getString("status"))) { toast("感谢您的反馈!"); - setResult(0x122); + setResult(SUGGEST_TYPE_REQUEST); finish(); } else { toast("提交失败,请稍后尝试!"); diff --git a/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java b/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java index 91fa2ee56d..540be9e9de 100644 --- a/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserAreaActivity.java @@ -24,7 +24,7 @@ import butterknife.BindView; /** * Created by khy on 23/06/17. */ - +// TODO 这个页面需要整理 省份和市区拆分两个Fragment 同时整理 startActivityForResult CODE public class UserAreaActivity extends BaseActivity implements AreaAdapter.OnAreaCallBackListener, LoginUtils.onChangeUserInfoListener { diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index 0f4aac8e13..ae6d68ce65 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -43,6 +43,8 @@ public class UserInfoActivity extends BaseActivity { @BindView(R.id.userinfo_contact_rl) RelativeLayout mUserinfoContactRl; + public final static int USERINFO_CHANGE_REQUEST = 10; // 用户信息修改后更新界面 + public static Intent getIntent(Context context) { Intent intent = new Intent(context, UserInfoActivity.class); return intent; @@ -51,7 +53,7 @@ public class UserInfoActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == 0x130 && resultCode == 0x131) { + if (requestCode == USERINFO_CHANGE_REQUEST && resultCode == 0x131) { initView(); } } @@ -104,19 +106,19 @@ public class UserInfoActivity extends BaseActivity { public void onViewClicked(View view) { switch (view.getId()) { case R.id.userinfo_icon_rl: - startActivityForResult(SelectUserIconActivity.getIntent(this), 0x130); + startActivityForResult(SelectUserIconActivity.getIntent(this), USERINFO_CHANGE_REQUEST); break; case R.id.userinfo_nickname_rl: - startActivityForResult(UserInfoEditActivity.getIntent(this, "name"), 0x130); + startActivityForResult(UserInfoEditActivity.getIntent(this, "name"), USERINFO_CHANGE_REQUEST); break; case R.id.userinfo_sex_rl: - startActivityForResult(UserInfoEditActivity.getIntent(this, "gender"), 0x130); + startActivityForResult(UserInfoEditActivity.getIntent(this, "gender"), USERINFO_CHANGE_REQUEST); break; case R.id.userinfo_area_rl: - startActivityForResult(UserAreaActivity.getIntent(this), 0x130); + startActivityForResult(UserAreaActivity.getIntent(this), USERINFO_CHANGE_REQUEST); break; case R.id.userinfo_contact_rl: - startActivityForResult(UserInfoEditActivity.getIntent(this, "contact"), 0x130); + startActivityForResult(UserInfoEditActivity.getIntent(this, "contact"), USERINFO_CHANGE_REQUEST); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 7fd3cd126b..ae2f8635fa 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -66,6 +66,8 @@ public class WebActivity extends BaseActivity { @BindView(R.id.web_collection) ImageView mCollectionIv; + private final static int WEB_COMMENT_REQUEST = 9; // 刷新文章web页面评论数 + private String newsId; private int commentNum; @@ -101,7 +103,7 @@ public class WebActivity extends BaseActivity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); // 刷新评论数 - if (resultCode == 1001 && newsId != null && data != null && data.getExtras() != null) { + if (resultCode == WEB_COMMENT_REQUEST && newsId != null && data != null && data.getExtras() != null) { webComment.setText("查看评论(" + data.getExtras().getInt("commentNum") + ")"); } else if (requestCode == com.tencent.connect.common.Constants.REQUEST_QQ_SHARE || requestCode == com.tencent.connect.common.Constants.REQUEST_QZONE_SHARE) { @@ -284,7 +286,7 @@ public class WebActivity extends BaseActivity { public void onClick(View v) { if (v == webComment) { Intent intent = MessageDetailActivity.getIntentById(this, newsId, commentNum, null, mEntrance + "+(光环浏览器)"); - startActivityForResult(intent, 1001); + startActivityForResult(intent, WEB_COMMENT_REQUEST); } else if (v == mCollectionIv) { CheckLoginUtils.checkLogin(this, new CheckLoginUtils.OnLoggenInListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index 1a35f67af4..9023350606 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -57,6 +57,8 @@ import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.download.FileSendFragment.KC_REQUEST; + /** * Created by LGT on 2016/8/12. * 已安装界面-数据适配器 @@ -557,7 +559,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { fileInfos.add(fileInfo); HaloApp.put(HaloApp.KEY_FILE_INFO, fileInfos); - mActivity.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), 0x170); + mActivity.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), KC_REQUEST); } diff --git a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java index 1bd750a30f..0ca825d3e3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java @@ -23,14 +23,15 @@ public class FileSendFragment extends BaseFragment { private String[] permissions = {Manifest.permission.ACCESS_WIFI_STATE}; + public final static int KC_REQUEST = 2; // 快传传输完成成绩单 + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { // 分享成绩单 - if (requestCode == 0x170 || requestCode == 0x180) { + if (requestCode == KC_REQUEST) { DialogUtils.showKuaiChuanResult(getActivity(), new Handler(), requestCode, "shareKc.jpg"); - } } @@ -45,14 +46,14 @@ public class FileSendFragment extends BaseFragment { view.findViewById(R.id.file_send_btn).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {// TODO 需要申请权限 - startActivityForResult(KcSelectGameActivity.getIntent(getContext(), false), 0x170); + startActivityForResult(KcSelectGameActivity.getIntent(getContext(), false), KC_REQUEST); } }); view.findViewById(R.id.file_receiver_btn).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {// TODO 需要申请权限 - startActivityForResult(ReceiverWaitingActivity.getIntent(getContext()), 0x180); + startActivityForResult(ReceiverWaitingActivity.getIntent(getContext()), KC_REQUEST); } }); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 87ed957e10..e90a7135c0 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -42,6 +42,9 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O private LinearLayoutManager mLayoutManager; private Libao2FragmentAdapter adapter; + public final static int LIBAO_CONCERN_REQUEST = 7; // 刷新礼包状态 + public final static int CONCERN_CHANGE_REQUEST = 8; // 配合 isConcernChanged 观察关注的游戏是否改变(刷新整个列表) + private boolean isConcernChanged; Runnable runnable = new Runnable() { @@ -119,11 +122,11 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == 0x123 && adapter.getSkipPosition() != -1) { + if (requestCode == LIBAO_CONCERN_REQUEST && adapter.getSkipPosition() != -1) { // 更新对应位置 adapter.notifyItemChanged(adapter.getSkipPosition()); adapter.setSkipPosition(-1); - } else if (requestCode == 0x223 && isConcernChanged) { + } else if (requestCode == CONCERN_CHANGE_REQUEST && isConcernChanged) { mEmptyLayout.setVisibility(View.GONE); mRefreshLayout.setEnabled(true); mRefreshLayout.setRefreshing(true); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index ed2f069753..948157a1e1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -34,6 +34,9 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.libao.Libao2Fragment.CONCERN_CHANGE_REQUEST; +import static com.gh.gamecenter.libao.Libao2Fragment.LIBAO_CONCERN_REQUEST; + /** * Created by khy on 2016/12/12. */ @@ -245,7 +248,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { public void startLibaoDetailActivity(int position, LibaoEntity libaoEntity) { skipPosition = position; Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:关注)"); - mLibao2Fragment.startActivityForResult(intent, 0x123); + mLibao2Fragment.startActivityForResult(intent, LIBAO_CONCERN_REQUEST); } private void initSkipCommentViewHolder(NewsDetailCommentViewHolder holder) { @@ -259,7 +262,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { Intent intent = ConcernActivity.getIntent(mContext, mEntrance + "+(礼包中心:关注)"); - mLibao2Fragment.startActivityForResult(intent, 0x223); + mLibao2Fragment.startActivityForResult(intent, CONCERN_CHANGE_REQUEST); } }); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 4e48908b23..04848df1c6 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -219,7 +219,7 @@ class LibaoNewAdapter(callBackListener: OnRequestCallBackListener, fun startLibaoDetailActivity(position: Int, libaoEntity: LibaoEntity) { skipPosition = position val intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:最新)") - mFragment.startActivityForResult(intent, 0x123) + mFragment.startActivityForResult(intent, LibaoNewFragment.LIBAO_NEW_REQUEST) } fun getLibaoListSize(): Int { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index d1fd68e9de..e43aea1013 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -47,12 +47,13 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout private TextView mFooterHint; - private LinearLayoutManager mLayoutManager; - private LibaoNewAdapter mAdapter; private LinearLayoutManager mHistoryLm; private LibaoHistoryAdapter mHistoryAdapter; + private LibaoNewAdapter mAdapter; + + public final static int LIBAO_NEW_REQUEST = 5; // 刷新礼包状态 private boolean mHistoryIsEmpty; private boolean mIsDone; // 判断最新礼包列表是否加载完成,准备加载历史礼包 @@ -233,7 +234,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == 0x123 && mAdapter.getSkipPosition() != -1) { + if (requestCode == LIBAO_NEW_REQUEST && mAdapter.getSkipPosition() != -1) { // 更新对应位置 mAdapter.notifyItemChanged(mAdapter.getSkipPosition()); mAdapter.setSkipPosition(-1); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index 619f95c527..947189b128 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -231,7 +231,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, fun startLibaoDetailActivity(position: Int, libaoEntity: LibaoEntity) { skipPosition = position val intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:最新)") - mFragment.startActivityForResult(intent, 0x123) + mFragment.startActivityForResult(intent, LibaoSearchFragment.LIBAO_SEARCH_REQUEST) } fun getLibaoListSize(): Int { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index d758d6f02c..99e54665a8 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -35,6 +35,9 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay private LinearLayoutManager mLayoutManager; private LibaoSearchAdapter mAdapter; + public final static int LIBAO_SEARCH_REQUEST = 6; // 刷新礼包状态 + + Runnable runnable = new Runnable() { @Override public void run() { @@ -50,7 +53,7 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == 0x123 && mAdapter.getSkipPosition() != -1) { + if (requestCode == LIBAO_SEARCH_REQUEST && mAdapter.getSkipPosition() != -1) { // 更新对应位置 mAdapter.notifyItemChanged(mAdapter.getSkipPosition()); mAdapter.setSkipPosition(-1); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index 8f52d28055..a6dd11db39 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -80,6 +80,9 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On @BindView(R.id.news1_ll_concern_list) LinearLayout concernListLayout; + public final static int NEWS2_LIBAO_REQUEST = 3; // 刷新礼包状态 + public final static int NEWS2_ARTICLE_REQUEST = 4; // 刷新文章评论数 + private News2FragmentAdapter adapter; private LinearLayoutManager layoutManager; private List recommendGameList; // 推荐关注的游戏 @@ -387,11 +390,11 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == 0x125 && adapter.getSkipPosition() != -1) { + if (requestCode == NEWS2_ARTICLE_REQUEST && adapter.getSkipPosition() != -1) { // 更新对应位置 adapter.notifyItemChanged(adapter.getSkipPosition()); adapter.setSkipPosition(-1); - } else if (requestCode == 0x122 && resultCode == 0x122 && adapter.getSkipPosition() != -1) { + } else if (requestCode == NEWS2_LIBAO_REQUEST && resultCode == NEWS2_LIBAO_REQUEST && adapter.getSkipPosition() != -1) { UserDataLibaoEntity resultUserLibaoData = data.getParcelableExtra("UserDataLibaoEntity"); ConcernEntity skipEntity = adapter.getSkipEntity(); if (skipEntity != null) { // 插入礼包详情返回的礼包数据 diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 94e7fa8907..2285f3a797 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -67,6 +67,9 @@ import rx.functions.Action1; import rx.functions.Func1; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.news.News2Fragment.NEWS2_ARTICLE_REQUEST; +import static com.gh.gamecenter.news.News2Fragment.NEWS2_LIBAO_REQUEST; + /** * Created by khy on 2016/8/15. * 资讯-关注-数据适配器 @@ -440,7 +443,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } skipPosition = viewHolder.getAdapterPosition(); Intent intent = LibaoDetailActivity.getIntent(mContext, entity, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); - fragment.startActivityForResult(intent, 0x122); + fragment.startActivityForResult(intent, NEWS2_LIBAO_REQUEST); } }); return; @@ -501,7 +504,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { Intent intent = MessageDetailActivity.getIntentByEntity(mContext, concernEntity, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); - fragment.startActivityForResult(intent, 0x125); + fragment.startActivityForResult(intent, NEWS2_ARTICLE_REQUEST); } }); @@ -554,10 +557,10 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { intent.putExtra("gameName", concernEntity.getGameName()); intent.putExtra("newsId", concernEntity.getId()); intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); - fragment.startActivityForResult(intent, 0x125); + fragment.startActivityForResult(intent, NEWS2_ARTICLE_REQUEST); } else { Intent intent = NewsDetailActivity.getIntentById(mContext, concernEntity.getId(), StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); - fragment.startActivityForResult(intent, 0x125); + fragment.startActivityForResult(intent, NEWS2_ARTICLE_REQUEST); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java index 9bc9c37c94..83b0202b94 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java @@ -33,6 +33,8 @@ import java.util.ArrayList; import butterknife.BindView; +import static com.gh.gamecenter.download.FileSendFragment.KC_REQUEST; + /** * Created by LGT on 2016/8/12. * 我的关注-已安装界面 @@ -71,7 +73,7 @@ public class InstallFragment extends BaseFragment implements InstallFragmentAdap public void onActivityResult(int requestCode, int resultCode, Intent data) { // 分享成绩单 - if (requestCode == 0x170 || requestCode == 0x180) { + if (requestCode == KC_REQUEST) { DialogUtils.showKuaiChuanResult(getActivity(), new Handler(), requestCode, "shareKc.jpg"); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index 9c8e5c7521..982a6863a4 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -57,6 +57,8 @@ import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.download.FileSendFragment.KC_REQUEST; + /** * Created by LGT on 2016/8/12. * 已安装界面-数据适配器 @@ -554,7 +556,7 @@ class InstallFragmentAdapter extends BaseRecyclerAdapter { fileInfos.add(fileInfo); HaloApp.put(HaloApp.KEY_FILE_INFO, fileInfos); - fragment.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), 0x170); + fragment.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), KC_REQUEST); } diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index cd6c3ee7ed..870f1b83c4 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -15,6 +15,8 @@ import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.List; +import static com.gh.gamecenter.SuggestionActivity.MEDIA_STORE_REQUEST; + /** * Created by khy on 2017/3/31. */ @@ -59,7 +61,7 @@ public class SuggestPicAdapter extends BaseRecyclerAdapter { public void onClick(View v) { if (holder.getAdapterPosition() == getItemCount() - 1 && picList.size() < 5) { Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - activity.startActivityForResult(intent, 0x233); + activity.startActivityForResult(intent, MEDIA_STORE_REQUEST); } } });