优化操作

app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateFragment.java

@@ -129,14 +129,19 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView<C
                     dialog.dismiss();
                     Intent modifyIntent = new Intent(getActivity(), AddCouponActivity.class);
                     modifyIntent.putExtra(AddCouponActivity.KEY_MODIFY_COUPON, couponBean);
-                    RxActivityResult.on(getActivity()).startIntent(modifyIntent)
+                    RxActivityResult.on(getActivity())
+                            .startIntent(modifyIntent)
                             .filter(result -> result.resultCode() == RESULT_OK)
-                            .subscribe(result -> {
+                            .doOnNext(result -> {
                                 // 修改商品成功之后刷新item
                                 CouponBean modifiedBean = (CouponBean) result.data().getSerializableExtra(AddCouponActivity.KEY_MODIFY_COUPON);
+                                if (modifiedBean == null) {
+                                    return;
+                                }
                                 couponBean.updateData(modifiedBean);
                                 mAdapter.notifyItemChanged(position);
-                            });
+                            })
+                            .subscribe();
                 })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();

app/src/main/java/com/itant/shibei/ui/home/goods/GoodsFragment.java

@@ -129,12 +129,16 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
                     modifyIntent.putExtra(AddGoodsActivity.KEY_MODIFY_GOODS, goodsBean);
                     RxActivityResult.on(getActivity()).startIntent(modifyIntent)
                             .filter(result -> result.resultCode() == RESULT_OK)
-                            .subscribe(result -> {
+                            .doOnNext(result -> {
                                 // 修改商品成功之后刷新item
                                 GoodsBean modifiedBean = (GoodsBean) result.data().getSerializableExtra(AddGoodsActivity.KEY_MODIFY_GOODS);
+                                if (modifiedBean == null) {
+                                    return;
+                                }
                                 goodsBean.updateData(modifiedBean);
                                 mAdapter.notifyItemChanged(position);
-                            });
+                            })
+                            .subscribe();
                 })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();

app/src/main/java/com/itant/shibei/ui/home/search/SearchActivity.java

@@ -148,12 +148,16 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
                     modifyIntent.putExtra(AddGoodsActivity.KEY_MODIFY_GOODS, goodsBean);
                     RxActivityResult.on(this).startIntent(modifyIntent)
                             .filter(result -> result.resultCode() == RESULT_OK)
-                            .subscribe(result -> {
+                            .doOnNext(result -> {
                                 // 修改商品成功之后刷新item
                                 GoodsBean modifiedBean = (GoodsBean) result.data().getSerializableExtra(AddGoodsActivity.KEY_MODIFY_GOODS);
+                                if (modifiedBean == null) {
+                                    return;
+                                }
                                 goodsBean.updateData(modifiedBean);
                                 mAdapter.notifyItemChanged(position);
-                            });
+                            })
+                            .subscribe();
                 })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();

app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java

@@ -64,12 +64,13 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 Intent registerIntent = new Intent(this, RegisterActivity.class);
                 RxActivityResult.on(this).startIntent(registerIntent)
                         .filter(result -> result.resultCode() == RESULT_OK)
-                        .subscribe(result -> {
+                        .doOnNext(result -> {
                             // 注册成功之后关闭登录界面
                             ToastTool.showShort("注册成功");
                             //startActivity(new Intent(LoginActivity.this, MineActivity.class));
                             finish();
-                        });
+                        })
+                        .subscribe();
                 break;
             default:
                 break;
@@ -85,11 +86,12 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
                 Intent forgetIntent = new Intent(this, ForgetActivity.class);
                 RxActivityResult.on(this).startIntent(forgetIntent)
                         .filter(result -> result.resultCode() == RESULT_OK)
-                        .subscribe(result -> {
+                        .doOnNext(result -> {
                             // 找回密码成功之后关闭登录界面
                             //startActivity(new Intent(LoginActivity.this, MineActivity.class));
                             finish();
-                        });
+                        })
+                        .subscribe();
                 break;
 
             case R.id.btn_login:

app/src/main/java/com/itant/shibei/ui/mine/register/RegisterActivity.java

@@ -112,11 +112,12 @@ public class RegisterActivity extends BaseBeiActivity implements View.OnClickLis
                 fillDataIntent.putExtra(KEY_CODE, code);
                 RxActivityResult.on(this).startIntent(fillDataIntent)
                         .filter(result -> result.resultCode() == RESULT_OK)
-                        .subscribe(result -> {
+                        .doOnNext(result -> {
                             // 注册成功之后关闭登录界面
                             setResult(RESULT_OK);
                             finish();
-                        });
+                        })
+                        .subscribe();
                 break;
 
             case R.id.btn_get_code: