1.添加USB事件处理

app/src/main/java/com/xhly/manageapp/broadcastreceiver/USBReceiver.kt

@@ -1,25 +1,31 @@
-package com.xhly.manageapp.broadcastreceiver;
+package com.xhly.manageapp.broadcastreceiver
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.hardware.usb.UsbManager;
-import android.util.Log;
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.xhly.corelib.Const
+import com.xhly.corelib.eventbus.UIEvent
+import com.xhly.corelib.utils.LogShow
 
-public class USBReceiver extends BroadcastReceiver {
-    public static final String ACTION_USB_STATE = "android.hardware.usb.action.USB_STATE";
-    public static final String USB_FUNCTION_MTP = "mtp";
-    public static final String USB_FUNCTION_PTP = "ptp";
-    public static final String USB_FUNCTION_ADB = "adb";
-    public static final String USB_CONNECTED="connected";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
+class USBReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        val booleanExtra = intent.getBooleanExtra(USB_CONNECTED, false)
+        val booleanExtra1 = intent.getBooleanExtra(USB_FUNCTION_MTP, false)
+        val booleanExtra2 = intent.getBooleanExtra(USB_FUNCTION_PTP, false)
+        val booleanExtra3 = intent.getBooleanExtra(USB_FUNCTION_ADB, false)
+        LogShow("USBReceiver获取权限成功：1.链接==$booleanExtra,mtp==$booleanExtra1,ptp==$booleanExtra2,adb==$booleanExtra3")
+        if (booleanExtra){
+            UIEvent(Const.USB_CONNECTED).post()
+        }else{
+            UIEvent(Const.USB_NOCONNECTED).post()
+        }
+    }
 
-        boolean booleanExtra = intent.getBooleanExtra(USB_CONNECTED, false);
-        boolean booleanExtra1 = intent.getBooleanExtra(USB_FUNCTION_MTP, false);
-        boolean booleanExtra2 = intent.getBooleanExtra(USB_FUNCTION_PTP, false);
-        boolean booleanExtra3 = intent.getBooleanExtra(USB_FUNCTION_ADB, false);
-        Log.i("USBReceiver", "获取权限成功：1.链接=="+booleanExtra+",mtp=="+booleanExtra1+",ptp=="+booleanExtra2+",adb=="+booleanExtra3);
+    companion object {
+        const val ACTION_USB_STATE = "android.hardware.usb.action.USB_STATE"
+        const val USB_FUNCTION_MTP = "mtp"
+        const val USB_FUNCTION_PTP = "ptp"
+        const val USB_FUNCTION_ADB = "adb"
+        const val USB_CONNECTED = "connected"
     }
 }

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -24,7 +24,6 @@ import com.tbruyelle.rxpermissions2.RxPermissions
 import com.xhly.corelib.Const
 import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.eventbus.UIEvent
-import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.CustomOSUtils
 import com.xhly.corelib.utils.LogShow
@@ -38,7 +37,6 @@ import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.broadcastreceiver.SDReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
-import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.service.ManageAccessibilityService
 import com.xhly.manageapp.service.websocket.AppSocketService
 import com.xhly.manageapp.ui.ManageActivity
@@ -77,7 +75,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             UIEvent("2005").post()
         }
         registerAppInstallReceiver()
-       // registerSDReceiver()
+        // registerSDReceiver()
         /*
          使用情况权限
          val permissionIntent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
@@ -212,6 +210,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
                 }
             }
+
             Const.SDINSTALL -> {
                 val data = LogdOperateBean()
                 ManageApplication.getDeviceInfo()?.let {
@@ -219,9 +218,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
                 data.comm = "SD卡插入"
                 data.doEvent = EventLog.SDEMOUNTEDVENT
-               viewModel.eventLog(data)
+                viewModel.eventLog(data)
             }
-            Const.SDUNINSTALL->{
+
+            Const.SDUNINSTALL -> {
                 val data = LogdOperateBean()
                 ManageApplication.getDeviceInfo()?.let {
                     data.sn = it
@@ -230,7 +230,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.SDEJECTEVENT
                 viewModel.eventLog(data)
             }
-            Const.SIMINSTALL->{
+
+            Const.SIMINSTALL -> {
                 val data = LogdOperateBean()
                 ManageApplication.getDeviceInfo()?.let {
                     data.sn = it
@@ -239,7 +240,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.SIMEVENT
                 viewModel.eventLog(data)
             }
-            Const.BLUETOOTHOPEN->{
+
+            Const.BLUETOOTHOPEN -> {
                 val data = LogdOperateBean()
                 ManageApplication.getDeviceInfo()?.let {
                     data.sn = it
@@ -248,6 +250,27 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.BLUETOOHEVENT
                 viewModel.eventLog(data)
             }
+
+            Const.USB_CONNECTED -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "usb连接"
+                data.doEvent = EventLog.USBCONNECTEVENT
+                viewModel.eventLog(data)
+            }
+
+            Const.USB_NOCONNECTED -> {
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "usb断开"
+                data.doEvent = EventLog.USBDISCONNECTEVENT
+                viewModel.eventLog(data)
+            }
+
             "策略更新" -> {
 
             }
@@ -310,7 +333,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         intentFilter.addAction(Intent.ACTION_MEDIA_EJECT)
         intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED)
         intentFilter.addDataScheme("file")
-        intentFilter.priority=1000
+        intentFilter.priority = 1000
         mySDReceiver = SDReceiver()
         registerReceiver(mySDReceiver, intentFilter);
     }

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -78,7 +78,10 @@ object Const {
 
     //标记蓝牙打开
     const val BLUETOOTHOPEN = "BLUETOOTHOPEN"
-
+    //标记USB连接电脑
+    const val USB_CONNECTED="USB_CONNECTED"
+    //标记USB拔出电脑
+    const val USB_NOCONNECTED="USB_NOCONNECTED"
     //标记更新策略
     const val UPDATESTRATEGY = "UPDATESTRATEGY"