詹子聪 před 5 roky
rodič
revize
b97afdb5bc

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

@@ -106,13 +106,13 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
 
         holder.setOnClickListener(R.id.cv_goods, v -> {
             // 会员才能进去
-            if (!EdenManager.getInstance().getBeiUser().vip) {
+            /*if (!EdenManager.getInstance().getBeiUser().vip) {
                 ToastTool.showShort(StringTool.getString(R.string.upgrade_to_vip));
                 if (mContext instanceof TabActivity) {
                     ((TabActivity) mContext).setCurrentToAboutPage();
                 }
                 return;
-            }
+            }*/
 
             if (!goodsBean.enable) {
                 ToastTool.showShort(StringTool.getString(R.string.coming));
@@ -138,8 +138,8 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
                             }
                         }
 
-                        boolean refresh = result.data().getBooleanExtra(GoodsDetailActivity.KEY_VIP, false);
-                        if (mContext instanceof TabActivity && refresh) {
+                        boolean needVIP = result.data().getBooleanExtra(GoodsDetailActivity.KEY_VIP, false);
+                        if (mContext instanceof TabActivity && needVIP) {
                             ((TabActivity) mContext).setCurrentToAboutPage();
                         }
                     })

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

@@ -223,10 +223,10 @@ public class GoodsDetailActivity extends BaseBeiActivity implements View.OnClick
             return;
         }
 
-        // 小于20秒的都是没有按要求完成任务的
+        // 小于10秒的都是没有按要求完成任务的
         long durationMillis = System.currentTimeMillis() - AdManager.getInstance().getStartTimeMillis();
         if (durationMillis < AD_TIME_MIN) {
-            ToastTool.showShort(StringTool.getString(R.string.ad_title));
+            ToastTool.showShort(StringTool.getString(R.string.ad_not_finished));
             return;
         }
 

+ 2 - 1
app/src/main/res/values-zh-rCN/strings.xml

@@ -38,7 +38,7 @@
     <string name="goods_fav_success">收藏成功</string>
     <string name="goods_fav_fail">收藏失败</string>
     <string name="goods_get_download_fail">获取下载地址失败</string>
-    <string name="goods_torrent_copied">已复制资源链接</string>
+    <string name="goods_torrent_copied">已复制资源下载链接</string>
     <string name="click_to_copy">(点击复制)</string>
     <string name="upgrade_to_vip">请先激活会员</string>
     <string name="limited">(已禁用)</string>
@@ -99,6 +99,7 @@
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">确定执行此不可逆转的操作?</string>
     <string name="ad_title">请领取美食优惠券后继续</string>
+    <string name="ad_not_finished">你可能没领取成功,请重新领取</string>
     <string name="err_rest_time">休息时间到</string>
     <string name="title_video">视频</string>
     <string name="video_get_failed">获取视频失败</string>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -99,6 +99,7 @@
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">Sure to proceed?</string>
     <string name="ad_title">Please go and get your coupon first</string>
+    <string name="ad_not_finished">Maybe getting coupon failed</string>
     <string name="err_rest_time">Rest time now</string>
     <string name="title_video">Video</string>
     <string name="video_get_failed">Get video failed</string>