twice sign chance

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

@@ -354,13 +354,6 @@ public class UserEntity implements Serializable {
     }
 
 
-
-
-
-
-
-
-
     public boolean isNewRegistUser() {//新注册用户
         return TextUtils.equals(create_time, last_login_time);
     }
@@ -430,20 +423,25 @@ public class UserEntity implements Serializable {
     public boolean alreadyExchangeCoupon() {
         return false;
     }
+
     //用户等级 0：普通用户     1：VIP用户
     public static final int LEVEL_VIP = 1;
+
     //该用户是否是VIP用户
-    public boolean isVIP(){
+    public boolean isVIP() {
         return level >= LEVEL_VIP;
     }
-    public CharSequence getVIPInfo(){
+
+    public CharSequence getVIPInfo() {
         String info = String.format(Locale.CHINA, "\t%s到期", TimeUtil.TimeStamp2Date(vip_time, "yyyy.MM.dd"));
         return new SpannableSb().append("VIP").append(info, R.dimen.text_size_9).getSsb();
     }
+
     //用户类型： 1普通用户 2游戏用户
     public static final int USRE_TYPE_NOR = 1;
     public static final int USRE_TYPE_GAME = 2;
-    public boolean isGameUser(){
+
+    public boolean isGameUser() {
         return user_type == USRE_TYPE_GAME;
     }
 }

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

@@ -72,7 +72,6 @@ public class UserSign implements Comparable<UserSign> {
     }
 
 
-
     @Override
     public boolean equals(Object obj) {
         return obj instanceof UserSign && ((UserSign) obj).day == day;//这里认为，day相同， 就是同一天的数据
@@ -83,13 +82,15 @@ public class UserSign implements Comparable<UserSign> {
     }
 
     //当天是否进行过补签
-    public boolean signSupplemented(){
-        return has_share >= SHARE_TYPE_SIGN_SUPPLEMENT;
+    public boolean signSupplemented() {
+        return has_share >= 4;
     }
+
     //当天是否进行过分享
-    public boolean signShared(){
-        return has_share >= SHARE_TYPE_SHARE;
+    public boolean signShared() {
+        return has_share == 1 || has_share == 3;
     }
+
     @Override
     public int compareTo(@NonNull UserSign userSign) {
         return day - userSign.getDay();
@@ -115,6 +116,4 @@ public class UserSign implements Comparable<UserSign> {
         return TimeUtil.TimeStamp2Date(time, "yyyy-MM-dd");
     }
 
-    public static final int SHARE_TYPE_SHARE = 1;//已经分享
-    public static final int SHARE_TYPE_SIGN_SUPPLEMENT = 2;//已经补签
 }

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -187,7 +187,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     private void goMain(LoginEntity entity) {
         CertificationUtil.newInstance().addCurUserToSdkLoginUser(entity.getToken(), entity.getUser());
         if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
-            showProgress();
+//            showProgress();
             Jump2View.getInstance().checkOrGoHomePage(this);
         } else {
             CertificationUtil.newInstance().authCertificationCode(this, entity.getToken());

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -114,6 +114,7 @@ public class SplashAct extends BaseActivity {
                         DataUtil.getInstance().setIsNewSmallSheep(isNewSmallSheep);
                         if (SysAppUtil.isNewSmallSheep() || TestUtil.isDev()) {//新版本只显示引导页面，不展示弹窗和开屏广告
                             initAdvertisement(false);//只更新，不加载，下次加载上次的数据
+                            sendHandlerMessages(2000);
                         } else {
                             Advertising cacheAdvertising = DataUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
                             if (cacheAdvertising != null) {

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -18,6 +18,7 @@ import com.sheep.gamegroup.model.entity.PunchAndSign;
 import com.sheep.gamegroup.model.entity.RechargeLog;
 import com.sheep.gamegroup.model.entity.CommendTask;
 import com.sheep.gamegroup.model.entity.SheepSignResult;
+import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.UserSign;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -80,8 +81,6 @@ public class SignActivity extends BaseUMActivity {
     ImageView sheep_sign_rectangle;
     @BindView(R.id.sheep_sign_egg_rl)
     View sheep_sign_egg_rl;//中奖的球与文本的容器
-    //    @BindView(R.id.sheep_sign_egg)
-//    ImageView sheep_sign_egg;//中奖的球
     @BindView(R.id.sheep_sign_egg_msg)
     TextView sheep_sign_egg_msg;//中奖的球的文本
     @BindView(R.id.sign_gua_jiang_qu)
@@ -91,6 +90,8 @@ public class SignActivity extends BaseUMActivity {
     /* 是否有漏签 */
     private boolean hasMissSign = false;
 
+    private UserEntity user;
+
     @Override
     protected int getLayoutId() {
         return R.layout.activity_sign;
@@ -171,6 +172,7 @@ public class SignActivity extends BaseUMActivity {
 
     @Override
     public void initData() {
+        user = DataUtil.getInstance().getUserEntity();
         initSigns();
         initUserSignScratchAmount();
         initUserSignLastScratch();
@@ -435,16 +437,20 @@ public class SignActivity extends BaseUMActivity {
             if (lastUserSign.signShared()) {//可以进行补签且进行过分享操作，可以直接补签
                 signInSupplement();
             } else {
-                new ShareLinkConfig().setAction1(new Action1<View>() {
-                    @Override
-                    public void call(View view) {
-                        if (view == null) {
-                            ViewUtil.setEnabled(sign_now_but, true);
-                        } else {
-                            ViewUtil.setText((TextView) view.findViewById(R.id.ask_share_title), "邀请获得复活机会");
+                if (user.isVIP()) {
+                    onResult(null);
+                } else {
+                    new ShareLinkConfig().setAction1(new Action1<View>() {
+                        @Override
+                        public void call(View view) {
+                            if (view == null) {
+                                ViewUtil.setEnabled(sign_now_but, true);
+                            } else {
+                                ViewUtil.setText((TextView) view.findViewById(R.id.ask_share_title), "邀请获得复活机会");
+                            }
                         }
-                    }
-                }).toShare(this);
+                    }).toShare(this);
+                }
             }
         } else {
             signNow();