代码优化

app/build.gradle

@@ -30,6 +30,10 @@ android {
         dataBinding {
             enabled true
         }
+
+        ndk {
+            abiFilters 'armeabi-v8a', 'armeabi-v7a'
+        }
     }
 
     signingConfigs {
@@ -124,16 +128,19 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'com.google.code.gson:gson:2.8.1'
+    //implementation 'com.google.code.gson:gson:2.8.1'
 
-    implementation 'com.squareup.okhttp3:okhttp:3.8.0'
+    //implementation 'com.squareup.okhttp3:okhttp:3.8.0'
 
 
     implementation 'org.webrtc:google-webrtc:1.0.32006'
     /**
      * netty
      */
-    compile 'io.netty:netty-all:4.1.42.Final'
+    implementation 'io.netty:netty-all:4.1.42.Final'
+    //解决 引入上方库，Log4J2Logger报错的问题
+    annotationProcessor 'org.apache.logging.log4j:log4j-core:2.7'
+    implementation 'org.apache.logging.log4j:log4j-api:2.7'
 
     implementation 'com.github.mjdev:libaums:0.6.0'
 

app/src/main/java/com/wdkl/ncs/entraceguard/activity/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.entraceguard.activity
 
+import android.Manifest
 import android.app.AlarmManager
 import android.content.Context
 import android.content.Intent
@@ -18,6 +19,7 @@ import android.view.View
 import android.widget.*
 import androidx.annotation.RequiresApi
 import com.alibaba.fastjson.JSON
+import com.enation.javashop.net.engine.plugin.permission.RxPermissions
 import com.google.common.base.Strings
 import com.szeasco.facesdk.helper.GpioHelper
 import com.wdkl.ncs.entraceguard.adapter.NumAdapter
@@ -50,10 +52,8 @@ import com.wdkl.ncs.middleware.di.ApiProviders
 import com.wdkl.ncs.middleware.di.DaggerFrameWorkComponent
 import com.wdkl.ncs.middleware.helper.NetHelper
 import com.wdkl.ncs.middleware.helper.RingPlayHelper
-import com.wdkl.ncs.middleware.utils.CommonUtils
-import com.wdkl.ncs.middleware.utils.MessageEvent
-import com.wdkl.ncs.middleware.utils.Util
-import com.wdkl.ncs.middleware.utils.showMessage
+import com.wdkl.ncs.middleware.utils.*
+import io.reactivex.Observable
 import iot.facereco.smart.terminal.BuildConfig
 import iot.facereco.smart.terminal.R
 import iot.facereco.smart.terminal.databinding.ActivityMainBinding
@@ -123,6 +123,30 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
 
     @RequiresApi(Build.VERSION_CODES.N)
     override fun init() {
+        //猫瞳默认已经给了权限
+        /*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
+            )
+        ).subscribe {
+            if (it) {
+                permissionGrant()
+            } else {
+                showMessage("请重新授权!")
+            }
+        }.joinManager(disposableManager)*/
+
+
+        permissionGrant()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    private fun permissionGrant() {
         if (SettingConfig.getSipEnabled(activity)) {
             initSip()
             tv_voice_type.text = "SIP"
@@ -529,18 +553,28 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                 //关闭灯光，闭合继电器
                 gpioHelper!!.ledDismiss(false);
 
-                val packageManager: PackageManager = packageManager
-                val intent: Intent = packageManager.getLaunchIntentForPackage("com.rlapk")
-                startActivity(intent)
+                try {
+                    val packageManager: PackageManager = packageManager
+                    val intent: Intent = packageManager.getLaunchIntentForPackage("com.rlapk")
+                    startActivity(intent)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+
                 System.exit(0)
             }, delay)
         } else {
             //关闭灯光，闭合继电器
             gpioHelper!!.ledDismiss(false);
 
-            val packageManager: PackageManager = packageManager
-            val intent: Intent = packageManager.getLaunchIntentForPackage("com.rlapk")
-            startActivity(intent)
+            try {
+                val packageManager: PackageManager = packageManager
+                val intent: Intent = packageManager.getLaunchIntentForPackage("com.rlapk")
+                startActivity(intent)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
             System.exit(0)
         }
     }

app/src/main/java/com/wdkl/ncs/entraceguard/application/Application.java

@@ -21,13 +21,8 @@ public class Application extends BaseApplication {
     }
 
     private void initFrame() {
-
         //init
         NetHelper.getInstance().init();
-        //初始化sdk
-        // 初始化信令
-//        SkyEngineKit.init(new VoipEvent());
-//        SocketManager.getInstance().init(appContext);
     }
 
 

app/src/main/java/com/wdkl/ncs/entraceguard/presenters/MainActivityPresenter.kt

@@ -1,6 +1,7 @@
 package com.wdkl.ncs.entraceguard.presenters
 
 import android.util.Log
+import com.enation.javashop.net.engine.utils.ThreadFromUtils
 import com.google.gson.FieldNamingPolicy
 import com.google.gson.GsonBuilder
 import com.wdkl.ncs.entraceguard.contracts.MainActivityContract
@@ -16,7 +17,6 @@ import com.wdkl.ncs.middleware.di.DaggerFrameWorkComponent
 import com.wdkl.ncs.middleware.exception.ExceptionHandle
 import com.wdkl.ncs.middleware.network.ConnectionObserver
 import com.wdkl.ncs.middleware.network.ConnectionQuality
-import com.wdkl.ncs.middleware.utils.ThreadFromUtils
 import com.wdkl.ncs.middleware.utils.getJsonString
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject

janus/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 //    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     implementation 'org.webrtc:google-webrtc:1.0.32006'
-    implementation 'com.squareup.okhttp3:okhttp:3.8.0'
+    //implementation 'com.squareup.okhttp3:okhttp:3.8.0'
     implementation project(path: ':middleware')
 //    implementation 'com.squareup.okhttp3:okhttp:3.8.0'
     //api 'org.greenrobot:eventbus:3.0.0'

middleware/build.gradle

@@ -67,8 +67,13 @@ dependencies {
      */
     kapt 'com.google.dagger:dagger-compiler:2.7'
 
-    compile 'io.reactivex.rxjava2:rxjava:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    //compile 'io.reactivex.rxjava2:rxjava:2.1.1'
+    //implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    /**
+     *  JavaShop_Android 网络库
+     */
+    compile 'com.enation.geamtear.net:engine:1.1.5'
 
     /**
      * google
@@ -90,16 +95,16 @@ dependencies {
      */
     compile 'com.android.support:multidex:1.0.2'
 
-    compile 'com.squareup.retrofit2:retrofit:2.0.2'
+    //compile 'com.squareup.retrofit2:retrofit:2.0.2'
 
-    implementation 'com.google.code.gson:gson:2.8.1'
+    //implementation 'com.google.code.gson:gson:2.8.1'
 
-    implementation 'com.squareup.okhttp3:okhttp:3.8.0'
+    //implementation 'com.squareup.okhttp3:okhttp:3.8.0'
 
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    //implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
 
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    //implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
 
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    //implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
 
 }

middleware/src/main/code/com/wdkl/ncs/middleware/utils/ThreadFromUtils.java

@@ -1,75 +0,0 @@
-package com.wdkl.ncs.middleware.utils;
-
-import org.reactivestreams.Publisher;
-
-import io.reactivex.Flowable;
-import io.reactivex.FlowableTransformer;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.schedulers.Schedulers;
-
-
-public class ThreadFromUtils {
-
-    /**
-     * 默认线程 处理数据在io线程 ，接收数据后的处理在主线程
-     * @param <T> Gson转换处理的泛型
-     * @return    线程控制对象
-     */
-    public static <T> ObservableTransformer<T, T> defaultSchedulers() {
-        return new ObservableTransformer<T, T>() {
-
-            @Override
-            public ObservableSource<T> apply(@NonNull Observable<T> upstream) {
-                return upstream.observeOn(AndroidSchedulers.mainThread()).subscribeOn(Schedulers.io());
-            }
-        };
-    }
-
-    /**
-     * 全部在Io线程
-     * @param <T> Gson转换处理的泛型
-     * @return    线程控制对象
-     */
-    public static <T> ObservableTransformer<T, T> all_io() {
-        return new ObservableTransformer<T, T>() {
-            @Override
-            public ObservableSource<T> apply(@NonNull Observable<T> upstream) {
-                return upstream.observeOn(Schedulers.io()).subscribeOn(Schedulers.io());
-            }
-        };
-    }
-
-    /**
-     * 默认线程 处理数据在io线程 ，接收数据后的处理在主线程
-     * @param <T> Gson转换处理的泛型
-     * @return    线程控制对象
-     */
-    public static <T> FlowableTransformer<T, T> defaultFolwSchedulers() {
-        return new FlowableTransformer<T, T>() {
-
-            @Override
-            public Publisher<T> apply(@NonNull Flowable<T> upstream) {
-                return upstream.observeOn(AndroidSchedulers.mainThread()).subscribeOn(Schedulers.io());
-            }
-        };
-    }
-
-    /**
-     * 全部在Io线程
-     * @param <T> Gson转换处理的泛型
-     * @return    线程控制对象
-     */
-    public static <T> FlowableTransformer<T, T> Flow_all_io() {
-        return new FlowableTransformer<T, T>() {
-
-            @Override
-            public Publisher<T> apply(@NonNull Flowable<T> upstream) {
-                return upstream.observeOn(Schedulers.io()).subscribeOn(Schedulers.io());
-            }
-        };
-    }
-}