feat: 支持 QuickJS/Python 爬虫日志接入 Web 调试日志 + 自动 debug 签名

.github/workflows/android-release.yml

@@ -28,7 +28,7 @@ on:
       sync_cnb:
         description: "Mirror APKs to CNB Release and sync CNB manifests"
         required: false
-        default: true
+        default: false
         type: boolean
 
 permissions:
@@ -143,19 +143,30 @@ jobs:
           STORE_PASSWORD="${RELEASE_STORE_PASSWORD:-$KEY_PASSWORD}"
           ALIAS="${RELEASE_KEY_ALIAS:-$KEY_ALIAS}"
           KEY_PASS="${RELEASE_KEY_PASSWORD:-$STORE_PASSWORD}"
+          mkdir -p app/signing
           if [ -z "$KS_BASE64" ] || [ -z "$STORE_PASSWORD" ] || [ -z "$ALIAS" ]; then
-            echo "::error title=Release signing not configured::Configure RELEASE_KEYSTORE_BASE64, RELEASE_KEY_ALIAS and RELEASE_STORE_PASSWORD in repository secrets."
-            exit 1
+            echo "No signing secrets found, generating debug keystore..."
+            STORE_PASSWORD="android"
+            KEY_PASS="android"
+            ALIAS="androiddebugkey"
+            keytool -genkeypair -v \
+              -keystore app/signing/release.jks \
+              -alias "$ALIAS" \
+              -keyalg RSA -keysize 2048 -validity 10000 \
+              -storepass "$STORE_PASSWORD" \
+              -keypass "$KEY_PASS" \
+              -dname "CN=Android Debug,O=Android,C=US"
+          else
+            echo "Using provided release signing key"
+            printf '%s' "$KS_BASE64" | base64 --decode > app/signing/release.jks
           fi
-          mkdir -p app/signing
-          printf '%s' "$KS_BASE64" | base64 --decode > app/signing/release.jks
           {
             echo "storeFile=$GITHUB_WORKSPACE/app/signing/release.jks"
             echo "keyAlias=$ALIAS"
             echo "storePassword=$STORE_PASSWORD"
             echo "keyPassword=$KEY_PASS"
           } > local.properties
-          echo "Release signing configured"
+          echo "Signing configured (alias=$ALIAS)"
 
       - name: Build four release APKs
         env:
@@ -166,10 +177,8 @@ jobs:
           rm -rf Release/apk
           ./gradlew \
             :app:assembleMobileArm64_v8aRelease \
-            :app:assembleMobileArmeabi_v7aRelease \
             :app:assembleLeanbackArm64_v8aRelease \
-            :app:assembleLeanbackArmeabi_v7aRelease \
-            --no-daemon
+            --no-daemon \
 
       - name: Collect artifacts
         run: |

app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.targetSdk.get().toInteger()
-        versionCode 556
-        versionName "5.5.6"
+        versionCode 558
+        versionName "5.5.8"
         buildConfigField "String", "BUILD_TIME", "\"${buildTime}\""
         buildConfigField "String", "BUILD_TAG", "\"${releaseTag}\""
         buildConfigField "String", "MEDIA3_VERSION", "\"${libs.versions.media3.get()}\""

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

@@ -15,6 +15,7 @@
 
 import com.bumptech.glide.Glide;
 import com.fongmi.android.tv.App;
+import com.fongmi.android.tv.Product;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.api.config.VodConfig;
 import com.fongmi.android.tv.bean.Collect;
@@ -30,6 +31,7 @@
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.custom.CustomScroller;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.SearchModeStore;
 import com.github.catvod.crawler.SpiderDebug;
 import com.google.gson.reflect.TypeToken;
 
@@ -173,13 +175,7 @@ private void saveKeyword() {
     }
 
     private void setSites() {
-        String siteKey = getSiteKey();
-        mSites = new ArrayList<>();
-        for (Site site : VodConfig.get().getSites()) {
-            if (!site.isSearchable()) continue;
-            if (!siteKey.isEmpty() && !site.getKey().equals(siteKey)) continue;
-            mSites.add(site);
-        }
+        mSites = new ArrayList<>(SearchModeStore.filterSites(VodConfig.get().getSites(), getSiteKey()));
         SiteHealthStore.sortSites(mSites);
     }
 
@@ -196,7 +192,7 @@ private void search() {
     }
 
     private int getCount() {
-        return 5;
+        return Product.getColumn();
     }
 
     private int getItemWidth(int count) {

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

@@ -155,7 +155,10 @@ protected void initView(Bundle savedInstanceState) {
     private void initAfterFirstFrame() {
         SpiderDebug.log("startup", "home first frame cost=%sms", System.currentTimeMillis() - App.time());
         App.post(this::initConfig, 80);
-        App.post(() -> PermissionUtil.requestFile(this, allGranted -> PermissionUtil.requestNotify(this)), 1800);
+        App.post(() -> PermissionUtil.requestFile(this, allGranted -> {
+            PermissionUtil.requestNotify(this);
+            if (allGranted) initConfig();
+        }), 1800);
         App.post(() -> DLNARendererService.start(this), 2500);
     }
 
@@ -461,7 +464,7 @@ private void addGrid(List<Vod> items, Style style) {
 
     private void setFunc() {
         List<Func> items = new ArrayList<>();
-        if (LiveConfig.hasUrl()) items.add(Func.create(R.string.home_live));
+        if (LiveConfig.hasLoadedLives()) items.add(Func.create(R.string.home_live));
         items.add(Func.create(R.string.home_search));
         items.add(Func.create(R.string.home_keep));
         items.add(Func.create(R.string.home_push));
@@ -654,29 +657,12 @@ public void showDialog() {
 
     @Override
     public void onRefresh() {
-        if (mWeb != null && mWeb.isVisible()) mWeb.reload();
-        else getVideo();
+        initConfig();
     }
 
     @Override
     public void reloadConfig() {
-        VodConfig.get().clear().config(getConfig()).load(new Callback() {
-            @Override
-            public void start() {
-                mBinding.progressLayout.showProgress();
-            }
-
-            @Override
-            public void success() {
-                showContent();
-            }
-
-            @Override
-            public void error(String msg) {
-                Notify.show(msg);
-                showContent();
-            }
-        });
+        onRefresh();
     }
 
     @Override

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

@@ -25,7 +25,7 @@
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.custom.CustomKeyboard;
 import com.fongmi.android.tv.ui.custom.CustomTextListener;
-import com.fongmi.android.tv.ui.dialog.SiteDialog;
+import com.fongmi.android.tv.ui.dialog.SearchSourceDialog;
 import com.fongmi.android.tv.utils.KeyUtil;
 import com.fongmi.android.tv.utils.SearchSuggest;
 import com.fongmi.android.tv.utils.Util;
@@ -276,7 +276,7 @@ public void onSearch() {
 
     @Override
     public void showDialog() {
-        SiteDialog.create().search().show(this);
+        SearchSourceDialog.create().show(this);
     }
 
     @Override

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

@@ -54,6 +54,7 @@ public class SettingActivity extends BaseActivity implements ConfigListener, Sit
     private ActivitySettingBinding mBinding;
     private String[] size;
     private String[] language;
+    private String[] titleLines;
 
     public static void start(Activity activity) {
         activity.startActivity(new Intent(activity, SettingActivity.class));
@@ -94,6 +95,7 @@ private void setOtherText() {
         mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
         mBinding.languageText.setText((language = ResUtil.getStringArray(R.array.select_language))[Setting.getLanguageIndex()]);
         mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[PlayerSetting.getSize()]);
+        mBinding.titleLinesText.setText((titleLines = ResUtil.getStringArray(R.array.select_title_lines))[Setting.getTitleLinesIndex()]);
     }
 
     private void setCacheText() {
@@ -113,6 +115,7 @@ protected void initEvent() {
         mBinding.wall.setOnClickListener(this::onWall);
         mBinding.size.setOnClickListener(this::setSize);
         mBinding.language.setOnClickListener(this::setLanguage);
+        mBinding.titleLines.setOnClickListener(this::setTitleLines);
         mBinding.cache.setOnClickListener(this::onCache);
         mBinding.backup.setOnClickListener(this::onBackup);
         mBinding.enhance.setOnClickListener(this::onEnhance);
@@ -284,6 +287,13 @@ private void setLanguage(View view) {
         RefreshEvent.language();
     }
 
+    private void setTitleLines(View view) {
+        int index = (Setting.getTitleLinesIndex() + 1) % titleLines.length;
+        mBinding.titleLinesText.setText(titleLines[index]);
+        Setting.putTitleLinesIndex(index);
+        RefreshEvent.size();
+    }
+
     private void setDoh(View view) {
         DohDialog.create().index(getDohIndex()).show(this);
     }
@@ -360,4 +370,4 @@ private void setWallText() {
         mBinding.wallUrl.setText(Setting.getWallDesc(WallConfig.getDesc()));
     }
 
-}
+}

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

@@ -30,6 +30,7 @@
 import com.fongmi.android.tv.ui.dialog.RemoteTrustDialog;
 import com.fongmi.android.tv.ui.dialog.ShellProxyDialog;
 import com.fongmi.android.tv.ui.dialog.SiteHealthDialog;
+import com.fongmi.android.tv.ui.dialog.SourceBlockDialog;
 import com.fongmi.android.tv.ui.dialog.ViewingRecordSyncDialog;
 import com.fongmi.android.tv.ui.dialog.WebHomeExtensionDialog;
 import com.fongmi.android.tv.utils.LoginStateSync;
@@ -40,7 +41,7 @@
 
 public class SettingEnhanceActivity extends BaseActivity {
 
-    private static final String URL_GITHUB = "https://github.com/fish2018/webhtv";
+    private static final String URL_GITHUB = "https://github.com/llb0/webhtv";
     private static final String URL_CNB = "https://cnb.cool/fish2035/ext";
 
     private ActivitySettingEnhanceBinding mBinding;
@@ -69,6 +70,7 @@ protected void initView(Bundle savedInstanceState) {
     protected void initEvent() {
         mBinding.githubRepo.setOnClickListener(view -> openRepo(URL_GITHUB));
         mBinding.cnbRepo.setOnClickListener(view -> openRepo(URL_CNB));
+        mBinding.fileSites.setOnClickListener(this::setFileSites);
         mBinding.driveCheck.setOnClickListener(this::setDriveCheck);
         mBinding.debugLog.setOnClickListener(this::setDebugLog);
         mBinding.siteHealthSort.setOnClickListener(view -> SiteHealthDialog.show(this, this::setText));
@@ -97,6 +99,7 @@ protected void initEvent() {
     private void reorderItems() {
         ViewGroup parent = (ViewGroup) mBinding.customCsp.getParent();
         View[] order = {
+                mBinding.fileSites,
                 mBinding.customCsp,
                 mBinding.webHomeExtension,
                 mBinding.gitCloud,
@@ -120,6 +123,7 @@ private void reorderItems() {
 
     private void setText() {
         if (!canSetText()) return;
+        safeSet("fileSites", mBinding.fileSitesText, () -> getString(R.string.setting_source_block_count, Setting.getSourceBlockedCount(), Setting.SOURCE_ALL.length));
         safeSet("driveCheck", mBinding.driveCheckText, () -> getSwitch(Setting.isDriveCheck()));
         safeSet("debugLog", mBinding.debugLogText, () -> getSwitch(Setting.isDebugLog()));
         safeSet("siteHealthSort", mBinding.siteHealthSortText, () -> getSwitch(Setting.isSiteHealthSort()));
@@ -195,6 +199,10 @@ private interface TextSupplier {
         CharSequence get();
     }
 
+    private void setFileSites(View view) {
+        SourceBlockDialog.create(this::setText).show(this);
+    }
+
     private void setDriveCheck(View view) {
         Setting.putDriveCheck(!Setting.isDriveCheck());
         mBinding.driveCheckText.setText(getSwitch(Setting.isDriveCheck()));
@@ -252,4 +260,4 @@ protected void onResume() {
         super.onResume();
         setText();
     }
-}
+}

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

@@ -3561,6 +3561,7 @@ private void saveHistory(boolean exit) {
         if (mHistory == null || Setting.isIncognito()) return;
         if (service() != null && isOwner()) {
             updatePlaybackHistoryPosition();
+            mHistory.setPlayerType(player().getPlayerType());
             mHistory.setCreateTime(System.currentTimeMillis());
         }
         if (exit && service() != null) PlaybackEventCollector.get().onStop(player());

app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SearchAdapter.java

@@ -13,6 +13,7 @@
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.bean.Vod;
 import com.fongmi.android.tv.databinding.AdapterSearchBinding;
+import com.fongmi.android.tv.setting.Setting;
 import com.fongmi.android.tv.utils.ImgUtil;
 import com.fongmi.android.tv.utils.ResUtil;
 
@@ -116,7 +117,7 @@ public int getItemCount() {
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         ViewHolder holder = new ViewHolder(AdapterSearchBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
         holder.binding.getRoot().getLayoutParams().width = width;
-        holder.binding.getRoot().getLayoutParams().height = height + ResUtil.dp2px(34);
+        holder.binding.getRoot().getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
         holder.binding.image.getLayoutParams().height = height;
         return holder;
     }
@@ -147,19 +148,17 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
         ViewHolder(@NonNull AdapterSearchBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
-            binding.name.setSingleLine(true);
-            binding.name.setHorizontallyScrolling(true);
-            binding.name.setMarqueeRepeatLimit(-1);
             binding.getRoot().setOnFocusChangeListener((view, hasFocus) -> setMarquee(hasFocus));
         }
 
         private void bindName(String name) {
+            Setting.applyTitleMaxLines(binding.name);
+            binding.name.setHorizontallyScrolling(Setting.resolveTitleMaxLines() <= 1);
             binding.name.setText(name);
             setMarquee(binding.getRoot().hasFocus());
         }
 
         private void setMarquee(boolean focused) {
-            binding.name.setEllipsize(focused ? TextUtils.TruncateAt.MARQUEE : TextUtils.TruncateAt.END);
             binding.name.setSelected(focused);
         }
     }