diff --git a/app/build.gradle b/app/build.gradle
index ae9ca304b7e320106644ede9f69e6800188820ca..5aeb43a7b94024e7bcc6fa8500c08174c848d06a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,12 +21,12 @@ productFlavors {
leanback {
dimension "mode"
versionCode 207
- versionName "20231114#2"
+ versionName "20231115#4"
}
mobile {
dimension "mode"
versionCode 207
- versionName "20231114#2"
+ versionName "20231115#4"
}
java {
dimension "api"
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
index a416df5848dac40eff3c1e26ab7b71d40fe612ed..0eca8b110c6303181f125d208e3226d21a07143d 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
@@ -34,6 +34,8 @@ import com.fongmi.android.tv.event.ActionEvent;
import com.fongmi.android.tv.event.ErrorEvent;
import com.fongmi.android.tv.event.PlayerEvent;
import com.fongmi.android.tv.player.ExoUtil;
+import android.content.Intent;
+import com.fongmi.android.tv.player.ExoUtil;
import com.fongmi.android.tv.player.Players;
import com.fongmi.android.tv.player.Source;
import com.fongmi.android.tv.ui.base.BaseActivity;
@@ -50,8 +52,9 @@ import org.greenrobot.eventbus.ThreadMode;
import tv.danmaku.ijk.media.player.ui.IjkVideoView;
+import android.annotation.SuppressLint;
import android.content.ComponentName;
-import android.os.IBinder;
+import android.content.ServiceConnection;
private ActivityCastBinding mBinding;
private DLNARendererService mService;
@@ -165,11 +168,6 @@ }
private void setDecodeView() {
mBinding.control.decode.setText(mPlayers.getDecodeText());
- }
-
- private void setSubtitle(int size) {
- getExo().getSubtitleView().setFixedTextSize(Dimension.SP, size);
- getIjk().getSubtitleView().setFixedTextSize(Dimension.SP, size);
}
private void setScale(int scale) {
@@ -510,6 +508,12 @@
@Override
public void onDoubleTap() {
onKeyCenter();
+ }
+
+ @Override
+ public void setSubtitle(int size) {
+ getExo().getSubtitleView().setFixedTextSize(Dimension.SP, size);
+ getIjk().getSubtitleView().setFixedTextSize(Dimension.SP, size);
}
@Override
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 19724ae534327e73786efaee6a2f5bfe000d7ba8..1655ad2023d69972a1e2a1289a2c5f71a4026194 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -231,6 +231,7 @@ mViewModel.channel.observe(this, result -> mPlayers.start(result, getHome().getTimeout()));
mViewModel.live.observe(this, live -> {
hideProgress();
setGroup(live);
+ setWidth(live);
});
}
@@ -242,15 +243,21 @@ setDecodeView();
showProgress();
}
-import androidx.media3.ui.PlayerView;
+import android.graphics.drawable.Drawable;
+import android.annotation.SuppressLint;
List<Group> items = new ArrayList<>();
items.add(Group.create(R.string.keep));
-
+import android.graphics.drawable.Drawable;
-import android.annotation.SuppressLint;
+import android.content.Context;
mGroupAdapter.setItems(items, null);
setPosition(LiveConfig.get().find(items));
+ mBinding.control.home.setText(live.getName());
+ }
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.Drawable;
+ for (Group group : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(group.getName(), 16)));
+ mBinding.group.getLayoutParams().width = Math.min(live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 98 : 50), ResUtil.dp2px(260));
}
private void setPosition(int[] position) {
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index c567a517b1768e49b58bafe0a1cfecd3d3f7baf3..43b1d7e9387e1a6f9a006b03e5907a2e00511f16 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -59,7 +59,8 @@ android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/shape_live_list"
android:orientation="horizontal"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
<com.fongmi.android.tv.ui.custom.CustomLiveListView
android:id="@+id/group"
diff --git a/app/src/leanback/res/layout/adapter_group.xml b/app/src/leanback/res/layout/adapter_group.xml
index 9e7006304c9d40eeaddc1aad72fca225e5e80439..87dae9d740b6f2f3e626ecb880d8939a026f2dca 100644
--- a/app/src/leanback/res/layout/adapter_group.xml
+++ b/app/src/leanback/res/layout/adapter_group.xml
@@ -25,8 +25,6 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="@drawable/selector_group"
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:focusable="true"
android:textColor="@color/group"
android:textSize="16sp"
diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java
index 93bef9e26cc9310561dc745aa486f82ca5170194..6c7aa6bed3d46b78bca48bed46a364cd5f6b0965 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
@@ -18,6 +18,7 @@ import com.fongmi.android.tv.utils.Notify;
import com.github.catvod.Init;
import com.github.catvod.bean.Doh;
import com.github.catvod.net.OkHttp;
+import com.github.catvod.utils.Github;
import com.google.gson.Gson;
import com.orhanobut.logger.AndroidLogAdapter;
import com.orhanobut.logger.LogAdapter;
@@ -105,6 +106,7 @@ @Override
public void onCreate() {
super.onCreate();
Notify.createChannel();
+ Github.setAbi(BuildConfig.FLAVOR_abi);
Logger.addLogAdapter(getLogAdapter());
OkHttp.get().setProxy(Setting.getProxy());
OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Live.java b/app/src/main/java/com/fongmi/android/tv/bean/Live.java
index 74ff2cb0c2e939ce4bdf19e06c0bbb724737c7e8..762b0b793f77acdd3118f0701ec8ad6dab22450a 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Live.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Live.java
@@ -51,6 +51,7 @@ @SerializedName("core")
private Core core;
private boolean activated;
+ private int width;
public static Live objectFrom(JsonElement element) {
return App.gson().fromJson(element, Live.class);
@@ -152,6 +153,15 @@ this.activated = item.equals(this);
}
package com.fongmi.android.tv.bean;
+ @SerializedName("pass")
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+package com.fongmi.android.tv.bean;
boolean proxy = getChannels().size() > 0 && getChannels().get(0).getUrls().size() > 0 && getChannels().get(0).getUrls().get(0).startsWith("proxy");
if (proxy) setProxy();
return this;
@@ -167,6 +177,11 @@ public Group find(Group item) {
for (Group group : getGroups()) if (group.getName().equals(item.getName())) return group;
getGroups().add(item);
return item;
+ }
+
+ public boolean hasLogo() {
+ for (Group group : getGroups()) if (group.getLogo().length() > 0) return true;
+ return false;
}
@Override
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
index dc397a79ee847da7c9850b8d4642a70c3fbf6784..82a89df59ecd562b0779c9b4859c192c964dd31b 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java
@@ -3,6 +3,7 @@
import android.net.Uri;
import android.text.TextUtils;
+import androidx.media3.common.C;
import androidx.media3.common.MediaItem;
import com.fongmi.android.tv.player.ExoUtil;
@@ -21,6 +22,8 @@ @SerializedName("lang")
private String lang;
@SerializedName("format")
private String format;
+ @SerializedName("flag")
+ private int flag;
public static Sub from(String path) {
return from(new File(path));
@@ -30,6 +33,8 @@ public static Sub from(File file) {
Sub sub = new Sub();
sub.name = file.getName();
+import androidx.media3.common.MediaItem;
+import android.text.TextUtils;
import androidx.media3.common.MediaItem;
sub.format = ExoUtil.getMimeType(file.getName());
return sub;
@@ -51,6 +56,10 @@ public String getFormat() {
return TextUtils.isEmpty(format) ? "" : format;
}
+ public int getFlag() {
+ return flag == 0 ? C.SELECTION_FLAG_DEFAULT : flag;
+ }
+
public void trans() {
if (Trans.pass()) return;
this.name = Trans.s2t(name);
@@ -57,5 +67,6 @@ }
public MediaItem.SubtitleConfiguration getExo() {
import android.text.TextUtils;
+import com.google.gson.annotations.SerializedName;
}
}
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
index b9a07fadecb2d1feeb178cf7e0ba8f57f2013fb0..2d6317b09b5c39521cd8697b70a4c20d31e85a6a 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java
@@ -95,9 +95,9 @@
private Site site;
public static List<Vod> arrayFrom(String str) {
-import com.fongmi.android.tv.App;
+
import android.os.Parcel;
- }.getType();
+
List<Vod> items = App.gson().fromJson(str, listType);
return items == null ? Collections.emptyList() : items;
}
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java
index c792aaefef293af68cbe3996600af0db6697bd8f..6996c876a391f1447f6e3a6a0726771abf525894 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java
@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.drawable.Drawable;
import android.os.Build;
@@ -128,5 +129,11 @@ }
public static Display getDisplay(Activity activity) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ? activity.getDisplay() : activity.getWindowManager().getDefaultDisplay();
+ }
+
+ public static int getTextWidth(String content, int size) {
+ Paint paint = new Paint();
+ paint.setTextSize(sp2px(size));
+ return (int) paint.measureText(content);
}
}
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 56c2d157ae548a67a910323a9156f54c694cd03c..3e455353e5e94e43147e90335c45164651a7ed6a 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -250,6 +250,7 @@ mViewModel.channel.observeForever(mObserveChannel);
mViewModel.live.observe(this, live -> {
hideProgress();
setGroup(live);
+ setWidth(live);
});
}
@@ -261,14 +262,20 @@ setDecodeView();
showProgress();
}
+import org.greenrobot.eventbus.ThreadMode;
-import androidx.annotation.Dimension;
List<Group> items = new ArrayList<>();
items.add(Group.create(R.string.keep));
- for (Group group : home.getGroups()) (group.isHidden() ? mHides : items).add(group);
+ for (Group group : live.getGroups()) (group.isHidden() ? mHides : items).add(group);
mGroupAdapter.addAll(items);
setPosition(LiveConfig.get().find(items));
-import androidx.viewbinding.ViewBinding;
+ mBinding.control.action.home.setText(live.getName());
+package com.fongmi.android.tv.ui.activity;
+import android.graphics.drawable.Drawable;
+
+ private void setWidth(Live live) {
+ for (Group group : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(group.getName(), 14)));
+ mBinding.group.getLayoutParams().width = Math.min(live.getWidth() + ResUtil.dp2px(live.hasLogo() ? 90 : 45), ResUtil.dp2px(260));
}
private void setPosition(int[] position) {
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 9b2a9ab9107a1b9da55a40cce9efcfca482cd200..56c50b5ecbac0944008ca21bb9ddaa03b167d634 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -633,12 +633,13 @@ private void setEpisodeAdapter(List items) {
mBinding.control.action.episodes.setVisibility(items.size() < 2 ? View.GONE : View.VISIBLE);
mBinding.control.nextRoot.setVisibility(items.size() < 2 ? View.GONE : View.VISIBLE);
mBinding.control.prevRoot.setVisibility(items.size() < 2 ? View.GONE : View.VISIBLE);
-import android.annotation.SuppressLint;
+import tv.danmaku.ijk.media.player.ui.IjkVideoView;
import android.content.res.Configuration;
+public class VideoActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, QualityAdapter.OnClickListener, QuickAdapter.OnClickListener, ParseAdapter.OnClickListener, SubtitleCallback, CastDialog.Listener {
-import com.fongmi.android.tv.bean.Result;
package com.fongmi.android.tv.ui.activity;
-import com.fongmi.android.tv.bean.Result;
+package com.fongmi.android.tv.ui.activity;
+package com.fongmi.android.tv.ui.activity;
mEpisodeAdapter.addAll(items);
}
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index 0321c3e2568d102434a256a183f6a0480be2d502..f28ef55e7471a12b7816755c93d192e61564aefa 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -62,14 +62,11 @@ android:visibility="gone">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/group"
- android:layout_width="120dp"
+ android:layout_width="140dp"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
- android:paddingStart="8dp"
- android:paddingTop="8dp"
- android:paddingEnd="8dp"
- android:paddingBottom="8dp"
+ android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="5"
tools:listitem="@layout/adapter_group" />
@@ -85,10 +82,7 @@ android:layout_width="260dp"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
- android:paddingStart="8dp"
- android:paddingTop="8dp"
- android:paddingEnd="8dp"
- android:paddingBottom="8dp"
+ android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="5"
tools:listitem="@layout/adapter_channel" />
diff --git a/app/src/mobile/res/layout/adapter_channel.xml b/app/src/mobile/res/layout/adapter_channel.xml
index 208cf519db431308c828d54d38d5d6b79a9bd65a..5f6edeecfdf90b6bf99150f5d6214280fcdff9e0 100644
--- a/app/src/mobile/res/layout/adapter_channel.xml
+++ b/app/src/mobile/res/layout/adapter_channel.xml
@@ -3,15 +3,17 @@ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_marginTop="4dp"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_marginBottom="4dp"
android:background="@drawable/shape_channel"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="12dp"
- android:paddingTop="8dp"
+ android:paddingTop="6dp"
android:paddingEnd="12dp"
- android:paddingBottom="8dp">
+ android:paddingBottom="6dp">
<TextView
android:id="@+id/number"
diff --git a/app/src/mobile/res/layout/adapter_group.xml b/app/src/mobile/res/layout/adapter_group.xml
index d7ec5d2aacf09292c5d2ea70b26e6a1d3713f628..46fba2a9f15f489da97c2f8290f24952b21ddc7c 100644
--- a/app/src/mobile/res/layout/adapter_group.xml
+++ b/app/src/mobile/res/layout/adapter_group.xml
@@ -3,15 +3,15 @@ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="6dp"
- android:layout_marginBottom="4dp"
+ android:layout_marginBottom="6dp"
android:background="@drawable/shape_group"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="12dp"
- android:paddingTop="8dp"
+ android:paddingTop="6dp"
android:paddingEnd="12dp"
- android:paddingBottom="8dp">
+ android:paddingBottom="6dp">
<ImageView
android:id="@+id/logo"
@@ -26,7 +26,6 @@ android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
- android:ellipsize="marquee"
android:singleLine="true"
android:textColor="@color/group"
android:textSize="14sp"
diff --git a/app/src/mobile/res/layout/dialog_proxy.xml b/app/src/mobile/res/layout/dialog_proxy.xml
index 56e541743ff79603b43edd33284a474c6d66f175..4d6825b8ad91d306c39032549a53517a190d5bf8 100644
--- a/app/src/mobile/res/layout/dialog_proxy.xml
+++ b/app/src/mobile/res/layout/dialog_proxy.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -10,7 +11,8 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ app:hintEnabled="false">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text"
diff --git a/catvod/src/main/java/com/github/catvod/utils/Github.java b/catvod/src/main/java/com/github/catvod/utils/Github.java
index c1b210c8aa7bb4f90033cea3092c3c620dfaf34d..a94176261cb5f2e32bf39d25910a5b90bf891eb0 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Github.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Github.java
@@ -8,6 +8,12 @@ public class Github {
public static final String URL = "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main";
+ return URL + "/" + path + "/" + name;
+
+ public static void setAbi(String abi) {
+ Github.ABI = abi.replace("_", "-");
+ }
+
private static String getUrl(String path, String name) {
return URL + "/" + path + "/" + name;
}
@@ -24,8 +30,8 @@ public static String getSo(String name) {
try {
File file = Path.so(name);
moveExist(Path.download(), file);
+import com.github.catvod.net.OkHttp;
package com.github.catvod.utils;
- return URL + "/" + path + "/" + name;
if (file.length() < 300) Path.write(file, OkHttp.newCall(url).execute().body().bytes());
return file.getAbsolutePath();
} catch (Exception e) {
diff --git a/jianpian/build.gradle b/jianpian/build.gradle
index a23b16841459781bb9e2731b1a176f8438a2b26b..b9833212c431e6e0006868c8482e2910040f19cc 100644
--- a/jianpian/build.gradle
+++ b/jianpian/build.gradle
@@ -4,22 +4,10 @@ }
android {
compileSdk 34
- flavorDimensions = ["abi"]
defaultConfig {
minSdk 21
targetSdk 28
- }
-
- productFlavors {
- armeabi_v7a {
- dimension "abi"
- ndk { abiFilters "armeabi-v7a" }
- }
- arm64_v8a {
- dimension "abi"
- ndk { abiFilters "arm64-v8a" }
- }
}
}
diff --git a/jianpian/src/main/java/com/p2p/P2PClass.java b/jianpian/src/main/java/com/p2p/P2PClass.java
index 7b179f1a8f6e49b3f945feaa39a760d059ebe9d8..7bb23b92eb1900ad18451e3e1ebd3c11caa8136e 100644
--- a/jianpian/src/main/java/com/p2p/P2PClass.java
+++ b/jianpian/src/main/java/com/p2p/P2PClass.java
@@ -8,7 +8,7 @@
public int port;
public P2PClass() {
- System.load(Github.getSo("jpa_" + BuildConfig.FLAVOR));
+ System.load(Github.getSo("jpa"));
this.port = P2Pdoxstarthttpd("TEST3E63BAAECDAA79BEAA91853490A69F08".getBytes(), Path.jpa().getAbsolutePath().getBytes());
}
diff --git a/thunder/build.gradle b/thunder/build.gradle
index a23b16841459781bb9e2731b1a176f8438a2b26b..b9833212c431e6e0006868c8482e2910040f19cc 100644
--- a/thunder/build.gradle
+++ b/thunder/build.gradle
@@ -4,22 +4,10 @@ }
android {
compileSdk 34
- flavorDimensions = ["abi"]
defaultConfig {
minSdk 21
targetSdk 28
- }
-
- productFlavors {
- armeabi_v7a {
- dimension "abi"
- ndk { abiFilters "armeabi-v7a" }
- }
- arm64_v8a {
- dimension "abi"
- ndk { abiFilters "arm64-v8a" }
- }
}
}
diff --git a/thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java b/thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java
index 8690abe73e93d81be163adce781b718762bf2ec9..55a685da6a6b02bb12f7b170ad274e2f251db579 100644
--- a/thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java
+++ b/thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java
@@ -1,6 +1,5 @@
package com.xunlei.downloadlib;
-import com.ghost.thunder.BuildConfig;
import com.github.catvod.utils.Github;
import com.xunlei.downloadlib.parameter.BtIndexSet;
import com.xunlei.downloadlib.parameter.BtSubTaskDetail;
@@ -15,8 +14,8 @@
class XLLoader {
public XLLoader() {
- System.load(Github.getSo("xl_stat_" + BuildConfig.FLAVOR));
+ System.load(Github.getSo("xl_stat"));
- System.load(Github.getSo("xl_thunder_sdk_" + BuildConfig.FLAVOR));
+ System.load(Github.getSo("xl_thunder_sdk"));
}
public native int createBtMagnetTask(String str, String str2, String str3, GetTaskId getTaskId);
