Browse Source

1.设置可空参数。

20241218TB223FC(测试jar包)
wangwanlei 10 months ago
parent
commit
94d3825f73

+ 1
- 1
app/src/main/java/com/xhly/manageapp/bean/log/LogPushBean.kt View File

17
     /**
17
     /**
18
      * 推送目标:班级ID(pushObj=2)
18
      * 推送目标:班级ID(pushObj=2)
19
      */
19
      */
20
-    var pushObjid = 0L
20
+    var pushObjid:Long? = null
21
 
21
 
22
     /**
22
     /**
23
      * :学生ids(pushObj=1)
23
      * :学生ids(pushObj=1)

+ 3
- 1
app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt View File

308
         val pushBean=LogPushBean()
308
         val pushBean=LogPushBean()
309
         pushBean.pushType=pushType
309
         pushBean.pushType=pushType
310
         pushBean.pushObjid=Const.SCHOOLID
310
         pushBean.pushObjid=Const.SCHOOLID
311
-        pushBean.userids= longArrayOf(Const.USERID)
311
+        Const.USERID?.let {
312
+            pushBean.userids= longArrayOf(it)
313
+        }
312
         pushBean.pushObjname=Const.USERNAME
314
         pushBean.pushObjname=Const.USERNAME
313
         viewModel.postLogPushAdd(pushBean)
315
         viewModel.postLogPushAdd(pushBean)
314
     }
316
     }

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

263
         }
263
         }
264
         onBackPressedDispatcher.addCallback {
264
         onBackPressedDispatcher.addCallback {
265
             //屏蔽返回键
265
             //屏蔽返回键
266
-
266
+           getLocation()
267
         }
267
         }
268
     }
268
     }
269
 
269
 
686
         val pushBean= LogPushBean()
686
         val pushBean= LogPushBean()
687
         pushBean.pushType=pushType
687
         pushBean.pushType=pushType
688
         pushBean.pushObjid=Const.SCHOOLID
688
         pushBean.pushObjid=Const.SCHOOLID
689
-        pushBean.userids= longArrayOf(Const.USERID)
689
+        Const.USERID?.let {
690
+            pushBean.userids= longArrayOf(it)
691
+        }
690
         pushBean.pushObjname=Const.USERNAME
692
         pushBean.pushObjname=Const.USERNAME
691
         viewModel.postLogPushAdd(pushBean)
693
         viewModel.postLogPushAdd(pushBean)
692
     }
694
     }
819
         data.comm = "退出登录"
821
         data.comm = "退出登录"
820
         data.doEvent = EventLog.ACCOUNTQUITEVENT
822
         data.doEvent = EventLog.ACCOUNTQUITEVENT
821
         viewModel.eventLog(data)
823
         viewModel.eventLog(data)
822
-        Const.USERID=1L
824
+        Const.USERID=null
823
         Const.USERNAME=""
825
         Const.USERNAME=""
824
         WorkManager.getInstance(this).cancelAllWork()
826
         WorkManager.getInstance(this).cancelAllWork()
825
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
827
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)

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

5
     const val isDebug = true
5
     const val isDebug = true
6
 
6
 
7
     //用户id
7
     //用户id
8
-    var USERID = 1L
8
+    var USERID :Long?= 1L
9
 
9
 
10
     //用户姓名
10
     //用户姓名
11
     var USERNAME = ""
11
     var USERNAME = ""
12
 
12
 
13
     //学校id
13
     //学校id
14
-    var SCHOOLID = 0L
14
+    var SCHOOLID:Long? = 0L
15
 
15
 
16
     //班级id
16
     //班级id
17
-    var CLASSID = 0L
17
+    var CLASSID :Long?= 0L
18
 
18
 
19
     //标记上次打开的包名,当连续打开同一包名时,不认为打开多次
19
     //标记上次打开的包名,当连续打开同一包名时,不认为打开多次
20
     var LASTPKGNAME = ""
20
     var LASTPKGNAME = ""

+ 3
- 1
corelib/src/main/java/com/xhly/corelib/network/ResponseInterceptor.kt View File

23
         return try {
23
         return try {
24
             val requestBuilder: Request.Builder = request.newBuilder()
24
             val requestBuilder: Request.Builder = request.newBuilder()
25
             //TODO 需要替换userid和机型
25
             //TODO 需要替换userid和机型
26
-            requestBuilder.header("XH-UserId",Const.USERID.toString())
26
+            Const.USERID?.let {
27
+                requestBuilder.header("XH-UserId",Const.USERID.toString())
28
+            }
27
             requestBuilder.header("XH-DeviceModel", Build.MODEL)
29
             requestBuilder.header("XH-DeviceModel", Build.MODEL)
28
             request = requestBuilder.build()
30
             request = requestBuilder.build()
29
             val originalResponse = chain.proceed(request)
31
             val originalResponse = chain.proceed(request)

Loading…
Cancel
Save