mirror/VlcJellyfin
1
0
Fork 0
mirror of https://github.com/sifacaii/VlcJellyfin synced 2025-05-26 06:20:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

界面优化

Browse Source
This commit is contained in:
sifacaii 2023-05-17 21:26:05 +08:00
parent 8b4c6fe468
commit 6365a14806
8 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -47,6 +47,7 @@
<activity
android:name=".Player.VlcPlayerActivity"
android:exported="false"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar" />
<meta-data

7
app/src/main/java/org/sifacai/vlcjellyfin/Dlna/Controller.java
View File

@ -11,18 +11,23 @@ import com.lzy.okgo.model.Response;
import org.sifacai.vlcjellyfin.Utils.JfClient;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
public class Controller {
public static String TAG = "ＤＬＮＡ控制";
public static void SetAVTransportURI(String controlUrl, String url, JfClient.JJCallBack cb) {
url = url.substring(0,url.indexOf("stream.mp4")) + "stream.mp4";
//Log.d(TAG, "SetAVTransportURI: " + url);
String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
"<s:Envelope s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
"<s:Body>" +
"<u:SetAVTransportURI xmlns:u=\"urn:schemas-upnp-org:service:AVTransport:1\">" +
"<InstanceID>0</InstanceID>" +
"<CurrentURI><![CDATA[" + url + "]]></CurrentURI>" +
//"<CurrentURI><![CDATA[" + url + "]]></CurrentURI>" +
"<CurrentURI>" + url + "</CurrentURI>" +
"<CurrentURIMetaData></CurrentURIMetaData>" +
"</u:SetAVTransportURI>" +
"</s:Body></s:Envelope>";

1
app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaActivity.java
View File

@ -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<String,String> dh = DlnaDevice.parseNOTIFY(data);
boolean isav = DlnaDevice.isMediaRenderer(dh.get("NT"));

1
app/src/main/java/org/sifacai/vlcjellyfin/Dlna/DlnaDevice.java
View File

@ -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;
}

8
app/src/main/java/org/sifacai/vlcjellyfin/Player/VlcPlayerActivity.java
View File

@ -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);
}

4
app/src/main/java/org/sifacai/vlcjellyfin/Ui/BaseActivity.java
View File

@ -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

4
app/src/main/java/org/sifacai/vlcjellyfin/Utils/JfClient.java
View File

@ -617,7 +617,7 @@ public class JfClient {
@Override
public void onError(Response<String> response) {
if (errcb != null) {
errcb.onError(response.toString());
errcb.onError(response.message());
}
}
});
@ -649,7 +649,7 @@ public class JfClient {
@Override
public void onError(Response<String> response) {
if (errcb != null) {
errcb.onError(response.body());
errcb.onError(response.message());
}
}
});

2
app/src/main/res/layout/activebar_custom.xml
View File

@ -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" />
<TextView