diff --git a/app/build.gradle b/app/build.gradle
index 5428c206d..56e8c7fba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,12 @@ plugins {
android {
compileSdk 33
- flavorDimensions "mode", "api"
+ flavorDimensions "mode", "api", "abi"
defaultConfig {
applicationId "com.fongmi.android.tv"
minSdk 21
targetSdk 29
- ndk { abiFilters "armeabi-v7a" }
javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -22,7 +21,7 @@ android {
leanback {
dimension "mode"
versionCode 77
- versionName "20230523#4"
+ versionName "20230523#5"
}
mobile {
dimension "mode"
@@ -35,6 +34,16 @@ android {
python {
dimension "api"
}
+ armeabi_v7a {
+ dimension "abi"
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "armeabi-v7a" }
+ }
+ arm64_v8a {
+ dimension "abi"
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "arm64-v8a" }
+ }
}
buildFeatures {
@@ -61,7 +70,7 @@ android {
android.applicationVariants.all { variant ->
variant.outputs.all { output ->
- outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}.apk"
+ outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}-${variant.productFlavors[2].name}.apk"
}
}
diff --git a/app/src/leanback/java/com/fongmi/android/tv/Updater.java b/app/src/leanback/java/com/fongmi/android/tv/Updater.java
index 05ee9e1fa..f7a859033 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/Updater.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/Updater.java
@@ -44,7 +44,7 @@ public class Updater implements Download.Callback {
}
private String getApk() {
- return Github.get().getBranchPath(branch, "/release/" + BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + ".apk");
+ return Github.get().getBranchPath(branch, "/release/" + BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + BuildConfig.FLAVOR_abi + ".apk");
}
private Updater() {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6966a4eb0..d439417b6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -61,9 +61,9 @@
直播
壁纸
播放器
- User Agent
- Tunnel Mode
- Http Source
+ User-Agent
+ 隧道模式
+ Http 数据源
解码方式
渲染方式
缩放比例
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index deb6e3462..bbcc3e751 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -61,9 +61,9 @@
直播
壁紙
播放器
- User Agent
- Tunnel Mode
- Http Source
+ User-Agent
+ 隧道模式
+ Http 數據源
解碼方式
渲染方式
縮放比例
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8efbafb6..4b3d4b0e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,9 +61,9 @@
Live
Wallpaper
Player
- User Agent
- Tunnel Mode
- Http Source
+ User-Agent
+ Tunnel mode
+ Http data source
Decode
Render
Scale
diff --git a/drpy/build.gradle b/drpy/build.gradle
index ba35a0998..aea6107ff 100644
--- a/drpy/build.gradle
+++ b/drpy/build.gradle
@@ -8,7 +8,6 @@ android {
defaultConfig {
minSdk 21
targetSdk 29
- ndk { abiFilters "armeabi-v7a" }
}
}
diff --git a/forcetech/build.gradle b/forcetech/build.gradle
index 331e142e3..0afc85af2 100644
--- a/forcetech/build.gradle
+++ b/forcetech/build.gradle
@@ -8,5 +8,7 @@ android {
defaultConfig {
minSdk 21
targetSdk 29
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "armeabi-v7a" }
}
}
\ No newline at end of file
diff --git a/pyramid/build.gradle b/pyramid/build.gradle
index 36f82ad3b..e235f4a01 100644
--- a/pyramid/build.gradle
+++ b/pyramid/build.gradle
@@ -9,7 +9,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 29
- ndk { abiFilters "armeabi-v7a" }
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "armeabi-v7a", "arm64-v8a" }
python {
buildPython "C:/Users/FongMi.DIREK/Anaconda3/envs/py38/python.exe"
pip {
diff --git a/tvbus/build.gradle b/tvbus/build.gradle
index 331e142e3..0afc85af2 100644
--- a/tvbus/build.gradle
+++ b/tvbus/build.gradle
@@ -8,5 +8,7 @@ android {
defaultConfig {
minSdk 21
targetSdk 29
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "armeabi-v7a" }
}
}
\ No newline at end of file
diff --git a/zlive/build.gradle b/zlive/build.gradle
index c3b629d61..dee83f308 100644
--- a/zlive/build.gradle
+++ b/zlive/build.gradle
@@ -8,6 +8,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 29
+ //noinspection ChromeOsAbiSupport
+ ndk { abiFilters "armeabi-v7a" }
}
}