1.添加登录定时校验接口

app/src/main/java/com/xhly/manageapp/bean/UpdateBean.kt → app/src/main/java/com/xhly/manageapp/bean/log/UpdateBean.kt

@@ -1,4 +1,4 @@
-package com.xhly.manageapp.bean
+package com.xhly.manageapp.bean.log
 
 class UpdateBean {
     /**

app/src/main/java/com/xhly/manageapp/bean/login/CheckLoginBean.kt

@@ -0,0 +1,8 @@
+package com.xhly.manageapp.bean.login
+
+class CheckLoginBean {
+    /**
+     * true需要重新登录false不需要重新登录
+     */
+    var needLogin=false
+}

app/src/main/java/com/xhly/manageapp/bean/LoginBean.kt → app/src/main/java/com/xhly/manageapp/bean/login/LoginBean.kt

@@ -1,4 +1,4 @@
-package com.xhly.manageapp.bean
+package com.xhly.manageapp.bean.login
 
 //用于登录
 class LoginBean {

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

@@ -9,7 +9,8 @@ object UriAdress {
     /**
      * 设备推送事件接口
      */
-   const val LOGPUSH_ADD="/logPush/add"
+    const val LOGPUSH_ADD = "/logPush/add"
+
     /**
      *应用启动日志-添加
      */
@@ -38,7 +39,7 @@ object UriAdress {
     /**
      * 网址白名单
      */
-    const val APP_NET_WHITELIST="/white/list_pad"
+    const val APP_NET_WHITELIST = "/white/list_pad"
 
     /**
      * 设备--地理位置添加
@@ -60,6 +61,11 @@ object UriAdress {
      */
     const val ULOGIN_LOGIN = "/ulogin/login"
 
+    /**
+     * 登录校验接口
+     */
+    const val ULOGIN_CHECK_LOGIN = "/ulogin/check_login"
+
     /**
      * 退出登录接口
      */
@@ -73,10 +79,10 @@ object UriAdress {
     /**
      * 获得壁纸
      */
-    const val WALLPAPERPAD="/wallpaper/detail_pad"
+    const val WALLPAPERPAD = "/wallpaper/detail_pad"
 
     /**
      * 解除当前锁屏
      */
-    const val PWD_DEATIL_USERPAD="/password/detail_userpad"
+    const val PWD_DEATIL_USERPAD = "/password/detail_userpad"
 }

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

@@ -3,7 +3,7 @@ package com.xhly.manageapp.network.app
 import com.xhly.corelib.network.bean.ResponseData
 import com.xhly.manageapp.bean.AppModel
 import com.xhly.manageapp.bean.ListAppBean
-import com.xhly.manageapp.bean.UpdateBean
+import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.WallpaperBean
 import com.xhly.manageapp.network.UriAdress
 import retrofit2.http.Body

app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt

@@ -1,7 +1,8 @@
 package com.xhly.manageapp.ui.login.netservice
 
 import com.xhly.corelib.network.bean.ResponseData
-import com.xhly.manageapp.bean.LoginBean
+import com.xhly.manageapp.bean.login.CheckLoginBean
+import com.xhly.manageapp.bean.login.LoginBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.UriAdress
 import retrofit2.http.Body
@@ -14,6 +15,11 @@ interface LoginService {
 
     @POST(UriAdress.ULOGIN_LOGIN)
     suspend fun postLogin(@Body loginBean: LoginBean): ResponseData<UserBean>
+    /*
+     登录校验
+     */
+    @POST(UriAdress.ULOGIN_CHECK_LOGIN)
+    suspend fun postLoginCheck(@Body map:HashMap<String,Any>): ResponseData<CheckLoginBean>
 
     /**
      * 退出登录接口参数 userid	number 用户id

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

@@ -11,7 +11,6 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.provider.Settings
-import android.text.Editable
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
@@ -26,7 +25,6 @@ import androidx.work.WorkManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomViewTarget
 import com.bumptech.glide.request.transition.Transition
-import com.google.gson.reflect.TypeToken
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
@@ -45,17 +43,15 @@ import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.R
 import com.xhly.manageapp.bean.EventLog
 import com.xhly.manageapp.bean.SocketMsgBean
-import com.xhly.manageapp.bean.UpdateBean
+import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
-import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
 import com.xhly.manageapp.service.ManageAccessibilityService
-import com.xhly.manageapp.service.websocket.AppSocket
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
@@ -679,6 +675,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 data.doEvent = EventLog.USBDISCONNECTEVENT
                 viewModel.eventLog(data)
             }
+            Const.APPSTOREKEY->{
+                loginOut()
+            }
         }
     }
 

app/src/main/java/com/xhly/manageapp/workmanager/TimingWorker.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.xhly.corelib.Const
+import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.LogShow
@@ -19,10 +20,12 @@ import com.xhly.manageapp.bean.log.PadLocationBean
 import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.service.websocket.AppSocket
+import com.xhly.manageapp.ui.login.netservice.LoginService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import org.json.JSONObject
 import java.util.Calendar
 
 /**
@@ -30,6 +33,8 @@ import java.util.Calendar
  */
 class TimingWorker(context: Context, workerParams: WorkerParameters) :
     Worker(context, workerParams) {
+    private val loginService by lazy { RetrofitService.create<LoginService>() }
+    private val logService by lazy {  RetrofitService.create<LogService>() }
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
     private val spUtils by lazy {
         SharedPreferencesUtils.getInstance(context)
@@ -41,7 +46,6 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
 
     override fun doWork(): Result {
         val result: Result = Result.success()
-        val logService = RetrofitService.create<LogService>()
         serviceScope.launch {
             LogShow("执行定时任务吧")
             var userBean:UserBean?=null
@@ -79,6 +83,16 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             ManageApplication.instance?.let {
                 AppSocket.startSocket(it)
             }
+            //校验登录
+            userBean?.let {
+                val map=HashMap<String,Any>()
+                map["userid"]=userBean.userid
+                map["loginpwd"]=userBean.loginpwd
+                val postLoginCheck = loginService.postLoginCheck(map)
+                if (postLoginCheck.code==0&&postLoginCheck.obj.needLogin){
+                    UIEvent(Const.ACCOUNTLOGINOUT).post()
+                }
+            }
         }
         return result
     }

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

@@ -40,6 +40,12 @@ object Const {
     //存储是否是第一次打开的key
     const val FIRSTAPPLIST = "FIRSTAPPLIST"
 
+    /**
+     * 标记推出1登录
+     */
+    const val ACCOUNTLOGINOUT = "ACCOUNTLOGINOUT"
+
+
     /**
      * 存储应用商店应用包名集合
      */