|
@@ -179,26 +179,31 @@ public class UserDetailActivity extends BaseMVPActivity<AcUserDetailLayoutBindin
|
|
|
} else {
|
|
|
eVipType = EVipType.valueOf(userVip.getVipType());
|
|
|
}
|
|
|
-
|
|
|
- if (eVipType == EVipType.NOT_VIP) {
|
|
|
- //非会员
|
|
|
- return getExpireTip(userVip, target, results);
|
|
|
- } else {
|
|
|
- //会员
|
|
|
+ boolean isCheckSvip = TextUtils.equals(target,EVipType.SVIP.getId());
|
|
|
+ if (isCheckSvip) {
|
|
|
boolean isPermanentVip = eVipType == EVipType.PERMANENT_SVIP;
|
|
|
if (TextUtils.equals(target, EVipType.SVIP.getId()) && isPermanentVip) {
|
|
|
results[0] = VIP_STATUS_NORMAL;
|
|
|
results[1] = "永久有效";
|
|
|
- } else {
|
|
|
- String daysTip = getDaysTip(target, userVip);
|
|
|
- int i = Integer.parseInt(daysTip);
|
|
|
- if (i > 0) {
|
|
|
- results[0] = VIP_STATUS_NORMAL;
|
|
|
- results[1] = String.format("剩余%s天", daysTip);
|
|
|
- } else {
|
|
|
- return getExpireTip(userVip, target, results);
|
|
|
- }
|
|
|
+ return results;
|
|
|
}
|
|
|
+ String daysTip = getDaysTip(EVipType.SVIP.getId(), userVip);
|
|
|
+ int i = Integer.parseInt(daysTip);
|
|
|
+ if (i > 0) {
|
|
|
+ results[0] = VIP_STATUS_NORMAL;
|
|
|
+ results[1] = String.format("剩余%s天", daysTip);
|
|
|
+ return results;
|
|
|
+ }
|
|
|
+ return getExpireTip(userVip, EVipType.SVIP.getId(), results);
|
|
|
+ } else {
|
|
|
+ String daysTip = getDaysTip(EVipType.VIP.getId(), userVip);
|
|
|
+ int i = Integer.parseInt(daysTip);
|
|
|
+ if (i > 0) {
|
|
|
+ results[0] = VIP_STATUS_NORMAL;
|
|
|
+ results[1] = String.format("剩余%s天", daysTip);
|
|
|
+ return results;
|
|
|
+ }
|
|
|
+ return getExpireTip(userVip, target, results);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -220,15 +225,10 @@ public class UserDetailActivity extends BaseMVPActivity<AcUserDetailLayoutBindin
|
|
|
results[1] = String.format("已过期%s天", getExpireDaysTip(target, userVip));
|
|
|
return results;
|
|
|
}
|
|
|
- results[0] = VIP_STATUS_NOT_OPEN;
|
|
|
- results[1] = "暂未开通";
|
|
|
- return results;
|
|
|
- } else {
|
|
|
- //未开通会员
|
|
|
- results[0] = VIP_STATUS_NOT_OPEN;
|
|
|
- results[1] = "暂未开通";
|
|
|
- return results;
|
|
|
}
|
|
|
+ results[0] = VIP_STATUS_NOT_OPEN;
|
|
|
+ results[1] = "暂未开通";
|
|
|
+ return results;
|
|
|
}
|
|
|
|
|
|
private String getDaysTip(String target, IMUserInfo.VipBean userVip) {
|