Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into 3.1

Browse Source
This commit is contained in:
kehaoyuan
2017-12-04 18:48:41 +08:00
parent 3978ab95f4 b134d077cf
commit 65e098e1c8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
View File

@ -263,6 +263,8 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
curStatusCount++;
}
}
// 由领取到淘号的状态转换
if (repeat <= curStatusCount || curStatusCount == 0) { // 当前领取/淘号总数是否超过总重复领取次数 / 当前状态的礼包没有领取/淘号过
if (curStatusCount == 0 && ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) {
if (isCanLing()) { // 恢复原始状态
@ -306,7 +308,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap
long curTime = Utils.getTime(this) * 1000;
int lingDay = Integer.parseInt(formatDay.format(lingTime));
int curDay = Integer.parseInt(formatDay.format(curTime));
if ((curTime > lingTime && curDay != lingDay) || curTime - lingTime > 24 * 60 * 60 * 1000) {
if (curDay != lingDay || curTime - lingTime > 24 * 60 * 60 * 1000) {
return true;
} else {
return false;