1.增加平板信息提交接口以及bean类。

2.SystemUtil增加wifimac和蓝牙mac请求方法。

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

@@ -0,0 +1,78 @@
+package com.xhly.manageapp.bean.log
+
+class PadInfoBean {
+    /**
+     * 用户id
+     */
+    var userid = 0
+
+    /**
+     * 设备型号
+     */
+    var deviceModel = ""
+
+    /**
+     * 设备版本
+     */
+    var deviceVersion = ""
+
+    /**
+     * 设备号
+     */
+    var sn = ""
+
+    /**
+     * WiFi/MAC
+     */
+    var wifyMac = ""
+
+    /**
+     * 蓝牙MAC
+     */
+    var blueMac = ""
+
+    /**
+     * 系统内核
+     */
+    var sysKernel = ""
+
+    /**
+     * 设备名称
+     */
+    var deviceName = ""
+
+    /**
+     * 是否root：0否1是
+     */
+    var root = 0
+
+    /**
+     * 平板ROM版本
+     */
+    var romVersion = ""
+
+    /**
+     * SIM序列号
+     */
+    var sim = ""
+
+    /**
+     * 总内存
+     */
+    var totalMemory = 0L
+
+    /**
+     * 已使用内存
+     */
+    var usedMemory = 0L
+
+    /**
+     * 学校id
+     */
+    var schoolid = 0
+
+    /**
+     * 区域id
+     */
+    var regionid = 0
+}

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

@@ -0,0 +1,26 @@
+package com.xhly.manageapp.bean.log
+
+/**
+ * 上传设备位置
+ */
+class PadLocationBean {
+    /**
+     * 经度
+     */
+    var lon = 0
+
+    /**
+     * 维度
+     */
+    var lat = 0
+
+    /**
+     * 用户id
+     */
+    var userid = ""
+
+    /**
+     * 设备sn
+     */
+    var sn = ""
+}

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

@@ -0,0 +1,9 @@
+package com.xhly.manageapp.bean.user
+
+class UserBean {
+    var userid = 0
+    var schoolid = 0
+
+    //区域码
+    var regionid = 0
+}

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

@@ -25,4 +25,14 @@ object UriAdress {
      * 获得应用策略
      */
     const val APP_LISTPAD = "/stApp/list_pad"
+
+    /**
+     * 设备--地理位置添加
+     */
+    const val PADLOCATIONADD = "/userPosition/add"
+
+    /**
+     * 设备详情--添加和更新
+     */
+    const val PADDETAILADD = "/deviceDetail/add"
 }

app/src/main/java/com/xhly/manageapp/network/log/LogService.kt

@@ -1,7 +1,10 @@
 package com.xhly.manageapp.network.log
 
+import com.xhly.corelib.network.bean.ResponseData
 import com.xhly.manageapp.bean.log.LogAppStartBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
+import com.xhly.manageapp.bean.log.PadInfoBean
+import com.xhly.manageapp.bean.log.PadLocationBean
 import com.xhly.manageapp.network.UriAdress
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -21,5 +24,15 @@ interface LogService {
     @POST(UriAdress.LOGAPPSTARTADD)
     suspend fun postLogAppStartAdd(@Body logApp: List<LogAppStartBean>)
 
+    /**
+     * 设备--地理位置日志
+     */
+    @POST(UriAdress.PADLOCATIONADD)
+    suspend fun postPadLocation(@Body padLocationBean: PadLocationBean)
 
+    /**
+     * 设备--详情日志
+     */
+    @POST(UriAdress.PADDETAILADD)
+    suspend fun postPadDetailAdd(@Body padInfoBean: PadInfoBean):ResponseData<Any?>
 }

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

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Color
+import android.os.Build
 import android.provider.Settings
 import android.view.View
 import android.widget.Button
@@ -26,8 +27,10 @@ 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
@@ -42,8 +45,10 @@ import com.xhly.manageapp.service.websocket.AppSocketService
 import com.xhly.manageapp.ui.ManageActivity
 import com.xhly.manageapp.ui.login.activity.LoginActivity
 import com.xhly.manageapp.ui.main.viewmodel.MainViewModel
+import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
+import java.util.Calendar
 import java.util.concurrent.TimeUnit
 
 
@@ -95,6 +100,12 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             //存储app时间策略
             spUtils.saveJson(Const.APPSTRATEGYBEANKEY, it)
         }
+        viewModel.padInfoData.observe(this) {
+            //存储信息上传时间
+            if (it) {
+                spUtils.setParam(Const.PADINFOTIMEKEY, System.currentTimeMillis())
+            }
+        }
         startWorkManager()
     }
 
@@ -111,7 +122,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             spUtils.setParam(Const.DISABLEPAD, false)
             useStrategy()
             if (mBinding.mainLlayout.visibility == View.GONE) {
-                Toast("当前不在可用时间。")
+                Toast(getString(R.string.apptimestoptips))
             }
         }
         onBackPressedDispatcher.addCallback {
@@ -126,6 +137,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         viewModel.updateStrategy()
         viewModel.uploadAppStrategy()
         useStrategy()
+        updatePadInfo()
         try {
             var s =
                 "厂商" + CustomOSUtils.getSystemBrand() + "，型号" + CustomOSUtils.getSystemDevice() + "，系统版本" + CustomOSUtils.getSystemDisplay()
@@ -135,6 +147,38 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         requestPermissionAndShotView()
     }
 
+    @SuppressLint("CheckResult")
+    private fun updatePadInfo() {
+        try {
+            //获得pad信息提交时间，如果为同一天则不在上传，不然继续上传
+            val padTime = spUtils.getParam(Const.PADINFOTIMEKEY, 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)
+            val rxPermissions = RxPermissions(this)
+            val request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
+            //权限通过不通过都要执行
+            request.subscribe({ granted: Boolean ->
+                var iccid =""
+                if (granted){
+                     iccid = SystemUtil.getICCID(this)
+                }
+                if (!(currentYear == year && currentDay == day)) {
+                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this,iccid))
+                }
+            }, {
+                if (!(currentYear == year && currentDay == day)) {
+                    viewModel.updatePadInfo(PadInfoUtils().getPadInfo(this,""))
+                }
+            })
+        } catch (e: Exception) {
+
+        }
+    }
+
     private fun useStrategy() {
         //获得sputils中的数据设置状态,以及策略
         try {
@@ -402,18 +446,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
      */
     @SuppressLint("CheckResult")
     private fun requestPermissionAndShotView() {
-        val phoneInfoUtils = PhoneInfoUtils(this)
-
         var iccid = ""
         val rxPermissions = RxPermissions(this)
         var request = rxPermissions.request(Manifest.permission.READ_PHONE_STATE)
         request.subscribe({ granted: Boolean ->
             if (granted) {
-                iccid = phoneInfoUtils.iccid
-                LogShow("手机信息" + iccid + "||" + iccid)
+
             }
         }, {
-            LogShow("手机信息失败了" + it.message)
+
         })
     }
 
@@ -422,7 +463,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         WorkManager.getInstance(this).cancelAllWork()
         // 周期性任务时间最少15分钟 所以除以实际周期的时间  看需要加入几个任务
         val taskList = arrayListOf(5, 10)
-        for (taskNo in 1..10) {
+        for (taskNo in taskList) {
             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,11 @@ 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.log.LogdOperateBean
+import com.xhly.manageapp.bean.log.PadInfoBean
 import com.xhly.manageapp.bean.strategy.AppTimeManageBean
 import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.network.app.AppService
@@ -23,6 +25,8 @@ 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
     fun getAppList() {
         launchUI {
             val postListApp = appService.postListApp(ListAppBean())
@@ -62,7 +66,6 @@ class MainViewModel : CommonBaseViewModel() {
     }
 
     fun uploadAppStrategy() {
-
         launchUI {
             val postAppListPad = strategyService.postAppListPad()
             if (postAppListPad.code == 0) {
@@ -78,4 +81,13 @@ class MainViewModel : CommonBaseViewModel() {
             }
         }
     }
+
+    fun updatePadInfo(padInfoBean: PadInfoBean){
+        launchUI {
+            var anyResponseData = logService.postPadDetailAdd(padInfoBean)
+            if (anyResponseData.code==0){
+                padInfo.value=true
+            }
+        }
+    }
 }

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

@@ -0,0 +1,44 @@
+package com.xhly.manageapp.utils
+
+import android.content.Context
+import android.os.Build
+import com.xhly.corelib.Const
+import com.xhly.corelib.utils.FileSizeUtils
+import com.xhly.corelib.utils.SharedPreferencesUtils
+import com.xhly.corelib.utils.SystemUtil
+import com.xhly.manageapp.ManageApplication
+import com.xhly.manageapp.bean.log.PadInfoBean
+import com.xhly.manageapp.bean.user.UserBean
+
+class PadInfoUtils {
+
+    fun getPadInfo(context: Context,simIccID:String):PadInfoBean{
+        val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
+        //val json= spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
+        val json=UserBean()
+        json.userid=1
+        json.schoolid=1
+        json.regionid=1
+        val padInfoBean = PadInfoBean()
+        json?.let {
+            val userBean = it as UserBean
+            padInfoBean.userid=userBean.userid
+            padInfoBean.schoolid=userBean.schoolid
+            ManageApplication.getDeviceInfo()?.let {sn->
+                padInfoBean.sn=sn
+            }
+            padInfoBean.deviceModel= Build.DEVICE
+            padInfoBean.deviceVersion=Build.VERSION.CODENAME
+            padInfoBean.wifyMac=SystemUtil.getWifiMac(context)
+            padInfoBean.blueMac=SystemUtil.getBluetoothMac()
+            padInfoBean.sysKernel=SystemUtil.getKernelVersion()
+            padInfoBean.deviceName=Build.DEVICE
+            padInfoBean.root=if (SystemUtil.isSuEnable()) 1 else 0
+            padInfoBean.romVersion=Build.DISPLAY
+            padInfoBean.sim=simIccID
+            padInfoBean.totalMemory=FileSizeUtils.getTotalSpace(context)
+            padInfoBean.usedMemory=FileSizeUtils.getFreeSpace(context)
+        }
+        return padInfoBean
+    }
+}

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

@@ -6,9 +6,10 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import com.xhly.corelib.Const
 import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.AppUtils
-import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.toFormat
 import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.log.LogAppStartBean
@@ -25,6 +26,10 @@ import java.util.Calendar
 class TimingWorker(context: Context, workerParams: WorkerParameters) :
     Worker(context, workerParams) {
     private val serviceScope = CoroutineScope(MainScope().coroutineContext)
+    private val spUtils by lazy {
+        SharedPreferencesUtils.getInstance(context)
+    }
+
     override fun doWork(): Result {
         val result: Result = Result.success()
         val logService = RetrofitService.create<LogService>()
@@ -33,6 +38,8 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
             if (appInfo.size > 0) {
                 logService.postLogAppStartAdd(appInfo)
             }
+
+
         }
         return result
     }
@@ -46,7 +53,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
         val usageManager =
             applicationContext.getSystemService(AppCompatActivity.USAGE_STATS_SERVICE) as UsageStatsManager
         val startList = arrayListOf<LogAppStartBean>()
-        var sn = ManageApplication.getDeviceInfo()
+        val sn = ManageApplication.getDeviceInfo()
         if (usageManager != null) {
             val endTime = System.currentTimeMillis()
             val startTime = timeInMillis
@@ -63,7 +70,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
                             dataList.firstOrNull { event.packageName.equals(it.packageName) }
                         first?.let {
                             sn?.let {
-                                appStartBean.sn=sn
+                                appStartBean.sn = sn
                             }
                             appStartBean.appName = first.name
                             appStartBean.appPackage = first.packageName
@@ -81,7 +88,7 @@ class TimingWorker(context: Context, workerParams: WorkerParameters) :
                             dataList.firstOrNull { event.packageName.equals(it.packageName) }
                         first?.let {
                             sn?.let {
-                                appStartBean.sn=sn
+                                appStartBean.sn = sn
                             }
                             appStartBean.appName = first.name
                             appStartBean.appPackage = first.packageName

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

@@ -1,7 +1,5 @@
 package com.xhly.corelib
 
-import android.bluetooth.BluetoothManager
-
 
 object Const {
     const val isDebug = true
@@ -78,18 +76,28 @@ object Const {
 
     //标记蓝牙打开
     const val BLUETOOTHOPEN = "BLUETOOTHOPEN"
+
     //标记USB连接电脑
-    const val USB_CONNECTED="USB_CONNECTED"
+    const val USB_CONNECTED = "USB_CONNECTED"
+
     //标记USB拔出电脑
-    const val USB_NOCONNECTED="USB_NOCONNECTED"
+    const val USB_NOCONNECTED = "USB_NOCONNECTED"
+
     //标记更新策略
     const val UPDATESTRATEGY = "UPDATESTRATEGY"
 
     //存储平板策略
     const val STRATEGYBEANKEY = "STRATEGYBEAN"
+
     //存储app时间策略
     const val APPSTRATEGYBEANKEY = "APPSTRATEGYBEAN"
 
+    //存储pad信息提交时间，如果为同一天则不在上传，不然继续上传
+    const val PADINFOTIMEKEY = "PADINFOTIMEKEY"
+
+    //存储用户信息
+    const val USERINFO = "USERINFO"
+
     //记录设备策略名称
     const val DEVICETYPE1 = "摄像头"
     const val DEVICETYPE2 = "蓝牙"

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

@@ -1,6 +1,9 @@
 package com.xhly.corelib.utils;
 
+import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -132,7 +135,7 @@ public class SystemUtil {
 
 
     /**
-     * 是否存在su命令，并且有执行权限
+     * 是否存在su命令，并且有执行权限 判断是否root
      *
      * @return 存在su命令，并且有执行权限返回true
      */
@@ -179,22 +182,48 @@ public class SystemUtil {
                     String iccId1 = si1.getIccId();
                     String phoneNum1 = si1.getNumber();
                     iccid=iccId1;
+                    LogUtils.d("获得手机信息","问题是mei偶222尔与哦是的"+phoneNum1);
                 }
                 if (sis.size() >= 2) {
                     SubscriptionInfo si2 = sis.get(1);
                     String iccId2 = si2.getIccId();
                     String phoneNum2 = si2.getNumber();
                     iccid=iccId2;
+                    LogUtils.d("获得手机信息","问题是mei偶尔与哦是的"+si2.toString());
                 }
                 // 获取SIM卡数量相关信息：
                 int count = sm.getActiveSubscriptionInfoCount();//当前实际插卡数量
                 int max = sm.getActiveSubscriptionInfoCountMax();//当前卡槽数量
             }
         }catch (Exception e){
-
+           LogUtils.d("获得手机信息","问题是"+e.toString());
         }
         return iccid;
     }
 
-
+   public static String getWifiMac(Context context){
+        String wifiMac="";
+        try {
+            WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+            WifiInfo connectionInfo = wifiManager.getConnectionInfo();
+            wifiMac = connectionInfo.getMacAddress();
+        }catch (Exception e){
+            LogUtils.d("获得手机信息","wifi问题是"+e.toString());
+        }
+        return wifiMac;
+   }
+
+   public static String getBluetoothMac(){
+       String bMac="";
+       try{
+           BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+          /* if (defaultAdapter.isEnabled()){
+               bMac= defaultAdapter.getAddress();
+           }*/
+           bMac= defaultAdapter.getAddress();
+       }catch (Exception e){
+           LogUtils.d("获得手机信息","bluetooth问题是"+e.toString());
+       }
+       return bMac;
+   }
 }