|
@@ -351,9 +351,7 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
|
|
|
fgtGameWelfare.setSmartRefreshLayout(refresh);
|
|
fgtGameWelfare.setSmartRefreshLayout(refresh);
|
|
|
mAdapter.add(fgtGameWelfare, "福利");
|
|
mAdapter.add(fgtGameWelfare, "福利");
|
|
|
}
|
|
}
|
|
|
- if (fgtGameGift != null || !gameEntity.isGift()) {
|
|
|
|
|
-
|
|
|
|
|
- } else {
|
|
|
|
|
|
|
+ if (gameEntity.isGift()) {
|
|
|
fgtGameGift = FgtGameGift.newInstance(id);
|
|
fgtGameGift = FgtGameGift.newInstance(id);
|
|
|
fgtGameGift.setSmartRefreshLayout(refresh);
|
|
fgtGameGift.setSmartRefreshLayout(refresh);
|
|
|
fgtGameGift.loadData(gameEntity);
|
|
fgtGameGift.loadData(gameEntity);
|
|
@@ -376,6 +374,8 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
|
|
|
@Override
|
|
@Override
|
|
|
public void onNext(BaseMessage baseMessage) {
|
|
public void onNext(BaseMessage baseMessage) {
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.playGameDetail(id));
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.playGameDetail(id));
|
|
|
|
|
+ // todo
|
|
|
|
|
+ isNewData = true;
|
|
|
if (isNewData) {
|
|
if (isNewData) {
|
|
|
GameEntity gameEntity = baseMessage.getData(GameEntity.class);
|
|
GameEntity gameEntity = baseMessage.getData(GameEntity.class);
|
|
|
checkData(gameEntity);
|
|
checkData(gameEntity);
|
|
@@ -395,13 +395,14 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public void initData() {
|
|
public void initData() {
|
|
|
- GameEntity gameEntity = DataUtil.getInstance().getCacheResult(ApiKey.playGameDetail(id), GameEntity.class);
|
|
|
|
|
- if (gameEntity != null) {
|
|
|
|
|
- checkData(gameEntity);
|
|
|
|
|
- refreshData();
|
|
|
|
|
- } else {
|
|
|
|
|
|
|
+ // todo
|
|
|
|
|
+// GameEntity gameEntity = DataUtil.getInstance().getCacheResult(ApiKey.playGameDetail(id), GameEntity.class);
|
|
|
|
|
+// if (gameEntity != null) {
|
|
|
|
|
+// checkData(gameEntity);
|
|
|
|
|
+// refreshData();
|
|
|
|
|
+// } else {
|
|
|
initDetailFromNet();
|
|
initDetailFromNet();
|
|
|
- }
|
|
|
|
|
|
|
+// }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private int refreshDataCount = 0;
|
|
private int refreshDataCount = 0;
|