From 6365a14806c1c68e4a226663930a1cc14005a84d Mon Sep 17 00:00:00 2001 From: sifacaii Date: Wed, 17 May 2023 21:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 + .../java/org/sifacai/vlcjellyfin/Dlna/Controller.java | 7 ++++++- .../java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java | 1 + .../java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java | 1 + .../org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java | 8 ++++++++ .../java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java | 4 ++++ .../main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java | 4 ++-- app/src/main/res/layout/activebar_custom.xml | 2 +- 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2c2e13a..f9cce9c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,6 +47,7 @@ " + "" + "" + "" + "0" + - "" + + //"" + + "" + url + "" + "" + "" + ""; diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java index ce97aa1..d6feac4 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java @@ -202,6 +202,7 @@ public class DlnaActivity extends BaseActivity { }; public void ProgressNOTIFY(String data) throws IOException, XmlPullParserException { + //Log.d(TAG, "ProgressNOTIFY: " + data); if(data.startsWith("M-SEARCH")) return; HashMap dh = DlnaDevice.parseNOTIFY(data); boolean isav = DlnaDevice.isMediaRenderer(dh.get("NT")); diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java b/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java index 2479355..6da5899 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java @@ -18,6 +18,7 @@ public class DlnaDevice { if(nt == null) return false; if(nt.equals("upnp:rootdevice")) return true; if(nt.indexOf("device:MediaRenderer") >= 0) return true; + if(nt.indexOf("service:AVTransport") >= 0) return true; return false; } diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java index ed45c3e..92bcca8 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java @@ -7,6 +7,7 @@ import android.os.Handler; import android.os.Looper; import android.util.Log; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -548,6 +549,13 @@ public class VlcPlayerActivity extends BaseActivity implements MediaPlayer.Event } } + @Override + public boolean onTouchEvent(MotionEvent event) { + //return super.onTouchEvent(event); + Show(); + return true; + } + private void ReportPlayState(JfClient.ReportType type) { JfClient.ReportPlayBackState(type,currItem.Id,currItem.PositionTicks); } diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java index 9765a77..2b08a2d 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java @@ -39,6 +39,10 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt { actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); actionBar.setCustomView(R.layout.activebar_custom); + if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT){ + findViewById(R.id.actionBar_banner).setVisibility(View.GONE); + } + activeBarBack = findViewById(R.id.actionBar_back); activeBarBack.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java index 6b44e93..9842d01 100644 --- a/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java +++ b/app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java @@ -617,7 +617,7 @@ public class JfClient { @Override public void onError(Response response) { if (errcb != null) { - errcb.onError(response.toString()); + errcb.onError(response.message()); } } }); @@ -649,7 +649,7 @@ public class JfClient { @Override public void onError(Response response) { if (errcb != null) { - errcb.onError(response.body()); + errcb.onError(response.message()); } } }); diff --git a/app/src/main/res/layout/activebar_custom.xml b/app/src/main/res/layout/activebar_custom.xml index 0d30b21..a720d47 100644 --- a/app/src/main/res/layout/activebar_custom.xml +++ b/app/src/main/res/layout/activebar_custom.xml @@ -20,7 +20,7 @@ android:id="@+id/actionBar_banner" android:layout_width="100dp" android:layout_height="match_parent" - android:scaleType="fitXY" + android:scaleType="fitCenter" app:srcCompat="@drawable/banner" />