Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
chenjuntao
2022-10-13 14:01:13 +08:00
parent 6d8908fe57 082e9b376a
commit bd1887baad
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/gh/common/util/PackageUtils.java
View File

@ -48,8 +48,6 @@ import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@ -64,7 +62,6 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
public class PackageUtils {
@ -988,6 +985,12 @@ public class PackageUtils {
List<String> webViewAbiList = HaloApp.getInstance().getWebViewAbiList();
if (webViewAbiList != null) {
if (webViewAbiList.size() == 2 && webViewAbiList.contains("x86") && webViewAbiList.contains("x86_64")) {
return true;
}
if (webViewAbiList.size() == 1 && (webViewAbiList.contains("x86") || webViewAbiList.contains("x86_64"))) {
return true;
}
if (Build.CPU_ABI.equals("arm64-v8a")) {
return webViewAbiList.contains(Build.CPU_ABI);
}