1.添加应用安装和卸载事件提交

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

@@ -34,11 +34,14 @@ import com.xhly.manageapp.databinding.ActivityLoginBinding
 import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.login.viewmodel.LoginViewModel
 import com.xhly.manageapp.ui.main.activity.MainActivity
+import com.xhly.manageapp.utils.CurrentAppSharedPreferencesUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
 import java.util.concurrent.TimeUnit
 
 class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
+    //单独创建sharedpreference用来存储初始化的应用
+    private val currentSpUtils by lazy { CurrentAppSharedPreferencesUtils.getInstance(this) }
     private var regioncode = ""
     override fun getBinding() = ActivityLoginBinding.inflate(layoutInflater)
 
@@ -58,6 +61,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     @SuppressLint("CheckResult")
     override fun initView() {
         setSoftInput(mBinding.root)
+
         mBinding.loginBtn.setOnClickListener {
             val rxPermissions = RxPermissions(this)
             val request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
@@ -100,6 +104,13 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     }
 
     private fun loginSucess(userBean: UserBean){
+        //提交登录事件
+        val data = LogdOperateBean()
+        ManageApplication.getDeviceInfo()?.let {
+            data.sn = it
+        }
+        data.doEvent = EventLog.ACCOUNTLOGINEVENT
+        viewModel.eventLog(data)
         spUtils.saveJson(Const.USERINFO,userBean)
         val parseClassToJson = GsonUtils.parseClassToJson(userBean)
         ZSpProvider.save(this,Const.USERINFO,parseClassToJson)
@@ -174,12 +185,6 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
 
             }
 
-
-            Const.LOGAPPSTART -> {
-
-            }
-
-
             Const.SDINSTALL -> {
                 val data = LogdOperateBean()
                 ManageApplication.getDeviceInfo()?.let {

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

@@ -486,11 +486,29 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             }
 
             Const.APPINSTALL -> {
+                val message = uiEvent.message
                 updateAppRv()
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "App安装"
+                data.appPackage = message
+                data.doEvent = EventLog.APPINSTALLEVENT
+                viewModel.eventLog(data)
             }
 
             Const.APPUNINSTALL -> {
+                val message = uiEvent.message
                 updateAppRv()
+                val data = LogdOperateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    data.sn = it
+                }
+                data.comm = "App卸载"
+                data.appPackage = message
+                data.doEvent = EventLog.APPUNINSTALLEVENT
+                viewModel.eventLog(data)
             }
 
             Const.SDINSTALL -> {
@@ -552,10 +570,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.USBDISCONNECTEVENT
                 viewModel.eventLog(data)
             }
-
-            "策略更新" -> {
-
-            }
         }
     }