Skip to content

Commit

Permalink
Fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
lianglixin committed Feb 26, 2020
1 parent ca431fd commit 1fa14bf
Show file tree
Hide file tree
Showing 32 changed files with 679 additions and 192 deletions.
12 changes: 7 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ android {
applicationId "io.virtualapp.sandvxposed"
minSdkVersion 19
targetSdkVersion 28
versionCode 74
versionName "1.2.5.1.3.1.5.5"
versionCode 76
versionName "1.2.5.1.3.1.5.7"
multiDexEnabled true
android {
defaultConfig {
Expand Down Expand Up @@ -75,7 +75,7 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'com.melnykov:floatingactionbutton:1.3.0'
implementation 'androidx.percentlayout:percentlayout:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
//Promise Support
implementation 'org.jdeferred:jdeferred-android-aar:1.2.4'
Expand All @@ -85,8 +85,8 @@ dependencies {
implementation 'com.kyleduo.switchbutton:library:1.4.6'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
// annotationProcessor 'com.trend.lazyinject:compiler:3.4.0-beta'

// TX移动统计,非必要,大家可在构建的时候删掉
Expand All @@ -100,6 +100,8 @@ dependencies {
implementation 'com.bigkoo:alertview:1.0.3'

implementation 'androidx.appcompat:appcompat:1.1.0'

implementation 'com.gauravk.bubblenavigation:bubblenavigation:1.0.7'
}

android {
Expand Down
22 changes: 14 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@
android:label="@string/app_name"
android:networkSecurityConfig="@xml/sknetsec"
android:theme="@style/AppTheme">
<activity
android:name="com.zhongcheng.openva.zchome.ZCHome"
android:label="@string/title_activity_zchome"
android:theme="@style/Theme.MaterialComponents.Light.NoActionBar">
</activity>
<activity
android:name="com.sk.desktop.SKDesktop"
android:launchMode="singleInstance"
android:excludeFromRecents="true"/>
android:excludeFromRecents="true"
android:launchMode="singleInstance" />
<activity
android:name="com.sk.installapp.ManualInstallAct"
android:launchMode="singleInstance"
android:excludeFromRecents="true"/>
android:excludeFromRecents="true"
android:launchMode="singleInstance" />
<activity
android:name="com.sk.listapp.AppPwdSetting"
android:launchMode="singleInstance" />
Expand Down Expand Up @@ -107,7 +112,7 @@
android:name="com.sk.listapp.XAppManager"
android:label="@string/title_activity_xapp_manager"
android:launchMode="singleInstance"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity
android:name=".home.ShortcutAppActivity"
android:exported="true"
Expand All @@ -131,14 +136,15 @@

<activity
android:name=".splash.SplashActivity"
android:theme="@style/AppTheme"
android:excludeFromRecents="true">
android:excludeFromRecents="true"
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.MONKEY"/>
<category android:name="android.intent.category.MONKEY" />
</intent-filter>
</activity>
<activity
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<string name="ensurerestart">真的要重启吗?请确保已经保存好数据。</string>
<string name="manualpath">手动选择路径安装</string>
<string name="appInstallTip">正在安装应用,稍后请下拉桌面以刷新应用列表。</string>
<string name="about_info">"特别感谢甘!##SandVXP是一个应用程序,可以让用户在非Root和非引导加载程序解锁设备上使用Xposed模块。##将应用程序和模块添加或克隆到这个应用程序中,然后在菜单的“Xposed管理器”中启用它,应用和模块就可以工作了。##QQ 384550791##邮箱: king@fou.ink##网址https://www.fou.ink/ "</string>
<string name="about_info">"特别感谢甘!##SandVXP是一个应用程序,可以让用户在非Root和非引导加载程序解锁设备上使用Xposed模块。##将应用程序和模块添加或克隆到这个应用程序中,然后在菜单的“Xposed管理器”中启用它,应用和模块就可以工作了。##QQ 384550791##邮箱: king@fou.ink##网址https://www.die.lu/ "</string>
<string name="launch_failed">抱歉,启动失败。</string>
<string name="sys_crash">应用程序发生异常,已被捕捉,请留意。</string>
<string name="rom_shortcut_tips">检测到您的机型必须手动允许快捷方式的创建,请到系统设置->应用->权限管理,找到本应用,开启快捷方式权限。</string>
Expand Down 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">更新日志:修复部分BUG,支持安卓10.</string>
<string name="update_tips">更新日志:修复部分BUG,加入新桌面。</string>
<string name="enable_wakeup">应用唤醒设置</string>
<string name="wake_up_setting">启用或者禁用程序唤醒(切断唤醒)</string>
<string name="shared_to_inner_app">分享到SVXP内部的应用</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<string name="ensurerestart">真的要重启吗?</string>
<string name="manualpath">手动通过路径选择</string>
<string name="appInstallTip">正在安装应用,稍后请下拉桌面以刷新应用列表。</string>
<string name="about_info">"特别感谢甘!##SandVXP是一个应用程序,可以让用户在非Root和非引导加载程序解锁设备上使用Xposed模块。##将应用程序和模块添加或克隆到这个应用程序中,然后在菜单的“Xposed管理器”中启用它,应用和模块就可以工作了。##QQ 384550791##邮箱: king@fou.ink##网址https://www.fou.ink/ "</string>
<string name="about_info">"特别感谢甘!##SandVXP是一个应用程序,可以让用户在非Root和非引导加载程序解锁设备上使用Xposed模块。##将应用程序和模块添加或克隆到这个应用程序中,然后在菜单的“Xposed管理器”中启用它,应用和模块就可以工作了。##QQ 384550791##邮箱: king@fou.ink##网址https://www.die.lu/ "</string>
<string name="launch_failed">Sorry,App无法启动。</string>
<string name="sys_crash">应用程序异常,已经捕捉。</string>
<string name="rom_shortcut_tips">检测到您的机型必须手动允许快捷方式的创建,请到系统设置->应用->权限管理,找到本应用,开启快捷方式权限。</string>
Expand Down 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">更新日志:修复部分BUG,支持安卓10.</string>
<string name="update_tips">更新日志:修复部分BUG,加入新桌面。</string>
<string name="enable_wakeup">应用唤醒设置</string>
<string name="wake_up_setting">启用或者禁用程序唤醒(切断唤醒)</string>
<string name="shared_to_inner_app">分享到SVXP内部的应用</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<string name="ensurerestart">Wanna restart this application? Your changes must be saved or lost.</string>
<string name="manualpath">Install By Path Manually</string>
<string name="appInstallTip">Application is installing, take a while and swipe desktop for refresh.</string>
<string name="about_info">Special thanks for Gan!##SandVXP is a application that can let user use Xposed module on non-root and non-bootloader-unlock devices. Clone application into this app and xposed modules, then validate it in menu\'s xposed manager, and they will work.##QQ 384550791##E-Mail king@fou.ink##Website https://www.fou.ink/</string>
<string name="about_info">Special thanks for Gan!##SandVXP is a application that can let user use Xposed module on non-root and non-bootloader-unlock devices. Clone application into this app and xposed modules, then validate it in menu\'s xposed manager, and they will work.##QQ 384550791##E-Mail king@fou.ink##Website https://www.die.lu/</string>
<string name="launch_failed">Launch app failed...</string>
<string name="sys_crash">Application may crash but catch by SKActivity.</string>
<string name="rom_shortcut_tips">We detected your device must accept permission manual. Please allow shortcut ceration permission in system settings. Allow this in Settings -> App Management -> Permission Management -> this application -> allow shortcut permission.</string>
Expand Down 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: Fix bugs. Support Q Now.</string>
<string name="update_tips">Update Logs: Fix bugs. Add new desktop.</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
17 changes: 17 additions & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,21 @@
<item name="windowNoTitle">true</item>
</style>

<style name="InputBoxStyle">
<item name="android:layout_centerHorizontal">true</item>
<item name="android:layout_marginLeft">18dp</item>
<item name="android:layout_marginRight">18dp</item>
<item name="android:background">@drawable/border_input_box</item>
<item name="android:gravity">center</item>
<item name="android:orientation">horizontal</item>
</style>

<style name="EditTextStyle">
<item name="android:layout_marginTop">5dp</item>
<item name="android:layout_marginRight">10dp</item>
<item name="android:layout_marginBottom">5dp</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:background">@null</item>
</style>

</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:3.6.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
1 change: 1 addition & 0 deletions lib/.cxx/ndkBuild/debug/arm64-v8a/build_command.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ LOCAL_SHORT_COMMANDS=false
-n
jvmArgs :

Build command args:
137 changes: 100 additions & 37 deletions lib/.cxx/ndkBuild/debug/arm64-v8a/build_model.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,121 @@
{
"abi": "ARM64_V8A",
"abiPlatformVersion": 19,
"buildSettings": {
"environmentVariables": []
},
"cxxBuildFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a",
"info": {
"abi": "ARM64_V8A",
"bitness": 64,
"deprecated": false,
"default": true
},
"originalCxxBuildFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a",
"variant": {
"buildSystemArgumentList": [],
"buildTargetSet": [],
"cFlagsList": [],
"cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name",
"cppFlagsList": [],
"isDebuggableEnabled": true,
"module": {
"rootBuildGradleFolder": "E:\\Project_Conntainer\\VMProject\\sxp",
"sdkFolder": "D:\\DroidSDK",
"isNativeCompilerSettingsCacheEnabled": false,
"isBuildOnlyTargetAbiEnabled": true,
"splitsAbiFilterSet": [],
"intermediatesFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates",
"gradleModulePathName": ":lib",
"moduleRootFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib",
"makeFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\src\\main\\jni\\Android.mk",
"buildSystem": "NDK_BUILD",
"compilerSettingsCacheFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\.cxx",
"cmakeToolchainFile": "D:\\DroidSDK\\ndk-bundle\\build\\cmake\\android.toolchain.cmake",
"cxxFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx",
"ndkFolder": "D:\\DroidSDK\\ndk-bundle",
"ndkVersion": "20.0.5594570",
"ndkSupportedAbiList": [
"gradleModulePathName": ":lib",
"intermediatesFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates",
"makeFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\src\\main\\jni\\Android.mk",
"moduleBuildFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build.gradle",
"moduleRootFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib",
"ndkDefaultAbiList": [
"ARMEABI_V7A",
"ARM64_V8A",
"X86",
"X86_64"
],
"ndkDefaultAbiList": [
"ndkFolder": "D:\\DroidSDK\\ndk-bundle",
"ndkMetaAbiList": [
{
"abi": "ARMEABI_V7A",
"bitness": 32,
"deprecated": false,
"default": true
},
{
"abi": "ARM64_V8A",
"bitness": 64,
"deprecated": false,
"default": true
},
{
"abi": "X86",
"bitness": 32,
"deprecated": false,
"default": true
},
{
"abi": "X86_64",
"bitness": 64,
"deprecated": false,
"default": true
}
],
"ndkMetaPlatforms": {
"min": 16,
"max": 29,
"aliases": {
"20": 19,
"25": 24,
"J": 16,
"J-MR1": 17,
"J-MR2": 18,
"K": 19,
"L": 21,
"L-MR1": 22,
"M": 23,
"N": 24,
"N-MR1": 24,
"O": 26,
"O-MR1": 27,
"P": 28,
"Q": 29
}
},
"ndkSupportedAbiList": [
"ARMEABI_V7A",
"ARM64_V8A",
"X86",
"X86_64"
],
"cmakeToolchainFile": "."
"ndkVersion": "20.0.5594570",
"project": {
"compilerSettingsCacheFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\.cxx",
"cxxFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\.cxx",
"isBuildOnlyTargetAbiEnabled": true,
"isCmakeBuildCohabitationEnabled": false,
"isNativeCompilerSettingsCacheEnabled": false,
"rootBuildGradleFolder": "E:\\Project_Conntainer\\VMProject\\sxp",
"sdkFolder": "D:\\DroidSDK"
},
"splitsAbiFilterSet": [],
"stlSharedObjectMap": {
"LIBCXX_SHARED": {
"ARMEABI_V7A": "D:\\DroidSDK\\ndk-bundle\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot\\usr\\lib\\arm-linux-androideabi\\libc++_shared.so",
"ARM64_V8A": "D:\\DroidSDK\\ndk-bundle\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot\\usr\\lib\\aarch64-linux-android\\libc++_shared.so",
"X86": "D:\\DroidSDK\\ndk-bundle\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot\\usr\\lib\\i686-linux-android\\libc++_shared.so",
"X86_64": "D:\\DroidSDK\\ndk-bundle\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot\\usr\\lib\\x86_64-linux-android\\libc++_shared.so"
},
"LIBCXX_STATIC": {},
"NONE": {},
"SYSTEM": {}
}
},
"buildSystemArgumentList": [],
"cFlagList": [],
"cppFlagsList": [],
"variantName": "debug",
"soFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates\\ndkBuild\\debug\\lib",
"objFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates\\ndkBuild\\debug\\obj\\local",
"jsonFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug",
"gradleBuildOutputFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\cxx\\debug",
"isDebuggableEnabled": true,
"variantName": "debug",
"validAbiList": [
"ARMEABI_V7A",
"ARM64_V8A"
],
"buildTargetSet": []
},
"abi": "ARM64_V8A",
"abiPlatformVersion": 19,
"cxxBuildFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a",
"jsonFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\android_gradle_build.json",
"gradleBuildOutputFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\cxx\\debug\\arm64-v8a",
"objFolder": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\arm64-v8a",
"buildCommandFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_command.txt",
"buildOutputFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_output.txt",
"modelOutputFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_model.json",
"jsonGenerationLoggingRecordFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\json_generation_record.json",
"compileCommandsJsonFile": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\compile_commands.json"
]
}
}
12 changes: 9 additions & 3 deletions lib/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
[
{
"level": "INFO",
"message": "Start JSON generation. Platform version: 19 min SDK version: arm64-v8a"
"message": "Start JSON generation. Platform version: 19 min SDK version: arm64-v8a",
"file": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\src\\main\\jni\\Android.mk",
"tag": "debug|arm64-v8a"
},
{
"level": "INFO",
"message": "JSON \u0027E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\android_gradle_build.json\u0027 was up-to-date"
"message": "JSON \u0027E:\\Project_Conntainer\\VMProject\\sxp\\lib\\.cxx\\ndkBuild\\debug\\arm64-v8a\\android_gradle_build.json\u0027 was up-to-date",
"file": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\src\\main\\jni\\Android.mk",
"tag": "debug|arm64-v8a"
},
{
"level": "INFO",
"message": "JSON generation completed without problems"
"message": "JSON generation completed without problems",
"file": "E:\\Project_Conntainer\\VMProject\\sxp\\lib\\src\\main\\jni\\Android.mk",
"tag": "debug|arm64-v8a"
}
]
1 change: 1 addition & 0 deletions lib/.cxx/ndkBuild/debug/armeabi-v7a/build_command.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ LOCAL_SHORT_COMMANDS=false
-n
jvmArgs :

Build command args:
Loading

0 comments on commit 1fa14bf

Please sign in to comment.