hgf/Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

player

This commit is contained in:
Gangphon 2023-12-11 15:17:48 +08:00
parent 83fae2c155
commit a9994a3817
9 changed files with 154 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XixunPlayer/app/build.gradle
View File

@ -35,7 +35,7 @@ android {
dependencies { dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
// implementation 'androidx.media3:media3-exoplayer:1.2.0' implementation 'androidx.media3:media3-exoplayer:1.2.0'
// implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8' // implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
// implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8' // implementation 'tv.danmaku.ijk.media:ijkplayer-arm64:0.8.8'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'

BIN
XixunPlayer/app/libs/ijkplayer-armv7a-0.8.8.aar
View File

Binary file not shown.

5
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/EleAnaClock.java
View File

@ -32,7 +32,8 @@ public class EleAnaClock extends View implements Choreographer.FrameCallback {
public EleAnaClock(float w, float h, String path, JSMap layer, Context context) { public EleAnaClock(float w, float h, String path, JSMap layer, Context context) {
super(context); super(context);
timeZone = ZoneId.of(layer.stnn("timeZone")); var aTimeZone = layer.str("timeZone");
if(aTimeZone!=null) timeZone = ZoneId.of(aTimeZone);
img = BitmapFactory.decodeFile(path); img = BitmapFactory.decodeFile(path);
pinHourColor = Color.parseColor(layer.stnn("pinHourColor")); pinHourColor = Color.parseColor(layer.stnn("pinHourColor"));
pinMinColor = Color.parseColor(layer.stnn("pinMinColor")); pinMinColor = Color.parseColor(layer.stnn("pinMinColor"));
@ -75,7 +76,7 @@ public class EleAnaClock extends View implements Choreographer.FrameCallback {
sPath.close(); sPath.close();
} }
void cal() { void cal() {
var time = LocalTime.now(timeZone); var time = timeZone==null ? LocalTime.now() : LocalTime.now(timeZone);
sAngle = time.getSecond() * 6; sAngle = time.getSecond() * 6;
mAngle = time.getMinute() * 6 + sAngle/60; mAngle = time.getMinute() * 6 + sAngle/60;
hAngle = time.getHour() * 30 + mAngle/12; hAngle = time.getHour() * 30 + mAngle/12;

5
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/EleDigiClock.java
View File

@ -38,7 +38,8 @@ public class EleDigiClock extends LinearBox implements Choreographer.FrameCallba
public EleDigiClock(String prefix, JSMap json, Context context) { public EleDigiClock(String prefix, JSMap json, Context context) {
super(context); super(context);
setGravity(Gravity.CENTER); setGravity(Gravity.CENTER);
timeZone = ZoneId.of(json.stnn("timeZone")); var aZone = json.str("timeZone");
if(aZone!=null) timeZone = ZoneId.of(aZone);
var spaceWidth = json.dbl("spaceWidth"); var spaceWidth = json.dbl("spaceWidth");
JSList<JSMap> pics = json.jslist("arrayPics"); JSList<JSMap> pics = json.jslist("arrayPics");
for(var pic : pics) imgs.put(pic.stnn("name"), BitmapFactory.decodeFile(prefix+pic.stnn("id"))); for(var pic : pics) imgs.put(pic.stnn("name"), BitmapFactory.decodeFile(prefix+pic.stnn("id")));
@ -227,7 +228,7 @@ public class EleDigiClock extends LinearBox implements Choreographer.FrameCallba
} }
void cal() { void cal() {
var dt = LocalDateTime.now(timeZone); var dt = timeZone==null ? LocalDateTime.now() : LocalDateTime.now(timeZone);
var time = dt.toLocalTime(); var time = dt.toLocalTime();
var hms = Dates.fmt(time, timeptn); var hms = Dates.fmt(time, timeptn);
ampmComp.setImageBitmap(imgs.get(time.getHour()<12?"AM":"PM")); ampmComp.setImageBitmap(imgs.get(time.getHour()<12?"AM":"PM"));

7
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/EleScroll.java
View File

@ -14,12 +14,15 @@ import gnph.util.JSMap;
public class EleScroll extends View implements DrawOther, Choreographer.FrameCallback { public class EleScroll extends View implements DrawOther, Choreographer.FrameCallback {
ArrayList<EleOtherPart> others; ArrayList<EleOtherPart> others;
int w, h;
Bitmap img; Bitmap img;
int interval, cur, end, step; int interval, cur, end, step;
char effect; char effect;
public EleScroll(String dirPre, JSMap json, Context context) { public EleScroll(Context context, String dirPre, JSMap json, int w, int h) {
super(context); super(context);
this.w = w;
this.h = h;
img = BitmapFactory.decodeFile(dirPre + json.stnn("id")); img = BitmapFactory.decodeFile(dirPre + json.stnn("id"));
var effStr = json.str("effect"); var effStr = json.str("effect");
if(effStr==null || effStr.equals("no")) return; if(effStr==null || effStr.equals("no")) return;
@ -61,7 +64,7 @@ public class EleScroll extends View implements DrawOther, Choreographer.FrameCal
canvas.drawBitmap(img, cur, 0, null); canvas.drawBitmap(img, cur, 0, null);
canvas.drawBitmap(img, cur+img.getWidth(), 0, null); canvas.drawBitmap(img, cur+img.getWidth(), 0, null);
} else if(effect=='r') { } else if(effect=='r') {
var x = cur-img.getWidth()+getWidth(); var x = cur-img.getWidth()+w;
canvas.drawBitmap(img, x, 0, null); canvas.drawBitmap(img, x, 0, null);
canvas.drawBitmap(img, x-img.getWidth(), 0, null); canvas.drawBitmap(img, x-img.getWidth(), 0, null);
} else if(effect=='t') { } else if(effect=='t') {

109
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/EleVideo.java
View File

@ -4,36 +4,68 @@ import android.content.Context;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import androidx.annotation.OptIn;
import androidx.media3.common.MediaItem;
import androidx.media3.common.util.UnstableApi;
import androidx.media3.exoplayer.ExoPlayer;
import androidx.media3.exoplayer.SeekParameters;
import tv.danmaku.ijk.media.player.IMediaPlayer;
import tv.danmaku.ijk.media.player.IjkMediaPlayer; import tv.danmaku.ijk.media.player.IjkMediaPlayer;
public class EleVideo extends SurfaceView { public class EleVideo extends SurfaceView implements SurfaceHolder.Callback {
String path;
float vol;
IjkMediaPlayer ijkPlayer; IjkMediaPlayer ijkPlayer;
ExoPlayer exoPlayer;
public EleVideo(Context context, String path, float vol) { public EleVideo(Context context, String path, float vol) {
super(context); super(context);
initIjk(path, vol); this.path = path;
this.vol = vol;
initIjk();
} }
// @OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
// void initExo(String path, float vol) { void initExo() {
// exoPlayer = new ExoPlayer.Builder(getContext()).build(); exoPlayer = new ExoPlayer.Builder(getContext()).build();
// exoPlayer.setMediaItem(MediaItem.fromUri(path)); exoPlayer.setMediaItem(MediaItem.fromUri(path));
// exoPlayer.setRepeatMode(ExoPlayer.REPEAT_MODE_ONE); exoPlayer.setRepeatMode(ExoPlayer.REPEAT_MODE_ONE);
// exoPlayer.setSeekParameters(SeekParameters.CLOSEST_SYNC); exoPlayer.setSeekParameters(SeekParameters.CLOSEST_SYNC);
// exoPlayer.setVolume(vol); exoPlayer.setVolume(vol);
// exoPlayer.setVideoSurfaceView(this); exoPlayer.setVideoSurfaceView(this);
// } exoPlayer.prepare();
void initIjk(String path, float vol) { }
void initIjk() {
ijkPlayer = new IjkMediaPlayer(); ijkPlayer = new IjkMediaPlayer();
//ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec", 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_FORMAT, "analyzeduration", 1);
ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_CODEC, "skip_loop_filter", 48); ijkPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_CODEC, "skip_loop_filter", 48);
try { try {
getHolder().addCallback(new SurfaceHolder.Callback() { getHolder().addCallback(this);
ijkPlayer.setDataSource(path);
ijkPlayer.setLooping(true);
ijkPlayer.setVolume(vol, vol);
ijkPlayer.setOnPreparedListener((IMediaPlayer var1)->{
if(ijkPlayer.getBitRate() > 12000000) {
getHolder().removeCallback(this);
release();
initExo();
}
if(isShown()) start();
});
ijkPlayer.prepareAsync();
} catch (Throwable e) {
Util.makeText(getContext(), e.getMessage()).show();
e.printStackTrace();
ijkPlayer = null;
}
}
@Override @Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
ijkPlayer.setDisplay(holder); if(ijkPlayer!=null) ijkPlayer.setDisplay(holder);
} }
@Override @Override
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
@ -43,54 +75,43 @@ public class EleVideo extends SurfaceView {
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
System.out.println("surfaceDestroyed"); System.out.println("surfaceDestroyed");
} }
});
ijkPlayer.setDataSource(path);
ijkPlayer.setLooping(true);
ijkPlayer.setVolume(vol, vol);
ijkPlayer.prepareAsync();
} catch (Throwable e) {
Util.makeText(getContext(), e.getMessage()).show();
e.printStackTrace();
ijkPlayer = null;
}
}
void start() { void start() {
if(ijkPlayer!=null) ijkPlayer.start(); if(ijkPlayer!=null) ijkPlayer.start();
// else if(exoPlayer!=null) { else if(exoPlayer!=null) {
// if(exoPlayer.getPlaybackState()==ExoPlayer.STATE_IDLE) exoPlayer.prepare(); if(exoPlayer.getPlaybackState()==ExoPlayer.STATE_IDLE) exoPlayer.prepare();
// exoPlayer.play(); exoPlayer.play();
// } }
} }
void pause() { void pause() {
if(ijkPlayer!=null) { if(ijkPlayer!=null) {
ijkPlayer.pause(); ijkPlayer.pause();
ijkPlayer.seekTo(0); ijkPlayer.seekTo(0);
} }
// if(exoPlayer!=null && exoPlayer.isPlaying()) { if(exoPlayer!=null && exoPlayer.isPlaying()) {
// exoPlayer.pause(); exoPlayer.pause();
// exoPlayer.seekToDefaultPosition(); exoPlayer.seekToDefaultPosition();
// } }
} }
void release() { void release() {
if(ijkPlayer!=null) { if(ijkPlayer!=null) {
ijkPlayer.release(); ijkPlayer.release();
ijkPlayer = null; ijkPlayer = null;
} }
// if(exoPlayer!=null) { if(exoPlayer!=null) {
// exoPlayer.release(); exoPlayer.release();
// exoPlayer = null; exoPlayer = null;
// } }
} }
String getState() { String getState() {
// else if(exoPlayer!=null) { if(exoPlayer!=null) {
// var state = exoPlayer.getPlaybackState(); var state = exoPlayer.getPlaybackState();
// if(state==ExoPlayer.STATE_IDLE) return "STATE_IDLE"; if(state==ExoPlayer.STATE_IDLE) return "STATE_IDLE";
// if(state==ExoPlayer.STATE_BUFFERING) return "STATE_BUFFERING"; if(state==ExoPlayer.STATE_BUFFERING) return "STATE_BUFFERING";
// if(state==ExoPlayer.STATE_READY) return "STATE_READY"; if(state==ExoPlayer.STATE_READY) return "STATE_READY";
// if(state==ExoPlayer.STATE_ENDED) return "STATE_ENDED"; if(state==ExoPlayer.STATE_ENDED) return "STATE_ENDED";
// } }
return "null"; return "null";
} }

95
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
View File

@ -26,6 +26,7 @@ import androidx.annotation.OptIn;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.media3.common.util.UnstableApi;
import com.xixun.joey.aidlset.CardService; import com.xixun.joey.aidlset.CardService;
@ -49,6 +50,7 @@ import gnph.util.JSList;
import gnph.util.JSMap; import gnph.util.JSMap;
import gnph.util.NumFmts; import gnph.util.NumFmts;
import gnph.util.O; import gnph.util.O;
import tv.danmaku.ijk.media.player.IjkMediaMeta;
public class MainActivity extends ComponentActivity implements Choreographer.FrameCallback, Runnable { public class MainActivity extends ComponentActivity implements Choreographer.FrameCallback, Runnable {
@ -180,7 +182,6 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
waitTo = 0; waitTo = 0;
var page = page(0); var page = page(0);
dur = page.tDur; dur = page.tDur;
progView.stopAndPrepare(curAva);
page.setMillis(millis); page.setMillis(millis);
if(state != 6) { if(state != 6) {
setContentView(progView); setContentView(progView);
@ -200,12 +201,14 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
new Thread(this).start(); new Thread(this).start();
} }
public boolean delProgFile() { public void stopProg() {
if(progView!=null) { if(progView==null) return;
progView.release(); progView.release();
progView = null; progView = null;
setContentView(backView); setContentView(backView);
} }
public boolean delProgFile() {
stopProg();
var files = new File(Util.programDir).listFiles(); var files = new File(Util.programDir).listFiles();
var ok = true; var ok = true;
if(files != null) for(var file : files) if(! file.delete()) ok = false; if(files != null) for(var file : files) if(! file.delete()) ok = false;
@ -281,7 +284,6 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
choreographer.postFrameCallback(this); choreographer.postFrameCallback(this);
return; return;
} }
progView.stopAndPrepare(curAva);
} }
} }
page(curAva).setMillis(lastPage.endMilli); page(curAva).setMillis(lastPage.endMilli);
@ -347,7 +349,6 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
syncMs = milli; syncMs = milli;
buf.append("Sync. milli:").append(milli).append(" start:").append(start).append(" diff:").append(milli - start).append("\n"); buf.append("Sync. milli:").append(milli).append(" start:").append(start).append(" diff:").append(milli - start).append("\n");
} }
progView.stopAndPrepare(curAva);
page(curAva).setMillis(start); page(curAva).setMillis(start);
if(state != 6) { if(state != 6) {
setContentView(progView); setContentView(progView);
@ -360,7 +361,7 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
return progView.pages.get(progView.avas.get(i)); return progView.pages.get(progView.avas.get(i));
} }
public void run() { @OptIn(markerClass = UnstableApi.class) public void run() {
try { try {
var serverSocket = new ServerSocket(3333); var serverSocket = new ServerSocket(3333);
while(true) { while(true) {
@ -386,35 +387,7 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
} }
new JSMap("_type", _type, "idList", ids).write(out); new JSMap("_type", _type, "idList", ids).write(out);
} else if("proStart".equals(_type)) { } else if("proStart".equals(_type)) {
var proSize = obj.intg("proSize"); Util.deleteFiles(obj.intg("proSize"), hases);
var statFs = new StatFs(Environment.getExternalStorageDirectory().getPath());
var remain = statFs.getAvailableBytes() - proSize - 1048576;
if(remain < 0) {
var latch = new CountDownLatch(1);
runOnUiThread(() -> {
System.out.println("removeAllViews ...");
if(progView!=null) {
progView.release();
progView = null;
setContentView(backView);
}
latch.countDown();
});
var files = new File(Util.programDir).listFiles();
if(files == null) return;
Arrays.sort(files, (f1, f2) -> (int) (f1.lastModified() - f2.lastModified()));
try {
latch.await();
} catch (InterruptedException ignored) {}
for(var file : files) {
if(hases!=null && hases.contains(file.getName())) continue;
var len = file.length();
if(file.delete()) {
remain += len;
if(remain>=0) break;
}
}
}
} else if("fileStart".equals(_type)) { } else if("fileStart".equals(_type)) {
var size = obj.intg("size"); var size = obj.intg("size");
var name = obj.stnn("id"); var name = obj.stnn("id");
@ -439,7 +412,6 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
new JSMap("success", true).write(out); new JSMap("success", true).write(out);
} else if("proEnd".equals(_type)) { } else if("proEnd".equals(_type)) {
new JSMap("success", true).write(out); new JSMap("success", true).write(out);
buf.append("proEnd\n");
runOnUiThread(this::initProg); runOnUiThread(this::initProg);
} else if("DelPrograms".equals(_type)) { } else if("DelPrograms".equals(_type)) {
var latch = new CountDownLatch(1); var latch = new CountDownLatch(1);
@ -475,12 +447,14 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
writer.append(" Sync: ").append(Dates.fmt(syncMs, fmt)).append("\n"); writer.append(" Sync: ").append(Dates.fmt(syncMs, fmt)).append("\n");
writer.append("Page End: ").append(progView==null || progView.avas.isEmpty() ? "0" : Dates.fmt(page(curAva).endMilli, fmt)).append(" CurPage: ").append(String.valueOf(curAva)).append(" / ").append(progView==null || progView.avas.isEmpty() ? "0" : String.valueOf(progView.avas.get(curAva))).append("\n"); writer.append("Page End: ").append(progView==null || progView.avas.isEmpty() ? "0" : Dates.fmt(page(curAva).endMilli, fmt)).append(" CurPage: ").append(String.valueOf(curAva)).append(" / ").append(progView==null || progView.avas.isEmpty() ? "0" : String.valueOf(progView.avas.get(curAva))).append("\n");
writer.append(" Current: ").append(Dates.fmt(System.currentTimeMillis(), fmt)).append("\n"); writer.append(" Current: ").append(Dates.fmt(System.currentTimeMillis(), fmt)).append("\n");
var statFs = new StatFs(Environment.getExternalStorageDirectory().getPath());
writer.append(" Disk: ").append(String.valueOf(statFs.getTotalBytes()/1000000)).append(" ").append(String.valueOf(statFs.getAvailableBytes()/1000000)).append(" ").append(String.valueOf(statFs.getFreeBytes()/1000000)).append(" (total avail free)\n");
var actManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE); var actManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
var memoryInfo = new ActivityManager.MemoryInfo(); var memoryInfo = new ActivityManager.MemoryInfo();
actManager.getMemoryInfo(memoryInfo); actManager.getMemoryInfo(memoryInfo);
writer.append(" Memory: ").append(String.valueOf(memoryInfo.totalMem/1000000)).append(" ").append(String.valueOf(memoryInfo.availMem/1000000)).append(" ").append(String.valueOf(memoryInfo.threshold/1000000)).append(" ").append(String.valueOf(memoryInfo.lowMemory)).append(" (total avail threshold low)\n"); writer.append(" Memory: ").append(String.valueOf(memoryInfo.totalMem/1000000)).append(" ").append(String.valueOf(memoryInfo.availMem/1000000)).append(" ").append(String.valueOf(memoryInfo.threshold/1000000)).append(" ").append(String.valueOf(memoryInfo.lowMemory)).append(" (total avail threshold low)\n");
var runtime = Runtime.getRuntime(); var runtime = Runtime.getRuntime();
writer.append("Runtime Memory: ").append(String.valueOf(runtime.maxMemory()/1000000)).append(" ").append(String.valueOf(runtime.totalMemory()/1000000)).append(" ").append(NumFmts.cfix2().format(runtime.freeMemory()*0.000001)).append(" (max total free)\n"); writer.append("Runtime: ").append(String.valueOf(runtime.maxMemory()/1000000)).append(" ").append(String.valueOf(runtime.totalMemory()/1000000)).append(" ").append(NumFmts.cfix2().format(runtime.freeMemory()*0.000001)).append(" (max total free)\n");
var latch = new CountDownLatch(1); var latch = new CountDownLatch(1);
runOnUiThread(() -> { runOnUiThread(() -> {
if(! progView.avas.isEmpty()) { if(! progView.avas.isEmpty()) {
@ -490,26 +464,24 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
if(ele.view instanceof EleVideo) { if(ele.view instanceof EleVideo) {
var view = (EleVideo) ele.view; var view = (EleVideo) ele.view;
if(view.ijkPlayer!=null) { if(view.ijkPlayer!=null) {
writer.append("isVideoPlaying: ").append(String.valueOf(view.ijkPlayer.isPlaying())).append("\n"); writer.append("VideoPlaying: ").append(String.valueOf(view.ijkPlayer.isPlaying())).append(" ").append(String.valueOf(view.ijkPlayer.getCurrentPosition())).append("/").append(String.valueOf(view.ijkPlayer.getDuration())).append("\n");
writer.append("getVideoDecoder: ").append(String.valueOf(view.ijkPlayer.getVideoDecoder())).append("\n"); writer.append(" BitRate: ").append(String.valueOf(view.ijkPlayer.getBitRate()/1000)).append("\n");
var MediaInfo = view.ijkPlayer.getMediaInfo(); writer.append("VideoDecoder: ").append(String.valueOf(view.ijkPlayer.getVideoDecoder())).append("\n");
writer.append("mMediaPlayerName: ").append(MediaInfo.mMediaPlayerName).append("\n"); var mediaInfo = view.ijkPlayer.getMediaInfo();
writer.append("mVideoDecoder: ").append(MediaInfo.mVideoDecoder).append("\n"); writer.append("Format: ").append(mediaInfo.mMeta.mFormat).append("\n");
writer.append("mVideoDecoderImpl: ").append(MediaInfo.mVideoDecoderImpl).append("\n"); writer.append("VideoDecoder: ").append(mediaInfo.mVideoDecoder).append(" ").append(mediaInfo.mVideoDecoderImpl).append("\n");
writer.append("mAudioDecoder: ").append(MediaInfo.mAudioDecoder).append("\n"); writer.append("AudioDecoder: ").append(mediaInfo.mAudioDecoder).append(" ").append(mediaInfo.mAudioDecoderImpl).append("\n");
writer.append("mAudioDecoderImpl: ").append(MediaInfo.mAudioDecoderImpl).append("\n"); //writer.append("PROFILE: ").append(mediaInfo.mMeta.getString(IjkMediaMeta.IJKM_KEY_CODEC_PROFILE)).append("\n");
writer.append("mFormat: ").append(MediaInfo.mMeta.mFormat).append("\n"); } else if(view.exoPlayer!=null) {
writer.append("isVideoPlaying: ").append(String.valueOf(view.exoPlayer.isPlaying())).append(" ").append(String.valueOf(view.exoPlayer.getCurrentPosition())).append("/").append(String.valueOf(view.exoPlayer.getDuration())).append("\n");
writer.append("getPlaybackState: ").append(view.getState()).append("\n");
writer.append("getPlayerError: ").append(String.valueOf(view.exoPlayer.getPlayerError())).append("\n");
writer.append("getVideoFormat: ").append(String.valueOf(view.exoPlayer.getVideoFormat())).append("\n");
var cnt = view.exoPlayer.getRendererCount();
for(int rr=0; rr<cnt; rr++) writer.append(" Renderer: ").append(String.valueOf(view.exoPlayer.getRendererType(rr))).append(" ").append(String.valueOf(view.exoPlayer.getRenderer(rr))).append("\n");
writer.append("getPlaybackParameters: ").append(String.valueOf(view.exoPlayer.getPlaybackParameters())).append("\n");
} }
// else if(view.exoPlayer!=null) { writer.append("\n");
// writer.append("isVideoPlaying: ").append(String.valueOf(view.exoPlayer.isPlaying())).append(String.valueOf(view.exoPlayer.getCurrentPosition())).append("/").append(String.valueOf(view.exoPlayer.getDuration())).append("\n");
// writer.append("getPlaybackState: ").append(view.getState()).append("\n");
// writer.append("getPlayerError: ").append(String.valueOf(view.exoPlayer.getPlayerError())).append("\n");
// writer.append("getPlaybackSuppressionReason: ").append(String.valueOf(view.exoPlayer.getPlaybackSuppressionReason())).append("\n");
// writer.append("getVideoFormat: ").append(String.valueOf(view.exoPlayer.getVideoFormat())).append("\n");
// var cnt = view.exoPlayer.getRendererCount();
// for(int rr=0; rr<cnt; rr++) writer.append(" Renderer: ").append(String.valueOf(view.exoPlayer.getRendererType(rr))).append(" ").append(String.valueOf(view.exoPlayer.getRenderer(rr))).append("\n");
// writer.append("getPlaybackParameters: ").append(String.valueOf(view.exoPlayer.getPlaybackParameters())).append("\n");
// }
} else if(ele.view instanceof WebView) { } else if(ele.view instanceof WebView) {
var view = (WebView) ele.view; var view = (WebView) ele.view;
writer.append("Title: ").append(view.getTitle()).append("\n"); writer.append("Title: ").append(view.getTitle()).append("\n");
@ -529,6 +501,17 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
writer.flush(); writer.flush();
} else if("GetLog".equals(_type)) { } else if("GetLog".equals(_type)) {
out.write(buf.toString().getBytes()); out.write(buf.toString().getBytes());
} else if("ListProgFiles".equals(_type)) {
var files = new File(Util.programDir).listFiles();
if(files == null) return;
Arrays.sort(files, (f1, f2) -> (int) (f2.lastModified() - f1.lastModified()));
var writer = new OutputStreamWriter(out);
for(var file : files) {
var len = file.length();
writer.append(file.getName()).append(' ').append(String.valueOf(file.length())).append('\n');
}
writer.append('\n');
writer.flush();
} else if("GetFile".equals(_type)) { } else if("GetFile".equals(_type)) {
var name = obj.str("name"); var name = obj.str("name");
if(name!=null) IOs.writeCloseIn(out, new FileInputStream(Util.programDir+"/"+name)); if(name!=null) IOs.writeCloseIn(out, new FileInputStream(Util.programDir+"/"+name));

5
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Prog.java
View File

@ -80,7 +80,7 @@ public class Prog extends AbsLayout {
} else if(ele.type.equals("MultiPng")) { } else if(ele.type.equals("MultiPng")) {
JSList<JSMap> imgs = source.jslist("arrayPics"); JSList<JSMap> imgs = source.jslist("arrayPics");
if(imgs.isEmpty()) continue; if(imgs.isEmpty()) continue;
if(imgs.size()==1 && imgs.get(0).intg("picDuration")==0) ele.view = new EleScroll(Util.programDir+"/", imgs.get(0), context); if(imgs.size()==1 && imgs.get(0).intg("picDuration")==0) ele.view = new EleScroll(context, Util.programDir+"/", imgs.get(0), w, h);
else ele.view = new EleFlip(Util.programDir+"/", imgs, context); else ele.view = new EleFlip(Util.programDir+"/", imgs, context);
} else if(ele.type.equals("SplitText")) { } else if(ele.type.equals("SplitText")) {
JSList<JSMap> imgs = source.jslist("arrayPics"); JSList<JSMap> imgs = source.jslist("arrayPics");
@ -88,7 +88,7 @@ public class Prog extends AbsLayout {
ele.view = new AbsLayout(context); ele.view = new AbsLayout(context);
var partHeight = _program.intg("height"); var partHeight = _program.intg("height");
if(imgs.size()==1 && imgs.get(0).intg("picDuration")==0) { if(imgs.size()==1 && imgs.get(0).intg("picDuration")==0) {
var view = new EleScroll(Util.programDir+"/", imgs.get(0), context); var view = new EleScroll(context, Util.programDir+"/", imgs.get(0), w, h);
((AbsLayout) ele.view).addView(view, new AbsLayout.LayoutParams(x, y, splitWidths.get(0).intValue(), h)); ((AbsLayout) ele.view).addView(view, new AbsLayout.LayoutParams(x, y, splitWidths.get(0).intValue(), h));
view.others = new ArrayList<>(); view.others = new ArrayList<>();
for(int i=1; i<splitWidths.size(); i++) { for(int i=1; i<splitWidths.size(); i++) {
@ -184,7 +184,6 @@ public class Prog extends AbsLayout {
public static class Source { public static class Source {
View view; View view;
long prepareMilli;
long startMilli; long startMilli;
long endMilli = Long.MAX_VALUE; long endMilli = Long.MAX_VALUE;
int startTime; int startTime;

31
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Util.java
View File

@ -1,13 +1,18 @@
package com.xixun.xixunplayer; package com.xixun.xixunplayer;
import android.content.Context; import android.content.Context;
import android.os.Environment;
import android.os.StatFs;
import android.view.Gravity; import android.view.Gravity;
import android.widget.Toast; import android.widget.Toast;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import gnph.util.IOs; import gnph.util.IOs;
@ -55,4 +60,30 @@ public class Util {
return ""; return "";
} }
} }
public static void deleteFiles(int proSize, List<String> keeps) {
var statFs = new StatFs(Environment.getExternalStorageDirectory().getPath());
var remain = statFs.getAvailableBytes() - proSize - 1048576;
if(remain >= 0) return;
var latch = new CountDownLatch(1);
MainActivity.ins.runOnUiThread(() -> {
System.out.println("stopProg ...");
MainActivity.ins.stopProg();
latch.countDown();
});
var files = new File(Util.programDir).listFiles();
if(files == null) return;
Arrays.sort(files, (f1, f2) -> (int) (f1.lastModified() - f2.lastModified()));
try {
latch.await();
} catch (InterruptedException ignored) {}
for(var file : files) {
if(keeps!=null && keeps.contains(file.getName())) continue;
var len = file.length();
if(file.delete()) {
remain += len;
if(remain>=0) break;
}
}
}
} }