asgardius/s3music
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

fix pip

Browse source
This commit is contained in:
Page Asgardius 2022-12-18 09:47:22 -07:00
parent 7ead45650a
commit ef2359f1d1
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId "asgardius.page.s3manager" applicationId "asgardius.page.s3manager"
minSdk 23 minSdk 23
targetSdk 33 targetSdk 33
versionCode 41 versionCode 42
versionName "0.3.2" versionName "0.3.3"
setProperty("archivesBaseName", "s3-manager-$versionName") setProperty("archivesBaseName", "s3-manager-$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

37
app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
View file

@ -3,11 +3,10 @@ package asgardius.page.s3manager;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.PictureInPictureParams; import android.app.PictureInPictureParams;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@ -19,7 +18,6 @@ import android.view.Display;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
@ -72,6 +70,7 @@ public class VideoPlayer extends AppCompatActivity {
private int notificationId = 1234; private int notificationId = 1234;
boolean hls; boolean hls;
boolean success = false; boolean success = false;
String videoURL;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -97,7 +96,7 @@ public class VideoPlayer extends AppCompatActivity {
powerManager = (PowerManager) getSystemService(POWER_SERVICE); powerManager = (PowerManager) getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "S3Manager:wake_lock"); mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "S3Manager:wake_lock");
//Get media url //Get media url
String videoURL = getIntent().getStringExtra("video_url"); videoURL = getIntent().getStringExtra("video_url");
videocache = getIntent().getIntExtra("videocache", 40); videocache = getIntent().getIntExtra("videocache", 40);
buffersize = getIntent().getIntExtra("buffersize", 2000); buffersize = getIntent().getIntExtra("buffersize", 2000);
hls = getIntent().getBooleanExtra("hls", false); hls = getIntent().getBooleanExtra("hls", false);
@ -278,7 +277,7 @@ public class VideoPlayer extends AppCompatActivity {
DisplayManager dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); DisplayManager dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
boolean screenOn = false; boolean screenOn = false;
for (Display display : dm.getDisplays()) { for (Display display : dm.getDisplays()) {
if (display.getState() != Display.STATE_OFF) { if (display.getState() == Display.STATE_ON) {
screenOn = true; screenOn = true;
} }
} }
@ -310,6 +309,30 @@ public class VideoPlayer extends AppCompatActivity {
enterPIPMode(); enterPIPMode();
} }
protected void onNewIntent(Intent intent) {
videoURL = intent.getStringExtra("video_url");
videocache = intent.getIntExtra("videocache", 40);
buffersize = intent.getIntExtra("buffersize", 2000);
hls = intent.getBooleanExtra("hls", false);
mediaSource = new ProgressiveMediaSource.Factory(
new CacheDataSource.Factory()
.setCache(simpleCache)
.setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
.setUserAgent("ExoplayerDemo"))
.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL)));
if (hls) {
MediaItem mediaItem = MediaItem.fromUri(videoURL);
player.setMediaItem(mediaItem);
} else {
player.setMediaSource(mediaSource);
}
player.prepare();
// Start the playback.
player.play();
super.onNewIntent(intent);
}
public void onStop() { public void onStop() {
if(isScreenOn(this)) { if(isScreenOn(this)) {
finish(); finish();
@ -317,7 +340,7 @@ public class VideoPlayer extends AppCompatActivity {
super.onStop(); super.onStop();
} }
/*public void onBackPressed() { public void onBackPressed() {
try { try {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
&& this.getPackageManager() && this.getPackageManager()
@ -335,5 +358,5 @@ public class VideoPlayer extends AppCompatActivity {
e.printStackTrace(); e.printStackTrace();
super.onBackPressed(); super.onBackPressed();
} }
}*/ }
} }