Browse Source

代码优化,增加反射库

weizhengliang 3 years ago
parent
commit
d892c01085

+ 7 - 4
app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -1,10 +1,12 @@
 package com.wdkl.app.ncs.application
 
+//import android.content.Context
 import com.enation.javashop.android.jrouter.JRouter
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
 import com.wdkl.ncs.android.lib.base.BaseApplication
+//import me.weishu.reflection.Reflection
 
 /**
  * @author LDD
@@ -76,9 +78,10 @@ class Application : BaseApplication() {
         NetEngineConfig.init(baseContext)
                 .openLogger()
                 .addNetInterceptor(RestfulExceptionInterceptor())
-
-        // 初始化信令
-        //SkyEngineKit.init(VoipEvent())
-        //SocketManager.getInstance().init(applicationContext)
     }
+
+//    override fun attachBaseContext(base: Context?) {
+//        super.attachBaseContext(base)
+//        Reflection.unseal(base)
+//    }
 }

+ 7 - 0
home/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.wdkl.ncs.android.component.home">
 
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.BLUETOOTH"/>
@@ -23,6 +25,11 @@
     <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
 
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
+
     <application
         android:allowBackup="true"
         android:supportsRtl="true">

+ 29 - 29
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -273,21 +273,21 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             Observable.just("")
                     .compose(
                             RxPermissions(this)
-                                    .ensure(
-                                            Manifest.permission.CAMERA,
-                                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                                            Manifest.permission.ACCESS_WIFI_STATE,
-                                            Manifest.permission.BLUETOOTH,
-                                            Manifest.permission.RECORD_AUDIO,
-                                            Manifest.permission.CALL_PHONE,
-                                            Manifest.permission.READ_PHONE_STATE,
-                                            Manifest.permission.READ_CALL_LOG,
-                                            Manifest.permission.ANSWER_PHONE_CALLS,
-                                            Manifest.permission.WRITE_CALL_LOG,
-                                            Manifest.permission.READ_CONTACTS,
-                                            Manifest.permission.WRITE_CONTACTS
-                                    )
+                                .ensure(
+                                    Manifest.permission.CAMERA,
+                                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                    Manifest.permission.ACCESS_WIFI_STATE,
+                                    Manifest.permission.BLUETOOTH,
+                                    Manifest.permission.RECORD_AUDIO,
+                                    Manifest.permission.CALL_PHONE,
+                                    Manifest.permission.READ_PHONE_STATE,
+                                    Manifest.permission.READ_CALL_LOG,
+                                    Manifest.permission.ANSWER_PHONE_CALLS,
+                                    Manifest.permission.WRITE_CALL_LOG,
+                                    Manifest.permission.READ_CONTACTS,
+                                    Manifest.permission.WRITE_CONTACTS
+                                )
                     )
                     .subscribe {
                         if (!it) {
@@ -301,20 +301,20 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             Observable.just("")
                     .compose(
                             RxPermissions(this)
-                                    .ensure(
-                                            Manifest.permission.CAMERA,
-                                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                                            Manifest.permission.ACCESS_WIFI_STATE,
-                                            Manifest.permission.BLUETOOTH,
-                                            Manifest.permission.RECORD_AUDIO,
-                                            Manifest.permission.CALL_PHONE,
-                                            Manifest.permission.READ_PHONE_STATE,
-                                            Manifest.permission.READ_CALL_LOG,
-                                            Manifest.permission.WRITE_CALL_LOG,
-                                            Manifest.permission.READ_CONTACTS,
-                                            Manifest.permission.WRITE_CONTACTS
-                                    )
+                                .ensure(
+                                    Manifest.permission.CAMERA,
+                                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                    Manifest.permission.ACCESS_WIFI_STATE,
+                                    Manifest.permission.BLUETOOTH,
+                                    Manifest.permission.RECORD_AUDIO,
+                                    Manifest.permission.CALL_PHONE,
+                                    Manifest.permission.READ_PHONE_STATE,
+                                    Manifest.permission.READ_CALL_LOG,
+                                    Manifest.permission.WRITE_CALL_LOG,
+                                    Manifest.permission.READ_CONTACTS,
+                                    Manifest.permission.WRITE_CONTACTS
+                                )
                     )
                     .subscribe {
                         if (!it) {

+ 0 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -23,7 +23,6 @@ import com.wdkl.ncs.android.component.home.activity.NewEventListActivity
 import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig
 import com.wdkl.ncs.android.component.home.ui.CallSingleActivity
 import com.wdkl.ncs.android.component.home.util.*
-import com.wdkl.ncs.android.component.home.util.SpeechUtil.SpeechRunnable
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.getJsonString

+ 0 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/util/AppUtils.java

@@ -9,7 +9,6 @@ import android.util.Log;
 
 import com.wdkl.ncs.android.component.home.activity.WatchHome2Activity;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
-import com.wdkl.ncs.keepbackground.work.DaemonEnv;
 
 public class AppUtils {
 

+ 2 - 0
middleware/build.gradle

@@ -81,4 +81,6 @@ dependencies {
     compile 'io.swagger:swagger-annotations:1.5.14'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+
+    //compile 'com.github.tiann:FreeReflection:3.1.0'
 }