splash ad action

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -112,10 +112,10 @@ public class SplashAct extends BaseActivity {
 
                     private void handleResult(boolean isNewSmallSheep) {
                         DataUtil.getInstance().setIsNewSmallSheep(isNewSmallSheep);
-                        if (SysAppUtil.isNewSmallSheep() || TestUtil.isDev()) {//新版本只显示引导页面，不展示弹窗和开屏广告
-                            initAdvertisement(false);//只更新，不加载，下次加载上次的数据
-                            sendHandlerMessages(2000);
-                        } else {
+//                        if (SysAppUtil.isNewSmallSheep() || TestUtil.isDev()) {//新版本只显示引导页面，不展示弹窗和开屏广告
+//                            initAdvertisement(false);//只更新，不加载，下次加载上次的数据
+//                            sendHandlerMessages(2000);
+//                        } else {
                             Advertising cacheAdvertising = DataUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
                             if (cacheAdvertising != null) {
                                 advertising = cacheAdvertising;
@@ -124,7 +124,7 @@ public class SplashAct extends BaseActivity {
                             } else {
                                 initAdvertisement(true);
                             }
-                        }
+//                        }
                     }
                 });
     }
@@ -185,8 +185,9 @@ public class SplashAct extends BaseActivity {
                         @Override
                         public void onFinish() {
                             splash_skip.setVisibility(View.INVISIBLE);//设置为INVISIBLE代表定时器结束
-                            if (isResume)
+                            if (!goLink) {
                                 sendHandlerMessages(10);
+                            }
                         }
 
                         @Override
@@ -235,12 +236,9 @@ public class SplashAct extends BaseActivity {
 
     }
 
-    private boolean isResume = false;
-
     @Override
     protected void onResume() {
         super.onResume();
-        isResume = true;
         if (splash_video_view != null)
             splash_video_view.resume();
         if (goLink) {
@@ -251,7 +249,6 @@ public class SplashAct extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        isResume = false;
         if (splash_video_view != null)
             splash_video_view.pause();
     }

app/src/main/java/com/sheep/gamegroup/view/activity/helper/SplashHelper.java

@@ -81,7 +81,7 @@ public class SplashHelper {
                     Jump2View.getInstance().goTaskDetailView(activity, advertising.getLink_id());
                     break;
                 case 5:
-                    Jump2View.getInstance().goCreditCardTaskList(activity, null);
+                    Jump2View.getInstance().goCreditCardTaskDetail(activity, advertising.getLink_id());
                     break;
                 case 6:
                     Jump2View.getInstance().goWeb(activity, advertising.getLink(), "微信二维码辅助好友注册");