1.添加app更新接口。

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

@@ -0,0 +1,25 @@
+package com.xhly.manageapp.bean
+
+class UpdateBean {
+    /**
+     * 用户id
+     */
+    var userid = 0L
+
+    /**
+     * 类型：1商店版本2桌面版本
+     */
+    var ctype = 2
+
+    /**
+     * 设备号
+     */
+    var sn = ""
+
+    /**
+     * 客户端版本
+     */
+    var cversion = ""
+    var schoolid = 0L
+    var regionid = 0L
+}

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

@@ -69,10 +69,10 @@ class PadInfoBean {
     /**
      * 学校id
      */
-    var schoolid = 0
+    var schoolid = 0L
 
     /**
      * 区域id
      */
-    var regionid = 0
+    var regionid = 0L
 }

app/src/main/java/com/xhly/manageapp/bean/user/UserBean.kt

@@ -1,9 +1,41 @@
 package com.xhly.manageapp.bean.user
 
 class UserBean {
-    var userid = 0L
-    var schoolid = 0
+    //用于记录登录是否成功
+    var xhlyLoginSucess=true
+    //记录登录返回的msg
+    var xhlyLoginMessage:String?=""
+
+    var userid = 1L
+    var schoolid = 1L
 
     //区域码
-    var regionid = 0
+    var regionid = 1L
+
+    var username: String? = null
+    var loginname: String? = null
+    var classid: Int? = null
+    var loginpwd:String=""
+
+    /**
+     * 管控状态1管控中2解除管控
+     */
+    var control=1
+
+    /**
+     *手机号
+     */
+    var userphone:String?=null
+
+    /**
+     * 版本
+     */
+    var rversion=0L
+
+    /**
+     * Xh-Token-Key
+     */
+    var Xh_Token_Key:String?=null
+
+    var Xh_Token_Value:String?=null
 }

app/src/main/java/com/xhly/manageapp/network/UriAdress.kt

@@ -35,4 +35,15 @@ object UriAdress {
      * 设备详情--添加和更新
      */
     const val PADDETAILADD = "/deviceDetail/add"
+
+    /**
+     *获得客户端更新
+     */
+    const val CLIENT_ADD = "/client/add"
+
+    /**
+     * 登录接口
+     */
+    const val ULOGIN_LOGIN="/ulogin/login"
+
 }

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

@@ -7,8 +7,8 @@ import android.app.ActivityManager
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.graphics.Color
-import android.os.Build
 import android.provider.Settings
 import android.view.View
 import android.widget.Button
@@ -16,6 +16,7 @@ import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
+import androidx.multidex.BuildConfig
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
@@ -27,18 +28,17 @@ import com.xhly.corelib.bean.AppInfo
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.utils.AppUtils
 import com.xhly.corelib.utils.CustomOSUtils
-import com.xhly.corelib.utils.FileSizeUtils
 import com.xhly.corelib.utils.LogShow
-import com.xhly.corelib.utils.PhoneInfoUtils
 import com.xhly.corelib.utils.SystemUtil
 import com.xhly.manageapp.AppAdapter
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.R
 import com.xhly.manageapp.bean.EventLog
+import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
+import com.xhly.manageapp.bean.user.UserBean
 import com.xhly.manageapp.broadcastreceiver.AppInstallReceiver
-import com.xhly.manageapp.broadcastreceiver.SDReceiver
 import com.xhly.manageapp.databinding.ActivityMainBinding
 import com.xhly.manageapp.service.ManageAccessibilityService
 import com.xhly.manageapp.service.websocket.AppSocketService
@@ -55,9 +55,7 @@ import java.util.concurrent.TimeUnit
 class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     lateinit var adapter: AppAdapter
 
-    /*private var csdkManager = CSDKManager(this)*/
     private var mMyInstallReceiver: AppInstallReceiver? = null
-    private var mySDReceiver: SDReceiver? = null
     private var dataList: ArrayList<AppInfo> = arrayListOf()
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
@@ -80,7 +78,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             UIEvent("2005").post()
         }
         registerAppInstallReceiver()
-        // registerSDReceiver()
         /*
          使用情况权限
          val permissionIntent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
@@ -127,6 +124,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
         onBackPressedDispatcher.addCallback {
             //屏蔽返回
+
         }
     }
 
@@ -138,6 +136,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.uploadAppStrategy()
         useStrategy()
         updatePadInfo()
+        updateMcApp()
+        getLocation()
         try {
             var s =
                 "厂商" + CustomOSUtils.getSystemBrand() + "，型号" + CustomOSUtils.getSystemDevice() + "，系统版本" + CustomOSUtils.getSystemDisplay()
@@ -147,6 +147,36 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         requestPermissionAndShotView()
     }
 
+    private fun updateMcApp() {
+        //每天请求一次app更新接口
+        try {
+            var userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
+            //获得pad信息提交时间，如果为同一天则不在上传，不然继续上传
+            val padTime = spUtils.getParam(Const.PADUPDATETIMEKEY, 0L) as Long
+            val instance = Calendar.getInstance()
+            val currentYear = instance.get(Calendar.YEAR)
+            val currentDay = instance.get(Calendar.DAY_OF_YEAR)
+            instance.timeInMillis = padTime
+            val year = instance.get(Calendar.YEAR)
+            val day = instance.get(Calendar.DAY_OF_YEAR)
+            if (!(currentYear == year && currentDay == day)) {
+                val updateBean = UpdateBean()
+                ManageApplication.getDeviceInfo()?.let {
+                    updateBean.sn = it
+                }
+                val packageInfo =
+                    packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)
+                updateBean.cversion = packageInfo.versionName
+                updateBean.schoolid=userBean.schoolid
+                updateBean.userid=userBean.userid
+                updateBean.regionid=userBean.regionid
+                viewModel.updateMcApp(updateBean)
+            }
+        } catch (e: Exception) {
+
+        }
+    }
+
     @SuppressLint("CheckResult")
     private fun updatePadInfo() {
         try {
@@ -162,16 +192,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             val request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
             //权限通过不通过都要执行
             request.subscribe({ granted: Boolean ->
-                var iccid =""
-                if (granted){
-                     iccid = SystemUtil.getICCID(this)
+                var iccid = ""
+                if (granted) {
+                    iccid = SystemUtil.getICCID(this)
                 }
                 if (!(currentYear == year && currentDay == day)) {
-                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this,iccid))
+                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this, iccid))
                 }
             }, {
                 if (!(currentYear == year && currentDay == day)) {
-                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this,""))
+                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this, ""))
                 }
             })
         } catch (e: Exception) {
@@ -179,6 +209,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         }
     }
 
+    @SuppressLint("CheckResult")
+    private fun getLocation() {
+        val rxPermissions = RxPermissions(this)
+        rxPermissions.request(
+            Manifest.permission.ACCESS_FINE_LOCATION,
+            Manifest.permission.ACCESS_COARSE_LOCATION
+        ).subscribe({
+            if (it) {
+                SystemUtil.getLocation(this)
+            } else {
+                LogShow("没有权限")
+            }
+        }, {
+            LogShow("没有权限" + it.message)
+        })
+    }
+
     private fun useStrategy() {
         //获得sputils中的数据设置状态,以及策略
         try {
@@ -375,18 +422,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     }
 
 
-    private fun registerSDReceiver() {
-        val intentFilter = IntentFilter();
-        intentFilter.addAction(Intent.ACTION_MEDIA_MOUNTED)
-        intentFilter.addAction(Intent.ACTION_MEDIA_EJECT)
-        intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED)
-        intentFilter.addDataScheme("file")
-        intentFilter.priority = 1000
-        mySDReceiver = SDReceiver()
-        registerReceiver(mySDReceiver, intentFilter);
-    }
-
-
     private fun showEditDialog() {
         CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_edit_dialog) {
@@ -435,9 +470,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         mMyInstallReceiver?.let {
             unregisterReceiver(it)
         }
-        mySDReceiver?.let {
-            unregisterReceiver(it)
-        }
         LogShow("MainActivity被销毁")
     }
 
@@ -462,8 +494,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun startWorkManager() {
         WorkManager.getInstance(this).cancelAllWork()
         // 周期性任务时间最少15分钟 所以除以实际周期的时间  看需要加入几个任务
-        val taskList = arrayListOf(5, 10)
-        for (taskNo in taskList) {
+        /*val taskList = arrayListOf(5, 10)*/
+        for (taskNo in 1..10) {
             val request = PeriodicWorkRequest
                 // 最少15分钟 PeriodicWorkRequest
                 .Builder(TimingWorker::class.java, 15, TimeUnit.MINUTES)

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

@@ -4,9 +4,9 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.network.RetrofitService
-import com.xhly.corelib.network.bean.ResponseData
 import com.xhly.manageapp.bean.AppModel
 import com.xhly.manageapp.bean.ListAppBean
+import com.xhly.manageapp.bean.UpdateBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
 import com.xhly.manageapp.bean.log.PadInfoBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
@@ -25,8 +25,10 @@ class MainViewModel : CommonBaseViewModel() {
     val strategyData: LiveData<StrategyBean> = strategy
     private val appStrategy = MutableLiveData<ArrayList<AppTimeManageBean>>()
     val appStrategyData: LiveData<ArrayList<AppTimeManageBean>> = appStrategy
-    private val padInfo=MutableLiveData<Boolean>()
-    val padInfoData:LiveData<Boolean> =padInfo
+    private val padInfo = MutableLiveData<Boolean>()
+    val padInfoData: LiveData<Boolean> = padInfo
+    private val updateInfo = MutableLiveData<Boolean>()
+    val updateInfoData: LiveData<Boolean> = updateInfo
     fun getAppList() {
         launchUI {
             val postListApp = appService.postListApp(ListAppBean())
@@ -82,11 +84,20 @@ class MainViewModel : CommonBaseViewModel() {
         }
     }
 
-    fun updatePadInfo(padInfoBean: PadInfoBean){
+    fun updatePadInfo(padInfoBean: PadInfoBean) {
         launchUI {
-            var anyResponseData = logService.postPadDetailAdd(padInfoBean)
-            if (anyResponseData.code==0){
-                padInfo.value=true
+            val anyResponseData = logService.postPadDetailAdd(padInfoBean)
+            if (anyResponseData.code == 0) {
+                padInfo.value = true
+            }
+        }
+    }
+
+    fun updateMcApp(updateBean: UpdateBean) {
+        launchUI {
+            val postClientAdd = appService.postClientAdd(updateBean)
+            if (postClientAdd.code == 0) {
+                updateInfo.value = true
             }
         }
     }