diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/productFlavors/fMultiDisplayOchBus.gradle index 9736b06986..43fff66de1 100644 --- a/app/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/productFlavors/fMultiDisplayOchBus.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/productFlavors/fMultiDisplayOchTaxi.gradle index 8c26dd60ca..7c95db8fd3 100644 --- a/app/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index 912b83cc7c..fbfd08b1e7 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/productFlavors/fMultiDisplaySweeper.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index bc5a33d4d4..245ff86dca 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index 199094c23e..f7338b4090 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index 124a4f8f43..aa50f49580 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchSweeper.gradle b/app/productFlavors/fPadLenovoOchSweeper.gradle index 8b4a76dfff..54d673fcdc 100644 --- a/app/productFlavors/fPadLenovoOchSweeper.gradle +++ b/app/productFlavors/fPadLenovoOchSweeper.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index a9662f22eb..ebeac659c3 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -5,7 +5,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 5d9df2f4d4..5c37382209 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index bad8db6879..3790b2cfd8 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -32,7 +32,7 @@ android { } externalNativeBuild { ndk { - abiFilters 'armeabi-v7a'//, 'arm64-v8a' + abiFilters 'armeabi-v7a', 'arm64-v8a' } } } diff --git a/app_mogo_magic_ring/build.gradle b/app_mogo_magic_ring/build.gradle index 6836a13e5b..44f73d10b3 100644 --- a/app_mogo_magic_ring/build.gradle +++ b/app_mogo_magic_ring/build.gradle @@ -20,7 +20,7 @@ android { } externalNativeBuild { ndk { - abiFilters 'armeabi-v7a'//, 'arm64-v8a' + abiFilters 'armeabi-v7a', 'arm64-v8a' } } } diff --git a/core/function-impl/mogo-core-function-chat/build.gradle b/core/function-impl/mogo-core-function-chat/build.gradle index 6b25a6ac71..af1385fc7d 100644 --- a/core/function-impl/mogo-core-function-chat/build.gradle +++ b/core/function-impl/mogo-core-function-chat/build.gradle @@ -24,7 +24,7 @@ android { } ndk { - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt new file mode 100644 index 0000000000..907a96144d --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt @@ -0,0 +1,29 @@ +package com.mogo.eagle.core.function.main + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.BarUtils +import com.mogo.eagle.core.widget.TextureVideoView + +/** + * 视频广告 TODO 测试用的,可删除 + */ +class VideoAdAtc : AppCompatActivity() { + + private lateinit var svpFrame: TextureVideoView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_video_ad_atc) + + svpFrame = findViewById(R.id.svp_frame) + + val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad + svpFrame.videoPath = url + svpFrame.start() + + BarUtils.hideStatusBarAndSticky(this.window) + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 b/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 new file mode 100644 index 0000000000..c73fca4389 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 differ diff --git a/libraries/map-usbcamera/build.gradle b/libraries/map-usbcamera/build.gradle index ff0df5dcca..2616caa0ec 100644 --- a/libraries/map-usbcamera/build.gradle +++ b/libraries/map-usbcamera/build.gradle @@ -27,7 +27,7 @@ android { } ndk { - abiFilters "armeabi-v7a"//, "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a" } } diff --git a/test/crashreport-apmbyte/build.gradle b/test/crashreport-apmbyte/build.gradle index 2ed5c92d20..eeab9e0aa8 100644 --- a/test/crashreport-apmbyte/build.gradle +++ b/test/crashreport-apmbyte/build.gradle @@ -18,7 +18,7 @@ android { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/test/crashreport-noop/build.gradle b/test/crashreport-noop/build.gradle index 629ce89c60..1a8e3eadfe 100644 --- a/test/crashreport-noop/build.gradle +++ b/test/crashreport-noop/build.gradle @@ -18,7 +18,7 @@ android { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"