1.添加百度地图定位。

app/build.gradle.kts

@@ -24,6 +24,9 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
+        ndk{
+            abiFilters += listOf("armeabi","armeabi-v7a","arm64-v8a","x86","x86_64")
+        }
     }
     viewBinding{
         enable=true
@@ -118,6 +121,7 @@ dependencies {
     implementation(project(mapOf("path" to ":websocket")))
     implementation(libs.androidx.cardview)
     testImplementation(libs.junit)
+    implementation("com.baidu.lbsyun:BaiduMapSDK_Location_All:9.3.7")
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
     androidTestImplementation(platform(libs.compose.bom))

app/src/main/AndroidManifest.xml

@@ -59,6 +59,11 @@
         <meta-data
             android:name="design_height_in_dp"
             android:value="667" /> <!-- 全局内容提供者 -->
+        <meta-data
+            android:name="com.baidu.lbsapi.API_KEY"
+            android:value="9eZF1Cg9JYIzme7dSnG8rmeUj7ET3lK1" >
+        </meta-data>
+        <service android:name="com.baidu.location.f" android:enabled="true" android:process=":remote"> </service>
         <activity
             android:name="com.xhly.manageapp.ui.main.activity.MainActivity"
             android:exported="true"

app/src/main/java/com/xhly/manageapp/bean/PadLocationConst.kt

@@ -0,0 +1,9 @@
+package com.xhly.manageapp.bean
+
+import com.xhly.manageapp.bean.log.PadLocationBean
+
+//存储地理位置，用来上传数据
+object PadLocationConst {
+    val currentLocation=PadLocationBean()
+    val lastLocation=PadLocationBean()
+}

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

@@ -7,12 +7,12 @@ class PadLocationBean {
     /**
      * 经度
      */
-    var lon:Double = 0.0
+    var lon:Double? = null
 
     /**
      * 维度
      */
-    var lat:Double = 0.0
+    var lat:Double? =null
 
     /**
      * 用户id
@@ -23,4 +23,9 @@ class PadLocationBean {
      * 设备sn
      */
     var sn = ""
+
+    /**
+     * address
+     */
+    var address:String?=null
 }

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -12,6 +12,7 @@ import com.xhly.manageapp.bean.log.UpdateBean
 import com.xhly.manageapp.bean.WallpaperBean
 import com.xhly.manageapp.bean.app.AppInstallBean
 import com.xhly.manageapp.bean.log.PadInfoBean
+import com.xhly.manageapp.bean.log.PadLocationBean
 import com.xhly.manageapp.bean.school.SchoolDeviceSetBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
@@ -250,4 +251,14 @@ class MainViewModel : BaseViewModel() {
             }
         }
     }
+
+    /**
+     * 发送定位
+     */
+
+    fun  postPadLocation(location:PadLocationBean){
+        launchUI {
+            logService.postPadLocation(location)
+        }
+    }
 }

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

@@ -15,6 +15,7 @@ import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.SystemUtil
 import com.xhly.corelib.utils.toFormat
 import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.PadLocationConst
 import com.xhly.manageapp.bean.log.LogAppStartBean
 import com.xhly.manageapp.bean.log.PadLocationBean
 import com.xhly.manageapp.bean.user.UserBean
@@ -59,19 +60,20 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             if (appInfo.size > 0) {
                 logService.postLogAppStartAdd(appInfo)
             }
+/*
             try {
-                val location = SystemUtil.getLocation(applicationContext)
-                if (location!=null){
-                    val padLocationBean=PadLocationBean()
-                    padLocationBean.lat=location.latitude
-                    padLocationBean.lon=location.longitude
+                val location = PadLocationConst.currentLocation
+                val lastLocation = PadLocationConst.lastLocation
+                if (location.lat!=null&&location.lon!=null&&(lastLocation.lon!=location.lon&&lastLocation.lat!=location.lat)){
+                    lastLocation.lat=location.lat
+                    lastLocation.lon=location.lon
                     ManageApplication.getDeviceInfo()?.let {
-                        padLocationBean.sn=it
+                        location.sn=it
                     }
                     userBean?.let {
-                        padLocationBean.userid=it.userid
+                        location.userid=it.userid
                     }
-                    logService.postPadLocation(padLocationBean)
+                    logService.postPadLocation(location)
                     LogShow("真没有位置")
                 }else{
                     LogShow("没有位置")
@@ -79,6 +81,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             }catch (e:Exception){
                 LogShow("没有位置问题"+e.toString())
             }
+*/
             //创建socket
             userBean?.let {
                 ManageApplication.instance?.let {