1.设置可空参数。

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

@@ -17,7 +17,7 @@ class LogPushBean {
     /**
      * 推送目标：班级ID（pushObj=2）
      */
-    var pushObjid = 0L
+    var pushObjid:Long? = null
 
     /**
      * ：学生ids（pushObj=1）

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

@@ -308,7 +308,9 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         val pushBean=LogPushBean()
         pushBean.pushType=pushType
         pushBean.pushObjid=Const.SCHOOLID
-        pushBean.userids= longArrayOf(Const.USERID)
+        Const.USERID?.let {
+            pushBean.userids= longArrayOf(it)
+        }
         pushBean.pushObjname=Const.USERNAME
         viewModel.postLogPushAdd(pushBean)
     }

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

@@ -263,7 +263,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回键
-
+           getLocation()
         }
     }
 
@@ -686,7 +686,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         val pushBean= LogPushBean()
         pushBean.pushType=pushType
         pushBean.pushObjid=Const.SCHOOLID
-        pushBean.userids= longArrayOf(Const.USERID)
+        Const.USERID?.let {
+            pushBean.userids= longArrayOf(it)
+        }
         pushBean.pushObjname=Const.USERNAME
         viewModel.postLogPushAdd(pushBean)
     }
@@ -819,7 +821,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         data.comm = "退出登录"
         data.doEvent = EventLog.ACCOUNTQUITEVENT
         viewModel.eventLog(data)
-        Const.USERID=1L
+        Const.USERID=null
         Const.USERNAME=""
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)

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

@@ -5,16 +5,16 @@ object Const {
     const val isDebug = true
 
     //用户id
-    var USERID = 1L
+    var USERID :Long?= 1L
 
     //用户姓名
     var USERNAME = ""
 
     //学校id
-    var SCHOOLID = 0L
+    var SCHOOLID:Long? = 0L
 
     //班级id
-    var CLASSID = 0L
+    var CLASSID :Long?= 0L
 
     //标记上次打开的包名，当连续打开同一包名时，不认为打开多次
     var LASTPKGNAME = ""

corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt

@@ -23,7 +23,9 @@ class ResponseInterceptor : Interceptor {
         return try {
             val requestBuilder: Request.Builder = request.newBuilder()
             //TODO 需要替换userid和机型
-            requestBuilder.header("XH-UserId",Const.USERID.toString())
+            Const.USERID?.let {
+                requestBuilder.header("XH-UserId",Const.USERID.toString())
+            }
             requestBuilder.header("XH-DeviceModel", Build.MODEL)
             request = requestBuilder.build()
             val originalResponse = chain.proceed(request)