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

# Conflicts:
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

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

@@ -925,12 +925,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         banner.setVisibility(View.VISIBLE);
         //设置图片加载器
         banner.setImageLoader(new ImageLoader() {
-                    @Override
-                    public void displayImage(Context context, Object o, ImageView imageView) {
-                        if (o instanceof SlideshowEty)
-                            Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
-                    }
-                })
+            @Override
+            public void displayImage(Context context, Object o, ImageView imageView) {
+                if (o instanceof SlideshowEty)
+                    Glide.with(context).load(((SlideshowEty) o).getUrl()).apply(new RequestOptions().dontAnimate()).into(imageView);
+            }
+        })
                 .setDelayTime(4000)
                 .setBannerStyle(BannerConfig.CIRCLE_INDICATOR_TITLE_INSIDE)
                 //设置图片集合

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -3,8 +3,6 @@ package com.sheep.gamegroup.model.entity;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
 import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
 

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

@@ -1456,10 +1456,12 @@ public class CommonUtil {
      *  appId为应用id，开发者可联系后台获取
      *  id 用户uid
      */
-    public void initMiDong(Activity activity, String id){
+    public boolean initMiDong(Activity activity, String id){
         if(!SheepApp.getInstance().isInitMidong() && !TextUtils.isEmpty(id)){
             SheepApp.getInstance().setInitMidong(true);
             AdManager.getInstance(activity).init(activity, "40",id+"");
+            return true;
         }
+        return false;
     }
 }

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

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

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -55,6 +55,15 @@ public class SheepApp extends BaseApplication {
     private boolean isShowQB;
     private String packgeName;
     private boolean isInitMidong = false;
+    private boolean isShowMidong = false;
+
+    public boolean isShowMidong() {
+        return isShowMidong;
+    }
+
+    public void setShowMidong(boolean showMidong) {
+        isShowMidong = showMidong;
+    }
 
     public boolean isInitMidong() {
         return isInitMidong;