2.2.1
This commit is contained in:
parent
1d536269fe
commit
c3fa1381f8
|
@ -587,7 +587,7 @@ public class MainActivity extends Activity implements Choreographer.FrameCallbac
|
||||||
while(iter.hasNext()) {
|
while(iter.hasNext()) {
|
||||||
var showHide = iter.next();
|
var showHide = iter.next();
|
||||||
if(showHide.time > milli) {
|
if(showHide.time > milli) {
|
||||||
if(showHide.time >= milli+100) break;
|
if(showHide.time > milli+250) break;
|
||||||
else continue;
|
else continue;
|
||||||
}
|
}
|
||||||
if(showHide.act=='H') {
|
if(showHide.act=='H') {
|
||||||
|
@ -597,6 +597,12 @@ public class MainActivity extends Activity implements Choreographer.FrameCallbac
|
||||||
} else if(showHide.act=='S') {
|
} else if(showHide.act=='S') {
|
||||||
showHide.src.show();
|
showHide.src.show();
|
||||||
iter.remove();
|
iter.remove();
|
||||||
|
} else if(showHide.act=='V') {
|
||||||
|
if(showHide.src.view!=null) {
|
||||||
|
showHide.src.view.setAlpha(1);
|
||||||
|
((SrcVideo)showHide.src.view).ijkPlayer.start();
|
||||||
|
}
|
||||||
|
iter.remove();
|
||||||
} else if(showHide.run!=null) showHide.run.run();
|
} else if(showHide.run!=null) showHide.run.run();
|
||||||
}
|
}
|
||||||
boolean noProg = progView == null && insView==null;
|
boolean noProg = progView == null && insView==null;
|
||||||
|
|
|
@ -760,6 +760,7 @@ public class Prog extends AbsLayout {
|
||||||
src.startMilli = start + src.startTime;
|
src.startMilli = start + src.startTime;
|
||||||
if(src.startTime == 0) {
|
if(src.startTime == 0) {
|
||||||
src.prepare(cur - src.startMilli);
|
src.prepare(cur - src.startMilli);
|
||||||
|
if(src.typ=='V') shows.add(new MainActivity.ShowHide(src.startMilli+933, src, 'V'));
|
||||||
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
||||||
src.isShow = true;
|
src.isShow = true;
|
||||||
}
|
}
|
||||||
|
@ -788,6 +789,7 @@ public class Prog extends AbsLayout {
|
||||||
else src.doEff();
|
else src.doEff();
|
||||||
} else if(milli < src.endMilli && milli >= src.startMilli) {
|
} else if(milli < src.endMilli && milli >= src.startMilli) {
|
||||||
src.prepare(milli - src.startMilli);
|
src.prepare(milli - src.startMilli);
|
||||||
|
if(src.typ=='V') shows.add(new MainActivity.ShowHide(src.startMilli+933, src, 'V'));
|
||||||
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
||||||
src.isShow = true;
|
src.isShow = true;
|
||||||
}
|
}
|
||||||
|
@ -802,6 +804,7 @@ public class Prog extends AbsLayout {
|
||||||
src.isShow = false;
|
src.isShow = false;
|
||||||
} else {
|
} else {
|
||||||
src.prepare(0);
|
src.prepare(0);
|
||||||
|
if(src.typ=='V') shows.add(new MainActivity.ShowHide(src.startMilli+933, src, 'V'));
|
||||||
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
shows.add(new MainActivity.ShowHide(src.startMilli+1000, src, 'S'));
|
||||||
src.isShow = true;
|
src.isShow = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class SrcVideo extends TextureView implements TextureView.SurfaceTextureL
|
||||||
ijkPlayer.seekTo(seek);
|
ijkPlayer.seekTo(seek);
|
||||||
Util.println(" Seek "+seek);
|
Util.println(" Seek "+seek);
|
||||||
}
|
}
|
||||||
if(isShown() && getAlpha()>=0.2) ijkPlayer.start();
|
if(isShown() && getAlpha()>=0.25) ijkPlayer.start();
|
||||||
});
|
});
|
||||||
ijkPlayer.setOnErrorListener((IMediaPlayer var1, int var2, int var3)->{
|
ijkPlayer.setOnErrorListener((IMediaPlayer var1, int var2, int var3)->{
|
||||||
Util.println(" Video Error: "+var1+" "+var2+" "+var3);
|
Util.println(" Video Error: "+var1+" "+var2+" "+var3);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user