优化体验

app/src/main/java/com/miekir/eden/ui/home/about/AboutFragment.java

@@ -57,7 +57,7 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
         // 判断是否已激活
-        if (ll_about == null) {
+        if (ll_about == null || !isVisibleToUser) {
             return;
         }
 

app/src/main/java/com/miekir/eden/ui/home/coupon/TemplateAdapter.java

@@ -16,12 +16,9 @@ import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.miekir.common.utils.SizeTool;
-import com.miekir.common.utils.ToastTool;
 import com.miekir.eden.BuildConfig;
 import com.miekir.eden.R;
 import com.miekir.eden.base.ItemLongClickListener;
-import com.miekir.eden.manager.UserInfoManager;
-import com.miekir.eden.ui.TabActivity;
 import com.miekir.eden.ui.home.goods.detail.MeizhiDetailActivity;
 
 import java.util.List;
@@ -81,14 +78,6 @@ public class TemplateAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
                 });
 
         iv_template.setOnClickListener(v -> {
-            if (!UserInfoManager.getInstance().getBeiUser().vip) {
-                ToastTool.showShort("请先激活会员");
-                if (mContext instanceof TabActivity) {
-                    ((TabActivity) mContext).setCurrentPage(2);
-                }
-                return;
-            }
-
             // 跳转查看大图界面
             Intent photoIntent = new Intent(mContext, MeizhiDetailActivity.class);
             photoIntent.putExtra(MeizhiDetailActivity.TAG_URL, realUrl);

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsAdapter.java

@@ -105,14 +105,6 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         holder.setText(R.id.tv_see_num, String.format(GoodsDetailActivity.FORMATTER_SEE_NUM, StringTool.getNumberString(goodsBean.seeNum)));
 
         holder.setOnClickListener(R.id.cv_goods, v -> {
-            if (!UserInfoManager.getInstance().getBeiUser().vip) {
-                ToastTool.showShort("请先激活会员");
-                if (mContext instanceof TabActivity) {
-                    ((TabActivity) mContext).setCurrentPage(2);
-                }
-                return;
-            }
-
             if (!goodsBean.enable) {
                 ToastTool.showShort("敬请期待");
                 return;
@@ -124,6 +116,12 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
             RxActivityResult.on(mContext).startIntent(detailIntent)
                     .filter(result -> result.resultCode() == RESULT_OK)
                     .doOnNext(result -> {
+                        boolean refresh = result.data().getBooleanExtra(GoodsDetailActivity.KEY_VIP, false);
+                        if (mContext instanceof TabActivity && refresh) {
+                            ((TabActivity) mContext).setCurrentPage(2);
+                            return;
+                        }
+
                         // 刷新成功
                         GoodsBean afterBean = (GoodsBean) result.data().getSerializableExtra(GoodsDetailActivity.KEY_GOODS);
                         if (afterBean != null) {

app/src/main/java/com/miekir/eden/ui/home/goods/detail/GoodsDetailActivity.java

@@ -45,6 +45,7 @@ public class GoodsDetailActivity extends BaseBeiActivity implements View.OnClick
     SeePresenter seePresenter;
 
     public static final String KEY_GOODS = "goods";
+    public static final String KEY_VIP = "vip";
     private TextView tv_title;
     private TextView tv_desc;
     private TextView tv_see_num;

app/src/main/java/com/miekir/eden/ui/home/goods/detail/MagnetAdapter.java

@@ -1,6 +1,8 @@
 package com.miekir.eden.ui.home.goods.detail;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -8,12 +10,16 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.miekir.common.utils.ToastTool;
 import com.miekir.eden.R;
 import com.miekir.eden.base.BaseBeiActivity;
+import com.miekir.eden.manager.UserInfoManager;
 import com.miekir.eden.ui.home.goods.MagnetBean;
 
 import java.util.List;
 
+import static android.app.Activity.RESULT_OK;
+
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -37,6 +43,18 @@ public class MagnetAdapter extends BaseQuickAdapter<MagnetBean, BaseViewHolder>
 
         //String realUrl = magnetBean.url.startsWith("http") ? magnetBean.url : BuildConfig.HOST_STATIC_RESOURCE+magnetBean.url;
         tv_detail_magnet.setOnClickListener(v -> {
+            if (!UserInfoManager.getInstance().getBeiUser().vip) {
+                ToastTool.showShort("请先激活会员");
+                if (mContext instanceof Activity) {
+                    Activity activity = (Activity)mContext;
+                    Intent intent = activity.getIntent();
+                    intent.putExtra(GoodsDetailActivity.KEY_VIP, true);
+                    activity.setResult(RESULT_OK, intent);
+                    activity.finish();
+                }
+                return;
+            }
+
             if (mContext instanceof BaseBeiActivity) {
                 ((BaseBeiActivity) mContext).showLoading();
             }