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

2.2.1

This commit is contained in:
Gangphon 2025-08-20 23:02:25 +08:00
parent 4ed50ee982
commit 1329d0b66d
7 changed files with 98 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XixunPlayer/app/build.gradle
View File

@ -11,7 +11,7 @@ android {
minSdk 21
targetSdk 34
versionCode 1
versionName "2.2-beta8-NTimes"
versionName "2.2.1-N"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

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

@ -620,7 +620,7 @@ public class MainActivity extends Activity implements Choreographer.FrameCallbac
var lastPage = avas.get(curAva);
if(milli < lastPage.endMilli) lastPage.showHideSrcs(milli, showHides);
else {
for(var layer : lastPage.layers) for(var src : layer.srcs) {
for(var layer : lastPage.layers) for(var src : layer.srcs) if(src.isShow) {
showHides.add(new ShowHide(lastPage.endMilli+1000, src, 'H'));
src.isShow = false;
}

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

@ -373,8 +373,10 @@ public class Prog extends AbsLayout {
} else if(src.type.equals("DigitalClock")) src.view = new SrcDigitalClock(this, source);
else if(src.type.startsWith("DigitalClock")) src.view = new SrcDigiClock(this, source);
else if(src.type.equals("AnalogClock")) src.view = new SrcAnaClock(this, geo.width, geo.height, Util.programDir + "/" + id, source);
else if(src.type.equals("WebURL")) src.view = new SrcWeb(this, source);
else if(src.type.equals("Timer")) src.view = new SrcTimer(this, source);
else if(src.type.equals("WebURL")) {
var url = source.str("url");
if(url!=null) src.view = new SrcWeb(this, url, source);
} else if(src.type.equals("Timer")) src.view = new SrcTimer(this, source);
else if(src.type.equals("Countdown")) src.view = new SrcCountdown(this, source);
else if(src.type.startsWith("Environ")) src.view = new SrcEnviron(this, source);
else if(src.type.startsWith("Weather")) src.view = new SrcWeather(context, source);
@ -510,7 +512,7 @@ public class Prog extends AbsLayout {
TextToSpeech tts;
String text;
boolean isShow, isEntryRand, isExitRand;
char typ;
char typ, alphaShow = 1;
AbsLayout box;
String path;
float vol;
@ -524,8 +526,14 @@ public class Prog extends AbsLayout {
}
void show() {
if(view.getVisibility()==VISIBLE) return;
view.setVisibility(VISIBLE);
if(typ=='V') {
if(alphaShow==1) return;
((SrcVideo)view).ijkPlayer.start();
view.setAlpha((alphaShow = 1) * alpha);
} else {
if(view.getVisibility()==VISIBLE) return;
view.setVisibility(VISIBLE);
}
ff = 0;
if(isEntryRand) entryEff = Effect.values()[Util.rand.nextInt(Effect.values().length)];
if(isExitRand) exitEff = Effect.values()[Util.rand.nextInt(Effect.values().length)];
@ -534,8 +542,15 @@ public class Prog extends AbsLayout {
if(tts!=null) tts.speak(text, TextToSpeech.QUEUE_FLUSH, null, null);
}
void hide() {
if(view.getVisibility()!=VISIBLE) return;
view.setVisibility(GONE);
if(typ=='V') {
if(alphaShow==0) return;
view.setAlpha(alphaShow = 0);
((SrcVideo)view).ijkPlayer.pause();
((SrcVideo)view).ijkPlayer.seekTo(0);
} else {
if(view.getVisibility() != VISIBLE) return;
view.setVisibility(GONE);
}
if(view instanceof GifImageView) ((GifImageView) view).setImageURI(uri);
if(tts!=null && tts.isSpeaking()) tts.stop();
}
@ -544,7 +559,8 @@ public class Prog extends AbsLayout {
if(view==null) {
var video = new SrcVideo(box.getContext(), path, vol, dur, seek, useSW);
video.setLayoutParams(geo);
video.setVisibility(GONE);
video.setAlpha(alphaShow = 0);
video.setVisibility(VISIBLE);
box.addView(view = video);
}
ms = System.currentTimeMillis() - ms;
@ -580,7 +596,7 @@ public class Prog extends AbsLayout {
else if(entryEff == Effect.MOVE_TOP) view.setTranslationY(h - ff*h/(float) entryDur);
else if(entryEff == Effect.MOVE_RIGHT) view.setTranslationX(ff*w/(float) entryDur - w);
else if(entryEff == Effect.MOVE_BOTTOM) view.setTranslationY(ff*h/(float) entryDur - h);
else if(entryEff == Effect.FADE) view.setAlpha(alpha * ff / entryDur);
else if(entryEff == Effect.FADE) view.setAlpha(alphaShow * alpha * ff / entryDur);
else if(entryEff == Effect.ZOOM) {
setScaleX(ff / (float) entryDur);
setScaleY(view.getScaleX());
@ -618,7 +634,7 @@ public class Prog extends AbsLayout {
view.setRotation(rotate - view.getScaleX() * 360);
}
} else if(ff>=exitStart) {
if(ff-1 <= exitStart && (blinkHalf!=0 || breathe!=0)) view.setAlpha(alpha);
if(ff-1 <= exitStart && (blinkHalf!=0 || breathe!=0)) view.setAlpha(alphaShow * alpha);
var fff = ff - exitStart;
if(fff > exitDur) fff = exitDur;
if(exitEff == Effect.EXPAND_HOR) setScaleX(1 - fff / (float) exitDur);
@ -644,7 +660,7 @@ public class Prog extends AbsLayout {
else if(exitEff == Effect.MOVE_RIGHT) view.setTranslationX(fff*w / (float) exitDur);
else if(exitEff == Effect.MOVE_TOP) view.setTranslationY(- fff*h / (float) exitDur);
else if(exitEff == Effect.MOVE_BOTTOM) view.setTranslationY(fff*h / (float) exitDur);
else if(exitEff == Effect.FADE) view.setAlpha(alpha - alpha * fff / exitDur);
else if(exitEff == Effect.FADE) view.setAlpha(alphaShow * (alpha - alpha * fff / exitDur));
else if(exitEff == Effect.ZOOM) {
setScaleX(1 - fff / (float) exitDur);
setScaleY(view.getScaleX());
@ -685,7 +701,7 @@ public class Prog extends AbsLayout {
}
} else {
resetEff();
if(blinkHalf!=0) view.setAlpha((ff / blinkHalf & 1) == 0 ? alpha : 0);
if(blinkHalf!=0) view.setAlpha((ff / blinkHalf & 1) == 0 ? alphaShow * alpha : 0);
else if(breathe!=0) view.setAlpha((float) (Math.cos(ff%breathe*2*Math.PI/breathe)/2+0.5));
}
ff++;
@ -693,7 +709,7 @@ public class Prog extends AbsLayout {
void resetEff() {
view.setTranslationX(0);
view.setTranslationY(0);
view.setAlpha(alpha);
view.setAlpha(alphaShow * alpha);
view.setScaleX(scaleX);
view.setScaleY(scaleY);
view.setRotation(rotate);

2
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcEnviron.java
View File

@ -124,7 +124,7 @@ public class SrcEnviron extends View implements Choreographer.FrameCallback, Int
try {
for(var item : items) {
item.nums.clear();
if(item.unit==null) {
if(item.key.startsWith("windDir")) {
var num = intent.getIntExtra(item.key, -1);
if(num>=0 && num<=15) {
if(directs[num].length() < 3) item.nums.add(imgMap.get(directs[num]));

20
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVideo.java
View File

@ -43,7 +43,7 @@ public class SrcVideo extends TextureView implements TextureView.SurfaceTextureL
ijkPlayer.seekTo(seek);
Util.println(" Seek "+seek);
}
if(isShown()) ijkPlayer.start();
if(isShown() && getAlpha()>=0.2) ijkPlayer.start();
});
ijkPlayer.setOnErrorListener((IMediaPlayer var1, int var2, int var3)->{
Util.println(" Video Error: "+var1+" "+var2+" "+var3);
@ -85,13 +85,13 @@ public class SrcVideo extends TextureView implements TextureView.SurfaceTextureL
}
}
@Override
public void onVisibilityAggregated(boolean isVisible) {
super.onVisibilityAggregated(isVisible);
if(isVisible) ijkPlayer.start();
else {
ijkPlayer.pause();
ijkPlayer.seekTo(0);
}
}
// @Override
// public void onVisibilityAggregated(boolean isVisible) {
// super.onVisibilityAggregated(isVisible);
// if(isVisible) ijkPlayer.start();
// else {
// ijkPlayer.pause();
// ijkPlayer.seekTo(0);
// }
// }
}

4
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcVisitor.java
View File

@ -14,6 +14,7 @@ import gnph.util.URLConn;
public class SrcVisitor extends WebView implements Choreographer.FrameCallback {
String html, lineHeight, prefix, url;
int interval;
public SrcVisitor(Prog prog, JSMap json) {
super(prog.getContext());
@ -24,6 +25,7 @@ public class SrcVisitor extends WebView implements Choreographer.FrameCallback {
html = json.stnn("html").replace("%{yesterday.", "%{arr.-1.");
lineHeight = json.str("lineHeight");
url = json.str("url");
interval = json.intg("interval", 15)*1000;
if(url!=null) {
var token = json.str("token");
if(token!=null) url += "?dataKey="+token;
@ -88,7 +90,7 @@ public class SrcVisitor extends WebView implements Choreographer.FrameCallback {
public void doFrame(long ms) {
if(! isShown()) return;
if(ms>=nextMs) {
nextMs = ms + 15000;
nextMs = ms + interval;
refresh();
}
}

67
XixunPlayer/app/src/main/java/com/xixun/xixunplayer/SrcWeb.java
View File

@ -3,11 +3,17 @@ package com.xixun.xixunplayer;
import android.annotation.SuppressLint;
import android.graphics.Color;
import android.net.http.SslError;
import android.os.Build;
import android.view.Choreographer;
import android.webkit.SslErrorHandler;
import android.webkit.WebResourceError;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import java.util.ArrayList;
import gnph.util.JSMap;
@SuppressLint("ViewConstructor")
@ -15,10 +21,12 @@ public class SrcWeb extends WebView implements Choreographer.FrameCallback {
String url;
int refresh;
ArrayList<Choreographer.FrameCallback> calls;
@SuppressLint("SetJavaScriptEnabled")
public SrcWeb(Prog prog, JSMap json) {
public SrcWeb(Prog prog, String url, JSMap json) {
super(prog.getContext());
this.url = url;
var settings = getSettings();
settings.setJavaScriptEnabled(true);
settings.setDomStorageEnabled(true);
@ -27,6 +35,7 @@ public class SrcWeb extends WebView implements Choreographer.FrameCallback {
setHorizontalScrollBarEnabled(false);
setBackgroundColor(Color.TRANSPARENT);
setInitialScale(json.intg("zoom", 100));
clearCache(true);
setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
@ -40,27 +49,45 @@ public class SrcWeb extends WebView implements Choreographer.FrameCallback {
public void onPageFinished(WebView view, String url) {
view.loadUrl("javascript:window.scrollTo("+json.str("offX", "0")+", "+json.str("offY", "0")+")");
}
@Override
public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if(request.isForMainFrame() && error.getErrorCode()==-2 && request.getUrl().toString().equals(url)) needReload = true;
Util.println(" WebView ReceivedError "+error.getErrorCode()+" "+error.getDescription()+"; isForMainFrame "+request.isForMainFrame()+" URL "+request.getUrl());
}
}
@Override
public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
Util.println(" WebView ReceivedHttpError "+errorResponse.getStatusCode()+"; isForMainFrame "+request.isForMainFrame()+" URL "+request.getUrl());
}
});
loadUrl(url = json.str("url"));
loadUrl(url);
refresh = json.intg("refreshSec")*1000;
if(Util.custom==Util.Custom.Yishi) {
prog.calls.add(this);
} else {
if(refresh>0 && url!=null) prog.calls.add(this);
}
if(refresh==0 || Util.custom!=Util.Custom.Yishi) this.calls = prog.calls;
prog.calls.add(this);
nextMs = System.currentTimeMillis() + refresh;
}
long nextMs;
int w, h;
int cnt, w, h;
boolean needReload;
@Override
public void doFrame(long ms) {
if(! isShown()) return;
if(Util.custom==Util.Custom.Yishi) {
if(refresh>0 && url!=null && ms>=nextMs) {
nextMs = ms + refresh;
loadUrl(url);
if(refresh > 0) {
if(ms>=nextMs) {
nextMs = ms + refresh;
loadUrl(url);
}
} else if(++cnt>=600) {
cnt = 0;
if(needReload) {
needReload = false;
loadUrl(url);
Util.println(" WebView Refreshed");
}
}
if(Util.screenWidth!=w || Util.screenHeight!=h) {
w = Util.screenWidth;
@ -69,9 +96,21 @@ public class SrcWeb extends WebView implements Choreographer.FrameCallback {
setLayoutParams(new AbsLayout.LayoutParams(0, 0, w, h));
}
} else {
if(ms>=nextMs) {
nextMs = ms + refresh;
loadUrl(url);
if(refresh > 0) {
if(ms>=nextMs) {
nextMs = ms + refresh;
loadUrl(url);
}
} else if(++cnt>=600) {
cnt = 0;
if(needReload) {
needReload = false;
loadUrl(url);
Util.println(" WebView Refreshed");
} else if(calls!=null) {
calls.remove(this);
calls = null;
}
}
}
}