Merge branch 'dev' into release

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 207
-        versionName "20231116#2"
+        versionName "20231118"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -544,10 +544,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     private void setInfo() {
         mChannel.loadLogo(mBinding.widget.logo);
         mBinding.widget.name.setText(mChannel.getName());
-        mBinding.control.name.setText(mChannel.getName());
         mBinding.widget.line.setText(mChannel.getLineText());
         mBinding.widget.number.setText(mChannel.getNumber());
-        mBinding.control.number.setText(mChannel.getNumber());
         mBinding.control.line.setText(mChannel.getLineText());
         mBinding.widget.line.setVisibility(mChannel.getLineVisible());
         mBinding.control.line.setVisibility(mChannel.getLineVisible());

app/src/leanback/res/layout/activity_live.xml

@@ -64,7 +64,7 @@
 
         <com.fongmi.android.tv.ui.custom.CustomLiveListView
             android:id="@+id/group"
-            android:layout_width="140dp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_group" />

app/src/leanback/res/layout/view_control_live.xml

@@ -17,26 +17,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            android:textColor="@color/grey_800"
-            android:textSize="18sp"
-            tools:text="005" />
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:textColor="@color/grey_800"
-            android:textSize="18sp"
-            tools:text="民視" />
-
         <TextView
             android:id="@+id/player"
             android:layout_width="wrap_content"
@@ -89,74 +69,74 @@
             tools:text="預設" />
 
         <TextView
-            android:id="@+id/text"
+            android:id="@+id/home"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:tag="3"
-            android:text="@string/play_track_text"
             android:textColor="@color/white"
             android:textSize="14sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            tools:text="首頁" />
 
         <TextView
-            android:id="@+id/audio"
+            android:id="@+id/line"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:tag="1"
-            android:text="@string/play_track_audio"
             android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="gone"
+            tools:text="來源 1"
             tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/video"
+            android:id="@+id/text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:tag="2"
-            android:text="@string/play_track_video"
+            android:tag="3"
+            android:text="@string/play_track_text"
             android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="gone"
             tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/home"
+            android:id="@+id/audio"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
+            android:tag="1"
+            android:text="@string/play_track_audio"
             android:textColor="@color/white"
             android:textSize="14sp"
-            tools:text="首頁" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/line"
+            android:id="@+id/video"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
+            android:tag="2"
+            android:text="@string/play_track_video"
             android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="gone"
-            tools:text="來源 1"
             tools:visibility="visible" />
 
         <TextView

app/src/mobile/res/layout/activity_live.xml

@@ -62,7 +62,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/group"
-            android:layout_width="140dp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:clipChildren="false"
             android:clipToPadding="false"

ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java

@@ -1,22 +1,36 @@
-/*
- * Copyright (C) 2013-2014 Bilibili
- * Copyright (C) 2013-2014 Zhang Rui <bbcallen@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package tv.danmaku.ijk.media.player;
 
-public interface IjkLibLoader {
-    void loadLibrary(String libName) throws UnsatisfiedLinkError, SecurityException;
+import android.util.Log;
+
+import java.util.Arrays;
+
+public abstract class IjkLibLoader {
+
+    private static final String TAG = "IjkLibLoader";
+
+    private final String[] nativeLibraries;
+    private boolean loadAttempted;
+    private boolean isAvailable;
+
+    public IjkLibLoader(String... libraries) {
+        nativeLibraries = libraries;
+    }
+
+    public synchronized boolean isAvailable() {
+        if (loadAttempted) return isAvailable;
+        loadAttempted = true;
+        try {
+            for (String lib : nativeLibraries) {
+                loadLibrary(lib);
+            }
+            isAvailable = true;
+        } catch (Throwable exception) {
+            // Log a warning as an attempt to check for the library indicates that the app depends on an
+            // extension and generally would expect its native libraries to be available.
+            Log.w(TAG, "Failed to load " + Arrays.toString(nativeLibraries));
+        }
+        return isAvailable;
+    }
+
+    protected abstract void loadLibrary(String name);
 }

ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java

@@ -36,7 +36,6 @@ import android.view.Surface;
 import android.view.SurfaceHolder;
 
 import androidx.annotation.NonNull;
-import androidx.media3.common.util.LibraryLoader;
 
 import com.google.common.net.HttpHeaders;
 
@@ -148,13 +147,10 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
     private long mNativeMediaPlayer;
     @AccessedByNative
     private long mNativeMediaDataSource;
-
     @AccessedByNative
     private long mNativeAndroidIO;
-
     @AccessedByNative
     private int mNativeSurfaceTexture;
-
     @AccessedByNative
     private int mListenerContext;
 
@@ -169,7 +165,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
     private int mVideoSarNum;
     private int mVideoSarDen;
 
-    private static final LibraryLoader LOADER = new LibraryLoader("ijkffmpeg", "ijksdl", "player") {
+    private static final IjkLibLoader LOADER = new IjkLibLoader("ijkffmpeg", "ijksdl", "player") {
         @Override
         protected void loadLibrary(@NonNull String name) {
             System.loadLibrary(name);