From a20ef88c1935bc05d98b6b06f396dd6bdb7db892 Mon Sep 17 00:00:00 2001 From: Gangphon Date: Fri, 22 Aug 2025 23:08:48 +0800 Subject: [PATCH] 2.2.3 --- XixunPlayer/app/build.gradle | 2 +- XixunPlayer/app/libs/gnph.jar | Bin 174804 -> 174832 bytes .../com/xixun/xixunplayer/MainActivity.java | 6 ------ .../main/java/com/xixun/xixunplayer/Prog.java | 3 --- .../java/com/xixun/xixunplayer/SrcVideo.java | 12 ++++++------ .../java/com/xixun/xixunplayer/TCPThread.java | 10 +++++----- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/XixunPlayer/app/build.gradle b/XixunPlayer/app/build.gradle index ca4709c..2951d8e 100644 --- a/XixunPlayer/app/build.gradle +++ b/XixunPlayer/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 34 versionCode 1 - versionName "2.2.1-N" + versionName "2.2.4-N" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/XixunPlayer/app/libs/gnph.jar b/XixunPlayer/app/libs/gnph.jar index 49484bfec10b65bc8e5ea6f842d740f99d12fdea..1e84bf1722170030b8246ab16ec9adf84df0e67a 100644 GIT binary patch delta 13046 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 P&>sf_3|1Qjk-+{R5sr}t delta 13120 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 diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java index 4250d1f..0035293 100644 --- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java +++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java @@ -597,12 +597,6 @@ public class MainActivity extends Activity implements Choreographer.FrameCallbac } else if(showHide.act=='S') { showHide.src.show(); 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(); } boolean noProg = progView == null && insView==null; diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Prog.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Prog.java index 4900b81..c0965ab 100644 --- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Prog.java +++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Prog.java @@ -760,7 +760,6 @@ public class Prog extends AbsLayout { src.startMilli = start + src.startTime; if(src.startTime == 0) { 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')); src.isShow = true; } @@ -789,7 +788,6 @@ public class Prog extends AbsLayout { else src.doEff(); } else if(milli < src.endMilli && 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')); src.isShow = true; } @@ -804,7 +802,6 @@ public class Prog extends AbsLayout { src.isShow = false; } else { 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')); src.isShow = true; } diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVideo.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVideo.java index ec8cab8..0390d82 100644 --- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVideo.java +++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVideo.java @@ -27,7 +27,7 @@ public class SrcVideo extends TextureView implements TextureView.SurfaceTextureL ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec-avc", 1); ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec-hevc", 1); } - ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "start-on-prepared", 0); + //ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "start-on-prepared", 0); ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "analyzeduration", 1); ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_CODEC, "skip_loop_filter", 12); try { @@ -36,14 +36,14 @@ public class SrcVideo extends TextureView implements TextureView.SurfaceTextureL ijkPlayer.setVolume(vol, vol); ijkPlayer.setOnPreparedListener((IMediaPlayer var1)->{ ijkPlayer.setOnPreparedListener(null); + if(getAlpha() < 0.25) { + ijkPlayer.pause(); + ijkPlayer.seekTo(seek<500 ? 0 : seek); + } else if(seek>=1000) ijkPlayer.seekTo(seek); bitRate = ijkPlayer.getBitRate(); var diff = dur - ijkPlayer.getDuration(); if(diff>0 && diff<=1000) ijkPlayer.setLooping(false); - if(seek>=1000) { - ijkPlayer.seekTo(seek); - Util.println(" Seek "+seek); - } - if(isShown() && getAlpha()>=0.25) ijkPlayer.start(); + Util.println(" Seek "+seek); }); ijkPlayer.setOnErrorListener((IMediaPlayer var1, int var2, int var3)->{ Util.println(" Video Error: "+var1+" "+var2+" "+var3); diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/TCPThread.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/TCPThread.java index 4b90d19..1c9c4f1 100644 --- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/TCPThread.java +++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/TCPThread.java @@ -93,7 +93,7 @@ public class TCPThread extends Thread { for(var fil : files) { var name = fil.stnn("name"); var file = new File(Util.programDir + "/" + name); - if(file.isFile() && file.length()==fil.intg("size")) existed.add(name); + if(file.isFile() && file.length()==fil.lng("size")) existed.add(name); } new JSMap("_type", _type, "existed", existed).write(out); } @@ -101,7 +101,7 @@ public class TCPThread extends Thread { Util.downId = 0; Util.deleteFiles(obj.intg("proSize"), existed); } else if("fileStart".equals(_type)) { - var size = obj.intg("size"); + var size = obj.lng("size"); var name = obj.stnn("id"); Util.println(" size: " + size + " name: " + name); if(name.equals("program")) { @@ -121,7 +121,7 @@ public class TCPThread extends Thread { } } else if("setBackImg".equals(_type) || "imgFileStart".equals(_type)) { var fout = new FileOutputStream(Util.backImgFile); - IOs.write(fout, in, obj.intg("size")); + IOs.write(fout, in, obj.lng("size")); fout.flush(); fout.getFD().sync(); fout.close(); @@ -314,9 +314,9 @@ public class TCPThread extends Thread { if(main!=null) main.runOnUiThread(() -> { if(! main.avas.isEmpty()) { var page = main.avas.get(main.curAva); - for(var layer : page.layers) for(var src : layer.srcs) if(src.view.getVisibility()==VISIBLE) { + for(var layer : page.layers) for(var src : layer.srcs) if(src.alphaShow==1 && src.view!=null && src.view.getVisibility()==VISIBLE) { try { - if(src.view instanceof SrcVideo) { + if(src.typ == 'V') { var view = (SrcVideo) src.view; if(view.ijkPlayer!=null) { writer.append("VideoPlaying: ").append(String.valueOf(view.ijkPlayer.isPlaying())).append("\tCur/Dur: ").append(String.valueOf(view.ijkPlayer.getCurrentPosition())).append("/").append(String.valueOf(view.ijkPlayer.getDuration())).append("\n");