Skip to content

Commit

Permalink
Fix Android 11
Browse files Browse the repository at this point in the history
  • Loading branch information
梁丽欣 committed Oct 24, 2020
1 parent 2e3d68d commit 16851c8
Show file tree
Hide file tree
Showing 43 changed files with 267 additions and 534 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Expand Up @@ -17,10 +17,10 @@ android {
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "io.virtualapp.sandvxposed"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 28
versionCode 82
versionName "1.2.5.1.3.1.7.0"
versionCode 84
versionName "1.2.5.1.3.1.7.2"
multiDexEnabled true
android {
defaultConfig {
Expand Down Expand Up @@ -94,8 +94,8 @@ dependencies {
// annotationProcessor 'com.trend.lazyinject:compiler:3.4.0-beta'

// TX移动统计,非必要,大家可在构建的时候删掉
api 'com.qq.mta:mta:3.4.7-Release'
api 'com.tencent.mid:mid:4.06-Release'
implementation 'com.qq.mta:mta:3.7.1-release'
implementation 'com.tencent.mid:mid:4.1.5-release'

// ZLoadingView
api 'com.zyao89:zloading:1.2.0'
Expand Down
18 changes: 18 additions & 0 deletions app/debug/output-metadata.json
@@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "io.virtualapp.sandvxposed",
"variantName": "processDebugResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 84,
"versionName": "1.2.5.1.3.1.7.2",
"outputFile": "app-debug.apk"
}
]
}
Binary file removed app/src/main/assets/OaceOaT8w5Xda6wa
Binary file not shown.
5 changes: 5 additions & 0 deletions app/src/main/java/io/virtualapp/VApp.java
Expand Up @@ -2,6 +2,8 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build;

import androidx.multidex.MultiDexApplication;

import com.lody.virtual.client.core.VirtualCore;
Expand Down Expand Up @@ -33,6 +35,9 @@ public static VApp getApp() {
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
SandXposed.freeReflection(base);
}
SandXposed.init(BuildConfig.DEBUG);
VLog.OPEN_LOG = BuildConfig.DEBUG;
mPreferences = base.getSharedPreferences("va", Context.MODE_MULTI_PROCESS);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Expand Up @@ -111,7 +111,7 @@
<string name="sk_upgrade_localapp">默认会更新所有克隆的应用(会被更新到与本机安装版本相同),如果需要取消更新,请点击列表里面的项目。点击以后可以取消该应用的更新同步。</string>
<string name="clear_data">删除数据</string>
<string name="title_activity_app_data_manager">应用数据管理</string>
<string name="update_tips">更新日志:支持安卓11,修复部分问题。</string>
<string name="update_tips">更新日志:修复部分问题。</string>
<string name="enable_wakeup">应用唤醒设置</string>
<string name="wake_up_setting">启用或者禁用程序唤醒(切断唤醒)</string>
<string name="shared_to_inner_app">分享到SVXP内部的应用</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rTW/strings.xml
Expand Up @@ -111,7 +111,7 @@
<string name="sk_upgrade_localapp">默认会更新所有克隆的应用(会被更新到与本机安装版本相同),如果需要取消更新,请点击列表里面的项目。点击以后可以取消该应用的更新同步。</string>
<string name="clear_data">删除数据</string>
<string name="title_activity_app_data_manager">应用数据管理</string>
<string name="update_tips">更新日志:支持安卓11,修复部分问题。</string>
<string name="update_tips">更新日志:修复部分问题。</string>
<string name="enable_wakeup">应用唤醒设置</string>
<string name="wake_up_setting">启用或者禁用程序唤醒(切断唤醒)</string>
<string name="shared_to_inner_app">分享到SVXP内部的应用</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Expand Up @@ -169,7 +169,7 @@
<string name="sk_upgrade_localapp">All applications were added to list when page was loaded. You can click item in list for cancel item form syncing.</string>
<string name="title_activity_app_data_manager">Application Data Manager</string>
<string name="clear_data">Delete Data</string>
<string name="update_tips">Update Logs: Android 11 Support. Bugs fixed.</string>
<string name="update_tips">Update Logs: Bugs fixed.</string>
<string name="enable_wakeup">Application Wake Up</string>
<string name="wake_up_setting">Enable or disable application wake up</string>
<string name="shared_to_inner_app">Shared to SVXP\'s applications.</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -14,7 +14,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:4.1.0'
// classpath 'com.android.tools.build:gradle-experimental:3.3.2'
// classpath 'com.trend.lazyinject:aopweave:3.4.0-beta'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
60 changes: 30 additions & 30 deletions lib/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build.json

Large diffs are not rendered by default.

Expand Up @@ -4,22 +4,5 @@ Android NDK: WARNING:E:\Project_Conntainer\VMProject\sxp\lib\src\main\jni\Androi
Android NDK: This is likely to result in incorrect builds. Try using LOCAL_STATIC_LIBRARIES
Android NDK: or LOCAL_SHARED_LIBRARIES instead to list the library dependencies of the
Android NDK: current module
[armeabi-v7a] Compile++ thumb: skpkg <= skvery.cpp
[armeabi-v7a] SharedLibrary : libskpkg.so
[armeabi-v7a] Compile++ thumb: fb <= assert.cpp
[armeabi-v7a] Compile++ thumb: fb <= ByteBuffer.cpp
[armeabi-v7a] Compile++ thumb: fb <= Countable.cpp
[armeabi-v7a] Compile++ thumb: fb <= Environment.cpp
[armeabi-v7a] Compile++ thumb: fb <= Exceptions.cpp
[armeabi-v7a] Compile++ thumb: fb <= fbjni.cpp
[armeabi-v7a] Compile++ thumb: fb <= Hybrid.cpp
[armeabi-v7a] Compile++ thumb: fb <= jni_helpers.cpp
[armeabi-v7a] Compile++ thumb: fb <= LocalString.cpp
[armeabi-v7a] Compile++ thumb: fb <= OnLoad.cpp
[armeabi-v7a] Compile++ thumb: fb <= References.cpp
[armeabi-v7a] Compile++ thumb: fb <= WeakReference.cpp
[armeabi-v7a] Compile++ thumb: fb <= log.cpp
[armeabi-v7a] Compile++ thumb: fb <= lyra.cpp
[armeabi-v7a] Compile++ thumb: fb <= onload.cpp
[armeabi-v7a] StaticLibrary : libfb.a
[armeabi-v7a] SharedLibrary : libva++.so
make: Nothing to be done for 'skpkg'.
make: Nothing to be done for 'va++'.
2 changes: 1 addition & 1 deletion lib/.cxx/ndkBuild/debug/armeabi-v7a/build_command.txt
@@ -1,4 +1,4 @@
Executable : D:\DroidSDK\ndk-bundle\ndk-build.cmd
Executable : D:\DroidSDK\ndk-bundle\ndk-build.cmd
arguments :
NDK_PROJECT_PATH=null
APP_BUILD_SCRIPT=E:\Project_Conntainer\VMProject\sxp\lib\src\main\jni\Android.mk
Expand Down
5 changes: 3 additions & 2 deletions lib/.cxx/ndkBuild/debug/armeabi-v7a/build_model.json
Expand Up @@ -15,6 +15,7 @@
"variant": {
"buildSystemArgumentList": [],
"buildTargetSet": [],
"implicitBuildTargetSet": [],
"cFlagsList": [],
"cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name",
"cppFlagsList": [],
Expand Down Expand Up @@ -94,7 +95,6 @@
"project": {
"compilerSettingsCacheFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\.cxx",
"cxxFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\.cxx",
"ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi",
"isBuildOnlyTargetAbiEnabled": true,
"isCmakeBuildCohabitationEnabled": false,
"isNativeCompilerSettingsCacheEnabled": false,
Expand All @@ -118,7 +118,8 @@
"objFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates\\ndkBuild\\debug\\obj\\local",
"variantName": "debug",
"validAbiList": [
"ARMEABI_V7A"
"ARMEABI_V7A",
"X86"
],
"prefabDirectory": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\prefab",
"prefabPackageDirectoryList": []
Expand Down

0 comments on commit 16851c8

Please sign in to comment.