1.Const添加新常量。

2.AppUtils增加获得应用版本和版本名称。
3.ManageAccessibilityService增加Event事件记录应用打开

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -8,7 +8,7 @@ import com.xhly.corelib.utils.ModelNameUtils
 
 class ManageApplication : MultiDexApplication() {
     companion object {
-        var csdkManager: CSDKManager? = null
+        private var csdkManager: CSDKManager? = null
 
         /**
          * 加入可安装应用白名单
@@ -53,7 +53,7 @@ class ManageApplication : MultiDexApplication() {
          */
         fun setDisplayBlacklist(pkgList: ArrayList<String>) {
             if (ModelNameUtils.IS_LianxX505f()) {
-                csdkManager?.displayBlacklistV3=pkgList
+                csdkManager?.displayBlacklistV3 = pkgList
             }
         }
 
@@ -184,6 +184,16 @@ class ManageApplication : MultiDexApplication() {
                 csdkManager?.setRuntimePermissions(enableFlag)
             }
         }
+
+        /**
+         * "设备Mac地址", "设备SN号", "获取设备型号信息", "获取设备IMEI信息" 1,2,3,4
+         */
+        fun getDeviceInfo(type: Int = 2): String? {
+            if (ModelNameUtils.IS_LianxX505f()) {
+                return csdkManager?.getDeviceInfo(type)
+            }
+            return "0"
+        }
     }
 
     override fun onCreate() {

app/src/main/java/com/xhly/manageapp/bean/AppTimeManageBean.kt

@@ -0,0 +1,8 @@
+package com.xhly.manageapp.bean
+
+//用力处理APP的时间管控,包括包名和可使用的时间段
+class AppTimeManageBean {
+    private var pkgName = ""
+    private var startTime = 0L
+    private var endTime = 0L
+}

app/src/main/java/com/xhly/manageapp/network/LogService.kt

@@ -20,4 +20,7 @@ interface LogService {
     @POST(UriAdress.LOGAPPSTARTADD)
     suspend fun postLogAppStartAdd(@Body logApp: LogAppStartBean)
 
+    @POST("/appgroup/list_app")
+    suspend fun postListApp()
+
 }

app/src/main/java/com/xhly/manageapp/service/ManageAccessibilityService.kt

@@ -2,18 +2,25 @@ package com.xhly.manageapp.service
 
 import android.accessibilityservice.AccessibilityService
 import android.view.accessibility.AccessibilityEvent
+import com.xhly.corelib.Const
+import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.LogShow
 
 class ManageAccessibilityService : AccessibilityService() {
     override fun onAccessibilityEvent(event: AccessibilityEvent?) {
-       event?.let {
-           if (AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED == it.eventType) {
-               LogShow(it.packageName.toString() +"|||" + it.className.toString())
-               if (it.className.toString().equals("com.example.mytestxf.MainActivity")){
-                   performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK)
-               }
-           }
-       }
+        event?.let {
+            if (AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED == it.eventType) {
+                LogShow(it.packageName.toString() + "|||" + it.className.toString())
+                if (it.className.toString().equals("com.example.mytestxf.MainActivity")) {
+                    performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK)
+                }
+                if (!it.packageName.toString().isNullOrBlank()) {
+                    val uiEvent = UIEvent(Const.LOGAPPSTART)
+                    uiEvent.setMessage(it.packageName.toString())
+                    uiEvent.post()
+                }
+            }
+        }
     }
 
     override fun onInterrupt() {

app/src/main/java/com/xhly/manageapp/service/websocket/AppSocketService.kt

@@ -10,16 +10,19 @@ import android.content.Intent
 import android.os.Build
 import android.widget.Toast
 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.LogShow
 import com.xhly.corelib.utils.SharedPreferencesUtils
+import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.LogAppStartBean
 import com.xhly.manageapp.bean.LogdOperateBean
 import com.xhly.manageapp.network.LogService
 import com.xhly.websocket.service.LongConnService
 import com.xhly.websocket.utils.SocketPushUtils.dealPushMessage
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
@@ -32,12 +35,17 @@ open class AppSocketService : LongConnService() {
     var CHANNEL_NAME = "通知"
     var logService = RetrofitService.create<LogService>()
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
+    private var appList = arrayListOf<AppInfo>()
+
+    //标记上次打开的包名，当连续打开同一包名时，不认为打开多次
+    private var lastPkgName = ""
 
     /*  private var csdkManager: CSDKManager? = null*/
     val spUtils by lazy { SharedPreferencesUtils.getInstance(this) }
 
     companion object {
         fun openWebSocket(context: Context) {
+            LogShow("打开广播")
             context.startService(Intent(context, AppSocketService::class.java))
         }
 
@@ -49,9 +57,11 @@ open class AppSocketService : LongConnService() {
     override fun onCreate() {
         super.onCreate()
         EventBus.getDefault().register(this)
-        connectUrl = "wss://api.stsotc.com/api/ws"
+        connectUrl = "wss://mcwstest.xhkjedu.com/ws"
         /*   csdkManager = CSDKManager(this)*/
         /* startNotification()*/
+        LogShow("已经创建")
+        appList = AppUtils.GetAppList(this) as ArrayList<AppInfo>
     }
 
     override fun processTextMessage(text: String) {
@@ -88,6 +98,26 @@ open class AppSocketService : LongConnService() {
                 //csdkManager?.launchFactoryReset()
             }
 
+            Const.LOGAPPSTART -> {
+                val message = uiEvent.message
+                val filter = appList.filter { it.packageName == message }
+                if (filter.isNotEmpty()) {
+                    val appInfo = filter[0]
+                    serviceScope.launch {
+                        val logStartBean = LogAppStartBean()
+                        ManageApplication.getDeviceInfo()?.let {
+                            logStartBean.sn = it
+                        }
+                        logStartBean.appName = appInfo.name
+                        logStartBean.appPackage = appInfo.packageName
+                        logStartBean.versionName = appInfo.versionName
+                        logStartBean.versionNum = appInfo.versionNum
+                    LogShow("当前应用"+logStartBean.appName+"|||"+logStartBean.versionName+"|||"+logStartBean.versionNum)
+                    //logService.postLogAppStartAdd(logStartBean)
+                    }
+                }
+            }
+
             "10086" -> {
                 serviceScope.launch {
                     logService.postLogdoperateAdd(LogdOperateBean())
@@ -122,6 +152,11 @@ open class AppSocketService : LongConnService() {
         stopForeground(Service.STOP_FOREGROUND_REMOVE)
         /*  val intent=Intent(this,ManageService::class.java)
           startService(intent)*/
+        val intent = Intent()
+        intent.setPackage("com.xhly.manageapp")
+        intent.setAction("test")
+        sendBroadcast(intent)
+        LogShow("已经销毁")
     }
 
     private fun startNotification() {

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

@@ -28,7 +28,6 @@ import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.R
-import com.xhly.manageapp.bean.LogdOperateBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
 import com.xhly.manageapp.network.LogService
@@ -51,7 +50,7 @@ class MainActivity : BaseActivity<CommonBaseViewModel, ActivityMainBinding>() {
         if (user.isNullOrBlank()) {
             startIntentActivity(LoginActivity().javaClass)
         }
-        val getAppList1 = AppUtils.GetAppList1(this)
+        val getAppList1 = AppUtils.GetAppList(this)
         dataList.addAll(getAppList1)
         dataList.forEach {
             LogShow("数据" + it.packageName + "|||")
@@ -71,22 +70,24 @@ class MainActivity : BaseActivity<CommonBaseViewModel, ActivityMainBinding>() {
          使用情况权限
          val permissionIntent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
           startActivity(permissionIntent)*/
-        AppSocketService.openWebSocket(this)
         // csdkManagerUtils.csdkManager.enableAccessibility("com.xhly.manageapp","com.xhly.manageapp.service.TestService",true)
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+    }
     override fun initView() {
-        var logService = RetrofitService.create<LogService>()
         mBinding.loginoutIv.setOnClickListener {
-           /* showEditDialog()*/
-            lifecycleScope.launch {
-                logService.postLogdoperateAdd(LogdOperateBean())
-            }
+            showEditDialog()
         }
         mBinding.stoptv.setOnClickListener {
             spUtils.setParam(Const.DISABLEAPP, false)
         }
         onBackPressedDispatcher.addCallback {
+          lifecycleScope.launch {
+              var logService = RetrofitService.create<LogService>()
+              logService.postListApp()
+          }
             //屏蔽返回
         }
     }
@@ -96,6 +97,9 @@ class MainActivity : BaseActivity<CommonBaseViewModel, ActivityMainBinding>() {
         super.onResume()
         getAppInfo()
         useStrategy()
+        if (!isServiceON(this,AppSocketService::class.java.name)){
+            AppSocketService.openWebSocket(this)
+        }
         /*      lifecycleScope.launch(Dispatchers.IO) {
                   delay(20000)
                   withContext(Dispatchers.Main) {
@@ -147,7 +151,7 @@ class MainActivity : BaseActivity<CommonBaseViewModel, ActivityMainBinding>() {
         when (uiEvent.getEvent()) {
             "update" -> {
                 dataList.clear()
-                val getAppList1 = AppUtils.GetAppList1(this)
+                val getAppList1 = AppUtils.GetAppList(this)
                 dataList.addAll(getAppList1)
                 adapter.notifyDataSetChanged()
                 dataList.forEach {
@@ -295,10 +299,7 @@ class MainActivity : BaseActivity<CommonBaseViewModel, ActivityMainBinding>() {
                     titleTv.text = getString(R.string.exit)
                     enterTv.setOnClickListener {
                         dialog.dismiss()
-                        val intent = Intent(Settings.ACTION_DEVICE_INFO_SETTINGS)
-                        startActivity(intent)
-
-                        //loginOut()
+                        loginOut()
                     }
                     cancelTv.setOnClickListener {
                         dialog.dismiss()

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

@@ -35,5 +35,6 @@ object Const {
     //恢复出厂
     const val CODE2006 = 2006
 
-
+    //应用启动日志
+    const val LOGAPPSTART="LOGAPPSTART"
 }

corelib/src/main/java/com/xhly/corelib/utils/AppUtils.java

@@ -5,6 +5,7 @@ import static com.xhly.corelib.utils.BaseUtilsKt.LogShow;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
@@ -15,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AppUtils {
-    public static List<AppInfo> GetAppList1(Context context) {
+    public static List<AppInfo> GetAppList(Context context) {
         List<AppInfo> list = new ArrayList<>();
         PackageManager pm = context.getPackageManager();
         Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -31,6 +32,13 @@ public class AppUtils {
             mInfo.setIco(info.activityInfo.applicationInfo.loadIcon(pm));
             mInfo.setName(info.activityInfo.applicationInfo.loadLabel(pm).toString());
             mInfo.setPackageName(packName);
+            try {
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo(packName, PackageManager.GET_META_DATA);
+                 mInfo.setVersionName(packageInfo.versionName);
+                 mInfo.setVersionNum(packageInfo.versionCode);
+            } catch (PackageManager.NameNotFoundException e) {
+                throw new RuntimeException(e);
+            }
             // 为应用程序的启动Activity 准备Intent
             Intent launchIntent = new Intent();
             launchIntent.setComponent(new ComponentName(packName,

websocket/src/main/java/com/xhly/websocket/utils/SocketPushUtils.kt

@@ -9,7 +9,9 @@ object SocketPushUtils {
     fun dealPushMessage(content: String) {
         try {
             //没用泛型是因为如果带有泛型的类型，可能会遇到解析异常的问题。需要使用TypeToken
-            var socketData = GsonUtils.parseJsonWithGson(content, WebSocketData::class.java)
+          /*  var socketData = GsonUtils.parseJsonWithGson(content, WebSocketData::class.java)*/
+            LogShow("数据$content")
+            var socketData=WebSocketData()
             socketData.code.let { code ->
                 when (code) {
                     1001 -> {