Commit 30f24aff authored by wanglei's avatar wanglei

...

parent a8a18e72
...@@ -253,30 +253,30 @@ class MyApplication : Application() { ...@@ -253,30 +253,30 @@ class MyApplication : Application() {
private fun initConfig(config: String) { private fun initConfig(config: String) {
// kotlin.runCatching { kotlin.runCatching {
val configBean = Gson().fromJson(config, ConfigBean::class.java) val configBean = Gson().fromJson(config, ConfigBean::class.java)
writeLogFile("config", config) writeLogFile("config", config)
val jsonObject = JSONObject() val jsonObject = JSONObject()
jsonObject.put("ut", configBean.ut) jsonObject.put("ut", configBean.ut)
EventUtils.event("user_type", ext = jsonObject) EventUtils.event("user_type", ext = jsonObject)
LogEx.logDebug("initConfig", "ut=${configBean.ut}") LogEx.logDebug("initConfig", "ut=${configBean.ut}")
//配置 //配置
ConfigBean.configBean = configBean ConfigBean.configBean = configBean
//广告 //广告
AdConfigBean.adsConfigBean = configBean.adConfigBean AdConfigBean.adsConfigBean = configBean.adConfigBean
LogEx.logDebug("initConfig", "adsConfigBean=${AdConfigBean.adsConfigBean.timeInterval}") LogEx.logDebug("initConfig", "adsConfigBean=${AdConfigBean.adsConfigBean.timeInterval}")
//通知 //通知
PopupConfigBean.popupConfigBean = configBean.popupConfigBean PopupConfigBean.popupConfigBean = configBean.popupConfigBean
LogEx.logDebug("initConfig", "popupConfigBean=${PopupConfigBean.popupConfigBean.popupCount}") LogEx.logDebug("initConfig", "popupConfigBean=${PopupConfigBean.popupConfigBean.popupCount}")
//启动定时器 //启动定时器
changeTimer() changeTimer()
// } }
} }
......
...@@ -13,6 +13,7 @@ import android.os.Build ...@@ -13,6 +13,7 @@ import android.os.Build
import android.os.CountDownTimer import android.os.CountDownTimer
import androidx.work.Configuration import androidx.work.Configuration
import com.base.scanqr.BuildConfig import com.base.scanqr.BuildConfig
import com.base.scanqr.helper.EventUtils
import com.base.scanqr.service.StayNotification.createPermanentNotification import com.base.scanqr.service.StayNotification.createPermanentNotification
import com.base.scanqr.utils.LogEx import com.base.scanqr.utils.LogEx
...@@ -53,17 +54,21 @@ class StayJobService : JobService() { ...@@ -53,17 +54,21 @@ class StayJobService : JobService() {
} }
private fun startForeground() { private fun startForeground() {
val notification = createPermanentNotification(applicationContext) try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val notification = createPermanentNotification(applicationContext)
startForeground( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
NOTIFICATION_STAY_ID, startForeground(
notification, NOTIFICATION_STAY_ID,
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC notification,
) ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
} else { )
startForeground(NOTIFICATION_STAY_ID, notification) } else {
startForeground(NOTIFICATION_STAY_ID, notification)
}
isRunning = true
} catch (e: Exception) {
EventUtils.event("start_foreground_service_error")
} }
isRunning = true
} }
private fun notifyForeground() { private fun notifyForeground() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment