diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index aa8bb9f..579b4e3 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -74,17 +74,16 @@ private val regionRadius by lazy { LocaleConstant.RADIUS_SIZE.dp2px(this) } private var latitude: Double = 0.0 private var longitude: Double = 0.0 - private val powerManager by lazy { getSystemService() } - private var wakeLock: PowerManager.WakeLock? = null private val gson by lazy { Gson() } + private lateinit var wakeLock: PowerManager.WakeLock override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - wakeLock = powerManager?.run { + val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager + wakeLock = powerManager.run { newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, this@MainActivity.localClassName).apply { - //1h不休眠 acquire(60 * 60 * 1000L) } } @@ -191,15 +190,21 @@ //下载最新的数据 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) - downloadUrl.downloadFile(createDownloadFileDir().toString(), + Log.d(kTag, "downloadUrl => $downloadUrl") + downloadUrl.downloadFile( + createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadEnd(file: File?) { - labelBeans = ExcelHub.read(file?.absolutePath) - labelBeans.forEach { label -> - DataBaseManager.get.insertTaskLabel(label) + CoroutineScope(Dispatchers.Main).launch { + labelBeans = ExcelHub.read(file?.absolutePath) + withContext(Dispatchers.IO) { + labelBeans.forEach { label -> + DataBaseManager.get.insertTaskLabel(label) + } + } + LoadingDialogHub.dismiss() + showLabelsOnMap() } - LoadingDialogHub.dismiss() - showLabelsOnMap() } override fun onDownloadStart(totalBytes: Long) { @@ -533,7 +538,8 @@ val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") LoadingDialogHub.show(this@MainActivity, "获取标识器信息中,请稍后") - taskViewModel.getMarkerFile(userId.toString(), companyId.toString()) + //TODO 设计如此,都传companyId + taskViewModel.getMarkerFile(companyId.toString(), companyId.toString()) } else { NoNetworkDialog.Builder() .setContext(context)