1.添加应用安装提示。

2.添加定位自动回调。
3.锁屏时释放允许点击事件触发。

app/src/main/AndroidManifest.xml

@@ -40,6 +40,7 @@
     <uses-permission
         android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"
         tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name="com.xhly.manageapp.ManageApplication"
@@ -63,7 +64,7 @@
             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>
+        <service android:name="com.baidu.location.f" android:enabled="true" android:process=":remote" android:foregroundServiceType="location"> </service>
         <activity
             android:name="com.xhly.manageapp.ui.main.activity.MainActivity"
             android:exported="true"

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

@@ -7,6 +7,8 @@ import DownloadItem
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.ActivityManager
+import android.app.Notification
+import android.app.PendingIntent
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -26,8 +28,6 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.GridLayoutManager
@@ -88,7 +88,6 @@ import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -312,12 +311,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                                            if (app.versionNum > currentApp.versionNum) {
                                                //版本低则更新安装。
                                                //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
-                                               DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage)
+                                               DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage,appName)
                                            }
                                        } else {
                                            //不存在，直接下载安装。
                                            //AppDownLoadUtils.addToDownloadQueue(apkPath, appName,app.appPackage)
-                                           DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage)
+                                           DownLoadUtils.addDownload(apkPath,app.appPackage,File(file.toString(), "$appName.apk").toString(),app.appPackage,appName)
                                        }
                                    } catch (e: Exception) {
                                        LogShow("问题" + e.toString())
@@ -500,6 +499,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                             }
                         }
                     }else{
+                        canClickFlag=true
                         autoAppFlag=false
                         startIntentActivity(MainActivity().javaClass)
                     }
@@ -718,8 +718,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
             }
         }
         Const.backNum++
-        if (mainLockFlag&&lastTimeLong+10*60*1000<System.currentTimeMillis()){
-            //如果时锁定状态进入这个页面则请求一次策略,限制为10分钟
+        if (mainLockFlag&&lastTimeLong+5*60*1000<System.currentTimeMillis()){
+            //如果时锁定状态进入这个页面则请求一次策略,限制为5分钟
             lastTimeLong=System.currentTimeMillis()
             updateAllStrategy()
         }else if (Const.backNum > Const.UPDATESTRATEGYNUM){
@@ -773,6 +773,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         viewModel.uploadAppStrategy()
         viewModel.postAppNetWhiteList()
         updatePadInfo()
+        updateAppInstallInfo()
     }
 
     private fun updateAppInstallInfo() {
@@ -848,6 +849,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }
                 if (!(currentYear == year && currentDay == day)) {
                     viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this, iccid))
+                    updateAppInstallInfo()
                     if (lastTimeLong+10*60*1000<System.currentTimeMillis()){
                         //每日上传信息时获取策略，如果10分钟之内获取过则不再获取
                         lastTimeLong=System.currentTimeMillis()
@@ -929,12 +931,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         option.locationMode=LocationClientOption.LocationMode.Hight_Accuracy
         option.setCoorType("bd09ll")
         option.setFirstLocType(LocationClientOption.FirstLocType.ACCURACY_IN_FIRST_LOC)
-        option.setScanSpan(1000*60*5)
+        option.setScanSpan(0)
         option.setOpenGnss(true)
         option.setLocationNotify(true)
         option.setEnableSimulateGnss(false)
         option.setNeedNewVersionRgc(true)
         option.setIsNeedAddress(true)
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者，该模式下开发者无需再关心定位间隔是多少，定位SDK本身发现位置变化就会及时回调给开发者
+        option.setOpenAutoNotifyMode();
+        //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
+        option.setOpenAutoNotifyMode(3000,1, LocationClientOption.LOC_SENSITIVITY_HIGHT);
         locationClient?.locOption=option
         locationClient?.registerLocationListener(object :BDAbstractLocationListener(){
             override fun onReceiveLocation(bdLocation: BDLocation) {
@@ -966,6 +972,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 }catch (e:Exception){
                     LogShow("没有位置问题"+e.toString())
                 }
+                locationClient?.stop()
             }
 
         })
@@ -994,6 +1001,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                 //隐藏账号编辑弹窗
                 accountDialog?.dismiss()
                 mainLockFlag=true
+                //锁定时可以点击
+                canClickFlag=true
             } else {
                 mainLockFlag=false
                 autoAppFlag=true
@@ -1559,7 +1568,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
     override fun onSuccess(downItem: DownloadItem) {
        /* ManageApplication.installPackage(downItem.savepath)*/
-        InstallUtils.addInstall(downItem.savepath,downItem.pkgName)
+        InstallUtils.addInstall(downItem.savepath,downItem.pkgName,downItem.appName)
     }
 
     override fun onFailure(downItem: DownloadItem, errMsg: String) {

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

@@ -54,7 +54,7 @@ object AppDownLoadUtils {
                         if (successful) {
                            /* UIEvent(Const.INSTALL_FORCEAPP).setMessage(File(name, "$appName.apk").toString()).post()*/
                            /* ManageApplication.installPackage(File(name, "$appName.apk").toString())*/
-                            InstallUtils.addInstall(File(name, "$appName.apk").toString(),pkgName)
+                            InstallUtils.addInstall(File(name, "$appName.apk").toString(),pkgName,appName)
                         } else {
                             currentRetry++
                         }

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

@@ -38,7 +38,7 @@ object DownLoadUtils {
     /**
      * 下载文件
      */
-    fun addDownload(url: String, tag: String, savepath: String,pkgName: String) {
+    fun addDownload(url: String, tag: String, savepath: String,pkgName: String,appName:String) {
         LogShow("添加下载任务"+savepath)
         var isHave = false
         for (element in queue) {
@@ -47,10 +47,10 @@ object DownLoadUtils {
             }
         }
         if (!isHave) {
-            queue.add(DownloadItem(url, tag, savepath, 0,pkgName))
+            queue.add(DownloadItem(url, tag, savepath, 0,pkgName,appName))
         } else {
             for (downloadCallback in callbackList) {
-                downloadCallback.onFailure(DownloadItem(url, tag, savepath, 0,pkgName), "已经在下载队列")
+                downloadCallback.onFailure(DownloadItem(url, tag, savepath, 0,pkgName,appName), "已经在下载队列")
             }
         }
         downloadAction()
@@ -132,7 +132,7 @@ object DownLoadUtils {
     }
 }
 
-data class DownloadItem(val url: String, val tag: String, val savepath: String, var progress: Int,var pkgName:String)
+data class DownloadItem(val url: String, val tag: String, val savepath: String, var progress: Int,var pkgName:String,var appName:String)
 
 interface DownloadCallback {
     fun onStart(downItem: DownloadItem)

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

@@ -1,6 +1,7 @@
 package com.xhly.manageapp.utils
 
 import android.app.Activity
+import com.hjq.toast.Toaster
 import com.xhly.corelib.utils.LogShow
 import com.xhly.manageapp.ManageApplication
 import kotlinx.coroutines.CoroutineScope
@@ -33,7 +34,7 @@ object InstallUtils {
         }
     }
 
-    fun addInstall(savepath: String, packageName: String) {
+    fun addInstall(savepath: String, packageName: String,appName: String) {
         var isHave = false
         for (element in queue) {
             if (element.packageName === packageName) {
@@ -41,7 +42,7 @@ object InstallUtils {
             }
         }
         if (!isHave) {
-            queue.add(InstallItem( savepath, packageName))
+            queue.add(InstallItem( savepath, packageName,appName))
         }
         installAction()
     }
@@ -62,6 +63,7 @@ object InstallUtils {
                     isInstalling = true
                     //installApp(installItem.activity, installItem.savepath, installItem.packageName)
                     withContext(Dispatchers.Main){
+                        Toaster.show(installItem.appName+"正在安装")
                         ManageApplication.installPackage(installItem.savepath)
                     }
                     while (isInstalling) {
@@ -83,4 +85,4 @@ object InstallUtils {
     }
 }
 
-data class InstallItem(val savepath: String, val packageName: String)
+data class InstallItem(val savepath: String, val packageName: String,val appName:String)

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

@@ -82,6 +82,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
                 LogShow("没有位置问题"+e.toString())
             }
 */
+            UIEvent(Const.STARTLOCATION).post()
             userBean?.let {
                 val map=HashMap<String,Any>()
                 map["sn"]=ManageApplication.getDeviceInfo()?:""