|
|
@@ -146,7 +146,6 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
case 1:
|
|
|
if (SysAppUtil.isNewSmallSheep() || TestUtil.isDev()) {//新版本只显示引导页面,不展示弹窗和开屏广告
|
|
|
isLoadingData = false;
|
|
|
- sendHandlerMessages(200);
|
|
|
initAdvertisement(false);//只更新,不加载,下次加载上次的数据
|
|
|
} else {
|
|
|
Advertising cacheAdvertising = DataUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
|
|
|
@@ -163,6 +162,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
initAdvertisement(true);
|
|
|
}
|
|
|
}
|
|
|
+ sendHandlerMessages(200);
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -180,8 +180,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
.subscribe(new SheepSubscriber<BaseMessage>(activity) {
|
|
|
@Override
|
|
|
public void onNext(BaseMessage baseMessage) {
|
|
|
+ isLoadingData = false;
|
|
|
if(isLoad) {
|
|
|
- isLoadingData = false;
|
|
|
advertising = baseMessage.getData(Advertising.class);
|
|
|
try {
|
|
|
loadAdvertising();
|
|
|
@@ -193,10 +193,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
|
|
|
@Override
|
|
|
public void onError(BaseMessage baseMessage) {
|
|
|
- if(isLoad) {
|
|
|
- isLoadingData = false;
|
|
|
- sendHandlerMessages(10);
|
|
|
- }
|
|
|
+ isLoadingData = false;
|
|
|
}
|
|
|
});
|
|
|
}
|