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

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

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

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

@@ -1401,13 +1401,14 @@ public class Jump2View {
      * 幂动科技
      */
     public void goMiDong(Activity activity, Object o){
-        if(SheepApp.getInstance().isShowMidong() &&
-                !CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId())){
+        if(!SheepApp.getInstance().isShowMidong()){
             G.showToast("敬请期待");
             return;
         }
-        Intent intent = new Intent(activity, ActMiDong.class);
-        activity.startActivity(intent);
-        MI_DONG_VIEW.onEvent();
+        if(SheepApp.getInstance().isInitMidong()){
+            Intent intent = new Intent(activity, ActMiDong.class);
+            activity.startActivity(intent);
+            MI_DONG_VIEW.onEvent();
+        }
     }
 }