代码 合并

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

@@ -395,6 +395,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             home_list_gridview_layout.setVisibility(View.VISIBLE);
             homeListEntitys.addAll(cacheHomeListEtyList);
             boolean isShowQB = false;
+            boolean isShowMd = false;
             for (int i = 0; i < homeListEntitys.size(); i++) {
                 if (i < 4) {
                     homeListEntitysGridview.add(homeListEntitys.get(i));
@@ -405,11 +406,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     isShowQB = !isShowQB;
                 }
                 if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
-
-
+                    isShowMd = !isShowMd;
                 }
             }
             SheepApp.getInstance().setShowQB(isShowQB);
+            SheepApp.getInstance().setShowMidong(isShowMd);
             adpHomeListGrideview.notifyDataSetChanged();
             adpHomeListListview.notifyDataSetChanged();
             home_list_gridview_listview.setVisibility(homeListEntitysListview.isEmpty() ? View.GONE : View.VISIBLE);
@@ -727,6 +728,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 homeListEntitysListview.clear();
                 homeListEntitys.addAll(homeListEntity);
                 boolean isShowQB = false;
+                boolean isShowMd = false;
                 for (int i = 0; i < homeListEntitys.size(); i++) {
                     if (i < 4) {
                         homeListEntitysGridview.add(homeListEntitys.get(i));
@@ -736,8 +738,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                         isShowQB = !isShowQB;
                     }
+                    if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
+                        isShowMd = !isShowMd;
+                    }
                 }
                 SheepApp.getInstance().setShowQB(isShowQB);
+                SheepApp.getInstance().setShowMidong(isShowMd);
                 adpHomeListGrideview.notifyDataSetChanged();
                 adpHomeListListview.notifyDataSetChanged();
                 home_list_gridview_listview.setVisibility(homeListEntitysListview.isEmpty() ? View.GONE : View.VISIBLE);
@@ -771,13 +777,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void onResume() {
         super.onResume();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                //幂动科技
-                CommonUtil.getInstance().initMiDong(activity, userEntity.getId());
-            }
-        }, 500);
         UserEntity result = DataUtil.getInstance().getUserEntity();
         if(result == null) {
             CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {

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

@@ -1402,7 +1402,7 @@ public class Jump2View {
      */
     public void goMiDong(Activity activity, Object o){
         if(SheepApp.getInstance().isShowMidong() &&
-                !CommonUtil.getInstance().initMiDong(activity, MyDbManager.getInstance().dbFindId())){
+                !CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId())){
             G.showToast("敬请期待");
             return;
         }