Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -455,7 +455,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 }
                 if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
                     isShowMd = !isShowMd;
-                    CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
                 }
             }
             addNewTask();
@@ -798,7 +797,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
                         isShowMd = !isShowMd;
-                        CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
                     }
                 }
                 addNewTask();

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1448,6 +1448,7 @@ public class Jump2View {
             G.showToast("敬请期待");
             return;
         }
+        CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
         if(SheepApp.getInstance().isInitMidong()){
             Intent intent = new Intent(activity, ActMiDong.class);
             activity.startActivity(intent);

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

@@ -120,6 +120,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                 case 0:
                     if(!isRequestCodePermissions && !isLoaddingData && timerIsFinish())
                         gotoNext();
+                    else
+                        sendHandlerMessages(100);
                     break;
                 case 1:
                     if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告