1.修改上传的设备信息。

2.修改拦截器默认数据
3.增加定位Log日志

app/src/main/AndroidManifest.xml

@@ -29,6 +29,10 @@
     <!--位置权限-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!--后台获取位置信息，若需后台定位则必选-->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <!--用于申请调用A-GPS模块,卫星定位加速-->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <!--护眼模式权限，只有系统app可以使用-->
     <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"
         tools:ignore="ProtectedPermissions" />

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

@@ -134,6 +134,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         }
         data.doEvent = EventLog.ACCOUNTLOGINEVENT
         viewModel.eventLog(data)
+        Const.USERID=userBean.userid.toString()
         spUtils.saveJson(Const.USERINFO,userBean)
         val parseClassToJson = GsonUtils.parseClassToJson(userBean)
         ZSpProvider.save(this,Const.USERINFO,parseClassToJson)

app/src/main/java/com/xhly/manageapp/utils/PadInfoUtils.kt

@@ -24,7 +24,7 @@ class PadInfoUtils {
             ManageApplication.getDeviceInfo()?.let {sn->
                 padInfoBean.sn=sn
             }
-            padInfoBean.deviceModel= Build.DEVICE
+            padInfoBean.deviceModel= Build.MODEL
             padInfoBean.deviceVersion=Build.VERSION.CODENAME
             padInfoBean.wifyMac=SystemUtil.getWifiMac(context)
             padInfoBean.blueMac=SystemUtil.getBluetoothMac()

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

@@ -67,9 +67,12 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
                         padLocationBean.userid=it.userid
                     }
                     logService.postPadLocation(padLocationBean)
+                    LogShow("真没有位置")
+                }else{
+                    LogShow("没有位置")
                 }
             }catch (e:Exception){
-
+                LogShow("没有位置问题"+e.toString())
             }
         }
         return result

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

@@ -3,7 +3,8 @@ package com.xhly.corelib
 
 object Const {
     const val isDebug = true
-
+    //用户id
+     var USERID = "1"
     //接口地址
     const val URL1: String = "https://mcapitest.xhkjedu.com/"
 

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

@@ -23,9 +23,8 @@ class ResponseInterceptor : Interceptor {
         return try {
             val requestBuilder: Request.Builder = request.newBuilder()
             //TODO 需要替换userid和机型
-            requestBuilder.header("XH-UserId","1")
-           /* requestBuilder.header("XH-DeviceModel", Build.MODEL)*/
-            requestBuilder.header("XH-DeviceModel", "CPN-W09")
+            requestBuilder.header("XH-UserId",Const.USERID)
+            requestBuilder.header("XH-DeviceModel", Build.MODEL)
             request = requestBuilder.build()
             val originalResponse = chain.proceed(request)
             val responseBody = originalResponse.body

corelib/src/main/java/com/xhly/corelib/utils/SystemUtil.java

@@ -292,6 +292,11 @@ public class SystemUtil {
                         data=lastKnownLocation;
                     }
                 }
+                if (data!=null){
+                    LogUtils.d("获得地理位置", "lat="+data.getLatitude()+",lon="+data.getLongitude() );
+                }else {
+                    LogUtils.d("获得地理位置", "没有位置");
+                }
                 return data;
             }
         } catch (Exception e) {