1.0.6发版

highgold/app/src/main/java/com/mints/highgold/ui/activitys/AwardActivity.java

@@ -628,20 +628,6 @@ public class AwardActivity extends BaseActivity implements AwardView {
 //                tvAwardNext.setText("我知道了");
                 break;
             case Constant.CARRIER_HOMEWATER_HIT:// 首页喝水打卡
-                tvAwardContent.setText("恭喜喝水打卡成功");
-                tvAwardNext.setText("去赚更多金币");
-                tvAwardHint.setVisibility(View.GONE);
-                tvAwardCash.setVisibility(View.GONE);
-                llAwardBg.setBackground(getResources().getDrawable(R.mipmap.bg_award_drink));
-                break;
-            case Constant.CARRIER_HOMEWATER_BUBBLE:// 首页喝水汽泡
-                tvAwardContent.setText("恭喜获得" + curCoin + "金币");
-                tvAwardNext.setVisibility(View.GONE);
-                tvAwardHint.setVisibility(View.GONE);
-                llAwardBg.setBackground(getResources().getDrawable(R.mipmap.bg_award_gold));
-                break;
-            case Constant.CARRIER_HOMEWATER_BUBBLE_TIME:// 首页喝水汽泡整点
-
                 RxjavaUtil.executeRxTask(new CommonRxTask<String>("") {
                     @Override
                     public void doInIOThread() {
@@ -660,6 +646,19 @@ public class AwardActivity extends BaseActivity implements AwardView {
                     }
                 });
 
+                tvAwardContent.setText("恭喜喝水打卡成功");
+                tvAwardNext.setText("去赚更多金币");
+                tvAwardHint.setVisibility(View.GONE);
+                tvAwardCash.setVisibility(View.GONE);
+                llAwardBg.setBackground(getResources().getDrawable(R.mipmap.bg_award_drink));
+                break;
+            case Constant.CARRIER_HOMEWATER_BUBBLE:// 首页喝水汽泡
+                tvAwardContent.setText("恭喜获得" + curCoin + "金币");
+                tvAwardNext.setVisibility(View.GONE);
+                tvAwardHint.setVisibility(View.GONE);
+                llAwardBg.setBackground(getResources().getDrawable(R.mipmap.bg_award_gold));
+                break;
+            case Constant.CARRIER_HOMEWATER_BUBBLE_TIME:// 首页喝水汽泡整点
                 tvAwardContent.setText("恭喜获得" + curCoin + "金币");
                 tvAwardNext.setVisibility(View.GONE);
                 tvAwardHint.setVisibility(View.GONE);

highgold/app/src/main/java/com/mints/highgold/ui/fragment/MainFragment.java

@@ -711,16 +711,16 @@ public class MainFragment extends BaseFragment
 
         // 喝水时间
         if (data.getNextGetCoinTime() > 0) {
-            wvWater.setTvDrinkBtnText("喝水打卡");
-            wvWater.closeWaterViewTime();
-            wvWater.setWaterViewTime(getActivity(), data.getNextGetCoinTime());
-        } else {
             if (!AppConfig.isMintegralInscreenFlag) {
                 if (mintegralInscreenVedioAdManager != null) {
                     mintegralInscreenVedioAdManager.loadMintegralInscreen();
                 }
             }
 
+            wvWater.setTvDrinkBtnText("喝水打卡");
+            wvWater.closeWaterViewTime();
+            wvWater.setWaterViewTime(getActivity(), data.getNextGetCoinTime());
+        } else {
             wvWater.setTvDrinkBtnText("喝水领金币");
             wvWater.setWaterViewTimeGone();
         }