diff --git a/app/build.gradle b/app/build.gradle index a3996581..a12ed590 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 1 - versionName "1.1.1" + versionName "1.1.2" externalNativeBuild { cmake { arguments '-DANDROID_STL=c++_shared' diff --git a/app/src/main/java/euphoria/psycho/PlayerActivity.java b/app/src/main/java/euphoria/psycho/PlayerActivity.java index 2b33510d..8b11f74d 100644 --- a/app/src/main/java/euphoria/psycho/PlayerActivity.java +++ b/app/src/main/java/euphoria/psycho/PlayerActivity.java @@ -13,7 +13,6 @@ import android.opengl.GLES20; import android.os.Bundle; import android.os.Handler; -import android.util.Log; import android.view.Surface; import android.view.TextureView; import android.view.TextureView.SurfaceTextureListener; @@ -273,17 +272,13 @@ private void onBufferingUpdate(MediaPlayer mediaPlayer, int i) { } private void onCompletion(MediaPlayer mediaPlayer) { - Log.e("B5aOx2", "onCompletion"); - } private boolean onError(MediaPlayer mediaPlayer, int i, int i1) { - Log.e("B5aOx2", "onError " + i); return true; } private boolean onInfo(MediaPlayer mediaPlayer, int i, int i1) { - Log.e("B5aOx2", "onInfo"); return true; } @@ -314,7 +309,6 @@ private void onPlayPause(View view) { } private void onPrepared(MediaPlayer mediaPlayer) { - Log.e("B5aOx2", "onPrepared"); mDuration.setText(DateTimeShare.getStringForTime(mStringBuilder, mFormatter, mediaPlayer.getDuration())); mTimeBar.setDuration(mediaPlayer.getDuration()); mMediaPlayer.start(); @@ -345,12 +339,9 @@ private void onRoot(View view) { } private void onSeekComplete(MediaPlayer mediaPlayer) { - Log.e("B5aOx2", "onSeekComplete"); } private void onTimedMetaDataAvailable(MediaPlayer mediaPlayer, TimedMetaData timedMetaData) { - Log.e("B5aOx2", "onTimedMetaDataAvailable"); - } private void onVideoSizeChanged(MediaPlayer mediaPlayer, int videoWidth, int videoHeight) { @@ -372,7 +363,6 @@ private void play() throws IOException { mMediaPlayer.setDataSource(this, Uri.parse(mPlayList.get(mPlayIndex)), headers); mMediaPlayer.prepareAsync(); } else { - Log.e("B5aOx2", String.format("play, %s", mPlayList.get(mPlayIndex))); mMediaPlayer.setDataSource(mPlayList.get(mPlayIndex)); mMediaPlayer.prepareAsync(); } diff --git a/app/src/main/java/euphoria/psycho/explorer/MainActivity.java b/app/src/main/java/euphoria/psycho/explorer/MainActivity.java index ddc62729..e8d28657 100644 --- a/app/src/main/java/euphoria/psycho/explorer/MainActivity.java +++ b/app/src/main/java/euphoria/psycho/explorer/MainActivity.java @@ -30,6 +30,7 @@ public class MainActivity extends Activity implements ClientInterface { private WebView mWebView; private BookmarkDatabase mBookmarkDatabase; private String mVideoUrl; + private String[] mVideoList; public BookmarkDatabase getBookmarkDatabase() { return mBookmarkDatabase; @@ -79,7 +80,6 @@ private void initialize() { checkUnfinishedVideoTasks(this); checkUpdate(); // tryPlayVideo(this); - } @Override @@ -108,6 +108,15 @@ public Context getContext() { return this; } + @Override + public String[] getVideoList() { + return mVideoList; + } + + public void setVideoList(String[] videoList) { + mVideoList = videoList; + } + @Override public void onBackPressed() { // When the user press the back button, @@ -134,17 +143,6 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in initialize(); } - @Override - public String[] getVideoList() { - return mVideoList; - } - - private String[] mVideoList; - - public void setVideoList(String[] videoList) { - mVideoList = videoList; - } - @Override public void onVideoUrl(String uri) { mVideoUrl = uri; @@ -167,6 +165,12 @@ public boolean shouldOverrideUrlLoading(String uri) { if (XiGua.handle(uri, this)) { return true; } +// if (mWebView.getUrl().contains("xvideos.com")) { +// Pattern pattern = Pattern.compile("xvideos\\.com/video\\d+"); +// if (pattern.matcher(uri).find()) { +// XVideos.fetchVideos(uri); +// } +// } return Ck52.handle(uri, this); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e6fea6c9..ed134c73 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -32,7 +32,7 @@ 开始下载B站视频 已成功下载视频 开始合并视频 -已成功合并视频 -准备下载B站视频 -下载失败 + 已成功合并视频 + 准备下载B站视频 + 下载失败 \ No newline at end of file