Browse Source

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

20241218TB223FC(测试jar包)
wangwanlei 10 months ago
parent
commit
189d8d0ec9

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

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

+ 8
- 0
app/src/main/java/com/xhly/manageapp/bean/login/CheckLoginBean.kt View File

1
+package com.xhly.manageapp.bean.login
2
+
3
+class CheckLoginBean {
4
+    /**
5
+     * true需要重新登录false不需要重新登录
6
+     */
7
+    var needLogin=false
8
+}

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

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

+ 10
- 4
app/src/main/java/com/xhly/manageapp/network/UriAdress.kt View File

9
     /**
9
     /**
10
      * 设备推送事件接口
10
      * 设备推送事件接口
11
      */
11
      */
12
-   const val LOGPUSH_ADD="/logPush/add"
12
+    const val LOGPUSH_ADD = "/logPush/add"
13
+
13
     /**
14
     /**
14
      *应用启动日志-添加
15
      *应用启动日志-添加
15
      */
16
      */
38
     /**
39
     /**
39
      * 网址白名单
40
      * 网址白名单
40
      */
41
      */
41
-    const val APP_NET_WHITELIST="/white/list_pad"
42
+    const val APP_NET_WHITELIST = "/white/list_pad"
42
 
43
 
43
     /**
44
     /**
44
      * 设备--地理位置添加
45
      * 设备--地理位置添加
60
      */
61
      */
61
     const val ULOGIN_LOGIN = "/ulogin/login"
62
     const val ULOGIN_LOGIN = "/ulogin/login"
62
 
63
 
64
+    /**
65
+     * 登录校验接口
66
+     */
67
+    const val ULOGIN_CHECK_LOGIN = "/ulogin/check_login"
68
+
63
     /**
69
     /**
64
      * 退出登录接口
70
      * 退出登录接口
65
      */
71
      */
73
     /**
79
     /**
74
      * 获得壁纸
80
      * 获得壁纸
75
      */
81
      */
76
-    const val WALLPAPERPAD="/wallpaper/detail_pad"
82
+    const val WALLPAPERPAD = "/wallpaper/detail_pad"
77
 
83
 
78
     /**
84
     /**
79
      * 解除当前锁屏
85
      * 解除当前锁屏
80
      */
86
      */
81
-    const val PWD_DEATIL_USERPAD="/password/detail_userpad"
87
+    const val PWD_DEATIL_USERPAD = "/password/detail_userpad"
82
 }
88
 }

+ 1
- 1
app/src/main/java/com/xhly/manageapp/network/app/AppService.kt View File

3
 import com.xhly.corelib.network.bean.ResponseData
3
 import com.xhly.corelib.network.bean.ResponseData
4
 import com.xhly.manageapp.bean.AppModel
4
 import com.xhly.manageapp.bean.AppModel
5
 import com.xhly.manageapp.bean.ListAppBean
5
 import com.xhly.manageapp.bean.ListAppBean
6
-import com.xhly.manageapp.bean.UpdateBean
6
+import com.xhly.manageapp.bean.log.UpdateBean
7
 import com.xhly.manageapp.bean.WallpaperBean
7
 import com.xhly.manageapp.bean.WallpaperBean
8
 import com.xhly.manageapp.network.UriAdress
8
 import com.xhly.manageapp.network.UriAdress
9
 import retrofit2.http.Body
9
 import retrofit2.http.Body

+ 7
- 1
app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt View File

1
 package com.xhly.manageapp.ui.login.netservice
1
 package com.xhly.manageapp.ui.login.netservice
2
 
2
 
3
 import com.xhly.corelib.network.bean.ResponseData
3
 import com.xhly.corelib.network.bean.ResponseData
4
-import com.xhly.manageapp.bean.LoginBean
4
+import com.xhly.manageapp.bean.login.CheckLoginBean
5
+import com.xhly.manageapp.bean.login.LoginBean
5
 import com.xhly.manageapp.bean.user.UserBean
6
 import com.xhly.manageapp.bean.user.UserBean
6
 import com.xhly.manageapp.network.UriAdress
7
 import com.xhly.manageapp.network.UriAdress
7
 import retrofit2.http.Body
8
 import retrofit2.http.Body
14
 
15
 
15
     @POST(UriAdress.ULOGIN_LOGIN)
16
     @POST(UriAdress.ULOGIN_LOGIN)
16
     suspend fun postLogin(@Body loginBean: LoginBean): ResponseData<UserBean>
17
     suspend fun postLogin(@Body loginBean: LoginBean): ResponseData<UserBean>
18
+    /*
19
+     登录校验
20
+     */
21
+    @POST(UriAdress.ULOGIN_CHECK_LOGIN)
22
+    suspend fun postLoginCheck(@Body map:HashMap<String,Any>): ResponseData<CheckLoginBean>
17
 
23
 
18
     /**
24
     /**
19
      * 退出登录接口参数 userid	number 用户id
25
      * 退出登录接口参数 userid	number 用户id

+ 4
- 5
app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt View File

11
 import android.graphics.Color
11
 import android.graphics.Color
12
 import android.graphics.drawable.Drawable
12
 import android.graphics.drawable.Drawable
13
 import android.provider.Settings
13
 import android.provider.Settings
14
-import android.text.Editable
15
 import android.view.View
14
 import android.view.View
16
 import android.widget.Button
15
 import android.widget.Button
17
 import android.widget.EditText
16
 import android.widget.EditText
26
 import com.bumptech.glide.Glide
25
 import com.bumptech.glide.Glide
27
 import com.bumptech.glide.request.target.CustomViewTarget
26
 import com.bumptech.glide.request.target.CustomViewTarget
28
 import com.bumptech.glide.request.transition.Transition
27
 import com.bumptech.glide.request.transition.Transition
29
-import com.google.gson.reflect.TypeToken
30
 import com.kongzue.dialogx.dialogs.CustomDialog
28
 import com.kongzue.dialogx.dialogs.CustomDialog
31
 import com.kongzue.dialogx.interfaces.OnBindView
29
 import com.kongzue.dialogx.interfaces.OnBindView
32
 import com.tbruyelle.rxpermissions2.RxPermissions
30
 import com.tbruyelle.rxpermissions2.RxPermissions
45
 import com.xhly.manageapp.R
43
 import com.xhly.manageapp.R
46
 import com.xhly.manageapp.bean.EventLog
44
 import com.xhly.manageapp.bean.EventLog
47
 import com.xhly.manageapp.bean.SocketMsgBean
45
 import com.xhly.manageapp.bean.SocketMsgBean
48
-import com.xhly.manageapp.bean.UpdateBean
46
+import com.xhly.manageapp.bean.log.UpdateBean
49
 import com.xhly.manageapp.bean.log.LogPushBean
47
 import com.xhly.manageapp.bean.log.LogPushBean
50
 import com.xhly.manageapp.bean.log.LogdOperateBean
48
 import com.xhly.manageapp.bean.log.LogdOperateBean
51
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
49
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
52
-import com.xhly.manageapp.bean.strategy.AppTimeManageBean
53
 import com.xhly.manageapp.bean.strategy.StrategyBean
50
 import com.xhly.manageapp.bean.strategy.StrategyBean
54
 import com.xhly.manageapp.bean.user.UserBean
51
 import com.xhly.manageapp.bean.user.UserBean
55
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
52
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
56
 import com.xhly.manageapp.databinding.ActivityMainBinding
53
 import com.xhly.manageapp.databinding.ActivityMainBinding
57
 import com.xhly.manageapp.service.ManageAccessibilityService
54
 import com.xhly.manageapp.service.ManageAccessibilityService
58
-import com.xhly.manageapp.service.websocket.AppSocket
59
 import com.xhly.manageapp.ui.ManageActivity
55
 import com.xhly.manageapp.ui.ManageActivity
60
 import com.xhly.manageapp.ui.login.activity.LoginActivity
56
 import com.xhly.manageapp.ui.login.activity.LoginActivity
61
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
57
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
679
                 data.doEvent = EventLog.USBDISCONNECTEVENT
675
                 data.doEvent = EventLog.USBDISCONNECTEVENT
680
                 viewModel.eventLog(data)
676
                 viewModel.eventLog(data)
681
             }
677
             }
678
+            Const.APPSTOREKEY->{
679
+                loginOut()
680
+            }
682
         }
681
         }
683
     }
682
     }
684
 
683
 

+ 15
- 1
app/src/main/java/com/xhly/manageapp/workmanager/TimingWorker.kt View File

7
 import androidx.work.Worker
7
 import androidx.work.Worker
8
 import androidx.work.WorkerParameters
8
 import androidx.work.WorkerParameters
9
 import com.xhly.corelib.Const
9
 import com.xhly.corelib.Const
10
+import com.xhly.corelib.eventbus.UIEvent
10
 import com.xhly.corelib.network.RetrofitService
11
 import com.xhly.corelib.network.RetrofitService
11
 import com.xhly.corelib.utils.AppUtils
12
 import com.xhly.corelib.utils.AppUtils
12
 import com.xhly.corelib.utils.LogShow
13
 import com.xhly.corelib.utils.LogShow
19
 import com.xhly.manageapp.bean.user.UserBean
20
 import com.xhly.manageapp.bean.user.UserBean
20
 import com.xhly.manageapp.network.log.LogService
21
 import com.xhly.manageapp.network.log.LogService
21
 import com.xhly.manageapp.service.websocket.AppSocket
22
 import com.xhly.manageapp.service.websocket.AppSocket
23
+import com.xhly.manageapp.ui.login.netservice.LoginService
22
 import kotlinx.coroutines.CoroutineScope
24
 import kotlinx.coroutines.CoroutineScope
23
 import kotlinx.coroutines.MainScope
25
 import kotlinx.coroutines.MainScope
24
 import kotlinx.coroutines.cancel
26
 import kotlinx.coroutines.cancel
25
 import kotlinx.coroutines.launch
27
 import kotlinx.coroutines.launch
28
+import org.json.JSONObject
26
 import java.util.Calendar
29
 import java.util.Calendar
27
 
30
 
28
 /**
31
 /**
30
  */
33
  */
31
 class TimingWorker(context: Context, workerParams: WorkerParameters) :
34
 class TimingWorker(context: Context, workerParams: WorkerParameters) :
32
     Worker(context, workerParams) {
35
     Worker(context, workerParams) {
36
+    private val loginService by lazy { RetrofitService.create<LoginService>() }
37
+    private val logService by lazy {  RetrofitService.create<LogService>() }
33
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
38
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
34
     private val spUtils by lazy {
39
     private val spUtils by lazy {
35
         SharedPreferencesUtils.getInstance(context)
40
         SharedPreferencesUtils.getInstance(context)
41
 
46
 
42
     override fun doWork(): Result {
47
     override fun doWork(): Result {
43
         val result: Result = Result.success()
48
         val result: Result = Result.success()
44
-        val logService = RetrofitService.create<LogService>()
45
         serviceScope.launch {
49
         serviceScope.launch {
46
             LogShow("执行定时任务吧")
50
             LogShow("执行定时任务吧")
47
             var userBean:UserBean?=null
51
             var userBean:UserBean?=null
79
             ManageApplication.instance?.let {
83
             ManageApplication.instance?.let {
80
                 AppSocket.startSocket(it)
84
                 AppSocket.startSocket(it)
81
             }
85
             }
86
+            //校验登录
87
+            userBean?.let {
88
+                val map=HashMap<String,Any>()
89
+                map["userid"]=userBean.userid
90
+                map["loginpwd"]=userBean.loginpwd
91
+                val postLoginCheck = loginService.postLoginCheck(map)
92
+                if (postLoginCheck.code==0&&postLoginCheck.obj.needLogin){
93
+                    UIEvent(Const.ACCOUNTLOGINOUT).post()
94
+                }
95
+            }
82
         }
96
         }
83
         return result
97
         return result
84
     }
98
     }

+ 6
- 0
corelib/src/main/java/com/xhly/corelib/Const.kt View File

40
     //存储是否是第一次打开的key
40
     //存储是否是第一次打开的key
41
     const val FIRSTAPPLIST = "FIRSTAPPLIST"
41
     const val FIRSTAPPLIST = "FIRSTAPPLIST"
42
 
42
 
43
+    /**
44
+     * 标记推出1登录
45
+     */
46
+    const val ACCOUNTLOGINOUT = "ACCOUNTLOGINOUT"
47
+
48
+
43
     /**
49
     /**
44
      * 存储应用商店应用包名集合
50
      * 存储应用商店应用包名集合
45
      */
51
      */

Loading…
Cancel
Save