Merge remote-tracking branch 'origin/master'

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

@@ -476,7 +476,22 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (userEntity == null) {
             userEntity = DataUtil.getInstance().getUserEntity();
         }
+        if(userEntity == null){
+            CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
+                @Override
+                public void call(UserEntity result) {
+                    if(result != null){
+                        userEntity = result;
+                        showRedPackageNext();
+                    }
+                }
+            });
+        } else {
+            showRedPackageNext();
+        }
+    }
 
+    private void showRedPackageNext() {
         if (SpUtils.getFirst("first" + userEntity.getId())) {//不是第一次进入APP
             return;
         }