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

Merge branch 'hotfix-v5.13.1-611-check_webview_is_available' into 'release'

Browse Source 
修改模拟器不能显示网页的问题

See merge request halo/android/assistant-android!354
This commit is contained in:
陈君陶
2022-10-13 11:48:03 +08:00
parent 6fd43dd61b baae314d85
commit 52a23f5bde
1 changed files with 6 additions and 3 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 {
@ -1000,6 +997,12 @@ public class PackageUtils {
List<String> webViewAbiList = HaloApp.getInstance().webViewAbiList;
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);
}