version 1.0.3

WrBug · Jan 25, 2019 · dbc923c · dbc923c
1 parent b5bbc18
commit dbc923c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.wrbug.developerhelper"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 100020
-        versionName "1.0.2"
+        versionCode 100030
+        versionName "1.0.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "arm64-v8a"

diff --git a/app/src/main/java/com/wrbug/developerhelper/ui/activity/main/MainActivity.kt b/app/src/main/java/com/wrbug/developerhelper/ui/activity/main/MainActivity.kt
@@ -64,6 +64,10 @@ class MainActivity : BaseVMActivity<MainViewModel>() {
 
         })
         xposedSettingView.setOnClickListener {
+            if (xposedSettingView.isChecked().not()) {
+                showSnack(getString(R.string.open_xposed_first))
+                return@setOnClickListener
+            }
             startActivity(Intent(this, XposedSettingActivity::class.java))
         }
     }

diff --git a/app/src/main/java/com/wrbug/developerhelper/ui/widget/settingitemview/SettingItemView.kt b/app/src/main/java/com/wrbug/developerhelper/ui/widget/settingitemview/SettingItemView.kt
@@ -62,6 +62,8 @@ class SettingItemView : FrameLayout {
         switcherMaskView.setOnClickListener(l)
     }
 
+    fun isChecked() = switcher.isChecked
+
     private fun setSwitchCheckable() {
         if (checkable) {
 //            switcher.setOnTouchListener(null)

diff --git a/app/src/main/res/layout/activity_xposed_setting.xml b/app/src/main/res/layout/activity_xposed_setting.xml
@@ -36,6 +36,6 @@
             app:src="@drawable/ic_xposed_custom_666666"
             app:summary="开发中，支持自定义模块加载"
             app:switchVisible="false"
-            app:title="自定义功能" />
+            app:title="自定义模块管理" />
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -16,8 +16,8 @@
     <string name="open_float_window">开启悬浮窗权限</string>
     <string name="open_root_permission_summary">推荐开启，用于获取应用数据库等信息，不开启部分信息无法显示，Xposed无法使用</string>
     <string name="open_root_permission_title">开启root权限</string>
-    <string name="open_xposed_title">启用xposed特性</string>
-    <string name="open_xposed_summary">开发中</string>
+    <string name="open_xposed_title">启用Xposed特性</string>
+    <string name="open_xposed_summary">支持脱壳，更多功能持续开发中，点击进入管理</string>
     <string name="accessibility_description">辅助功能用于界面布局分析等</string>
     <string name="about">关于</string>
     <string name="about_content">软件开发中，交流群：627962572</string>
@@ -82,4 +82,5 @@
     <string name="shell_app_manager_summary">管理、移除需要脱壳的应用</string>
     <string name="shell_app_manager">脱壳应用管理</string>
     <string name="remove_item">移除该项</string>
+    <string name="open_xposed_first">请先开启Xposed设置</string>
 </resources>
diff --git a/readme.md b/readme.md
@@ -12,6 +12,13 @@ Android 5.0+
 
 ![](https://i.loli.net/2018/12/26/5c23070cda923.png)![](https://i.loli.net/2018/12/26/5c23070d9bd25.png)
 
+
+
+### 新版本功能 v1.0.3
+
+* 新增Android Pie (sdk28) [EdXposed](https://github.com/solohsu/EdXposed)支持
+* 新增脱壳应用管理
+
 ### 已支持功能
 
 1. 应用基本信息查看包括：

diff --git a/xposedmodule/build.gradle b/xposedmodule/build.gradle
@@ -50,7 +50,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation project(':basecommon')
-    implementation 'com.wrbug:jsposed:0.0.2'
 }
 repositories {
     mavenCentral()