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

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -42,4 +42,5 @@ public enum EventTypes {
 
     REFRESH_XIAOMI_GAME_LIST,//刷新界面
     FGT_SHEEP_REFRESH_H , //刷新fgtSmallSheep高度
+    FGT_SHEEP_SHOW_NEW_USER_HONG_BAO , //显示红包
 }

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

@@ -243,7 +243,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
-                    isShowRedPackages((Context)msg.obj);
+                    isShowRedPackages(activity);
                     LogUtil.logI("handle message");
                     break;
             }
@@ -268,12 +268,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * @return 是否显示红包
      */
     public void isShowRedPackage() {
-        if (SpUtils.getFirst("first")) {
-            return;
-        }
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
+        if(userEntity == null){
+            return;
+        }
+        if (SpUtils.getFirst("first"+userEntity.getId())) {
+            return;
+        }
+        SpUtils.saveFirst("first"+userEntity.getId(), true);
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
             showRedPackage(getContext());
         }
@@ -297,7 +301,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
         isShowRedPackage();
-        SpUtils.saveFirst("first", true);
     }
 
 
@@ -977,6 +980,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case FGT_SHEEP_REFRESH_H:
                 mHanderl.sendEmptyMessage(2);
                 break;
+            case FGT_SHEEP_SHOW_NEW_USER_HONG_BAO:
+                mHanderl.sendEmptyMessage(7);
+                break;
         }
     }
 
@@ -1259,7 +1265,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CommonUtil.getInstance().updateUserInfo(null);
                 popupWindow.dismiss();
                 getRedPackage(popupWindow);
             }
@@ -1294,6 +1299,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         if (popupWindow.isShowing()){
                             popupWindow.dismiss();
                         }
+                        CommonUtil.getInstance().updateUserInfo(null);
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/NewbieTaskAdp.java

@@ -10,6 +10,8 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.UserEntity;
@@ -20,6 +22,8 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
 import java.util.Locale;
 
@@ -148,10 +152,7 @@ public class NewbieTaskAdp extends BaseAdapter {
     private static void isShow(Context context) {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-            Message message = Message.obtain();
-            message.obj = context;
-            message.what = 7;
-            new FgtSmallSheep().mHanderl.sendMessage(message);
+            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
             LogUtil.logI("sendmessage");
         }
     }