|
|
@@ -65,6 +65,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
TextView btnJoin;
|
|
|
private Activity activity;
|
|
|
|
|
|
+ VideoView videoView;
|
|
|
private boolean isClick;
|
|
|
|
|
|
private static final int PERMISSON_REQUESTCODE = 1;
|
|
|
@@ -103,8 +104,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
EasyPermissions.requestPermissions(this, "应用需要这些权限", PERMISSON_REQUESTCODE, needPermissions);
|
|
|
} else {
|
|
|
isRequestCodePermissions = false;
|
|
|
- mHandler.removeMessages(0);
|
|
|
- mHandler.sendEmptyMessageDelayed(0, 100);
|
|
|
+ sendHandlerMessages();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -157,8 +157,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
advertising = baseMessage.getData(Advertising.class);
|
|
|
isLoaddingData = false;
|
|
|
if(advertising == null || TextUtils.isEmpty(advertising.getDisplay_src())){
|
|
|
- mHandler.removeMessages(0);
|
|
|
- mHandler.sendEmptyMessageDelayed(0, 100);
|
|
|
+ sendHandlerMessages();
|
|
|
} else {
|
|
|
try {
|
|
|
loadAdvertising();
|
|
|
@@ -172,8 +171,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
public void onError(BaseMessage baseMessage) {
|
|
|
LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
|
|
|
isLoaddingData = false;
|
|
|
- mHandler.removeMessages(0);
|
|
|
- mHandler.sendEmptyMessageDelayed(0, 100);
|
|
|
+ sendHandlerMessages();
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -186,7 +184,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
} else {
|
|
|
Uri uri = Uri.parse(advertising.getDisplay_src());
|
|
|
splash_video_view.setVisibility(View.VISIBLE);
|
|
|
- final VideoView videoView = splash_video_view;
|
|
|
+ videoView = splash_video_view;
|
|
|
videoView.setOnInfoListener(new MediaPlayer.OnInfoListener() {
|
|
|
@Override
|
|
|
public boolean onInfo(MediaPlayer mediaPlayer, int what, int extra) {
|
|
|
@@ -205,10 +203,11 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
videoView.requestFocus();
|
|
|
}
|
|
|
|
|
|
- splash_skip.setVisibility(View.VISIBLE);
|
|
|
if(splash_know_ad_tv != null)
|
|
|
splash_know_ad_tv.setVisibility(View.VISIBLE);
|
|
|
- if(advertising.getShow_time() > 0)
|
|
|
+ mHandler.removeMessages(0);
|
|
|
+ if(advertising.getShow_time() > 0) {
|
|
|
+ splash_skip.setVisibility(View.VISIBLE);
|
|
|
timer = RxjavaCountDownTimer.getInstance(BuildConfig.DEBUG ? 1 : advertising.getShow_time())
|
|
|
.setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
|
|
|
@Override
|
|
|
@@ -216,8 +215,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
splash_skip.setEnabled(true);
|
|
|
splash_skip.setVisibility(View.GONE);
|
|
|
btnJoin.setVisibility(View.VISIBLE);
|
|
|
- if(isResume)
|
|
|
- mHandler.sendEmptyMessageDelayed(0, BuildConfig.DEBUG ? 100 : 1000);
|
|
|
+ if (isResume)
|
|
|
+ sendHandlerMessages();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -226,19 +225,26 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
splash_skip.setText(activity.getString(R.string.tip_skip, time));
|
|
|
}
|
|
|
}).start();
|
|
|
- mHandler.removeMessages(0);
|
|
|
+ } else {
|
|
|
+ btnJoin.setVisibility(View.VISIBLE);
|
|
|
+ sendHandlerMessages();
|
|
|
+ }
|
|
|
}
|
|
|
private boolean isResume = false;
|
|
|
@Override
|
|
|
protected void onResume() {
|
|
|
super.onResume();
|
|
|
isResume = true;
|
|
|
+ if(videoView != null)
|
|
|
+ videoView.resume();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
protected void onPause() {
|
|
|
super.onPause();
|
|
|
isResume = false;
|
|
|
+ if(videoView != null)
|
|
|
+ videoView.pause();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -342,9 +348,12 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
|
|
|
public void onActivityReenter(int resultCode, Intent data) {
|
|
|
super.onActivityReenter(resultCode, data);
|
|
|
isRequestCodePermissions = false;
|
|
|
+ sendHandlerMessages();
|
|
|
+ }
|
|
|
+ private void sendHandlerMessages(){
|
|
|
try {
|
|
|
mHandler.removeMessages(0);
|
|
|
- mHandler.sendEmptyMessageDelayed(0, 100);
|
|
|
+ mHandler.sendEmptyMessageDelayed(0, BuildConfig.DEBUG ? 100 : 2000);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|