diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index f8e3324..744e3a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,6 +2,7 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable import android.text.* @@ -9,14 +10,18 @@ import android.text.style.ClickableSpan import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan +import android.util.Log import android.view.View import android.widget.TextView import com.bumptech.glide.Glide import com.bumptech.glide.request.target.Target +import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.fragment.HomePageFragment import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.LoginActivity import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity @@ -44,7 +49,16 @@ if (this.isBlank()) { return 404 } - return JSONObject(this).getInt("code") + val responseCode = JSONObject(this).getInt("code") + if (responseCode == 401) { + Log.d("HomePageFragment", "onDestroyView => 取消消息Timer") + HomePageFragment.timer.cancel() + "已在别的平台登录,当前设备已下线".show(BaseApplication.get()) + val intent = Intent(BaseApplication.get(), LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + BaseApplication.get().startActivity(intent) + } + return responseCode } fun String.toErrorMessage(): String { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index f8e3324..744e3a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,6 +2,7 @@ import android.app.Activity import android.content.Context +import android.content.Intent import android.graphics.Color import android.graphics.drawable.Drawable import android.text.* @@ -9,14 +10,18 @@ import android.text.style.ClickableSpan import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan +import android.util.Log import android.view.View import android.widget.TextView import com.bumptech.glide.Glide import com.bumptech.glide.request.target.Target +import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.callback.OnImageCompressListener +import com.casic.xz.meterage.fragment.HomePageFragment import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.LoginActivity import com.casic.xz.meterage.view.notice.PreviewDocumentActivity import com.casic.xz.meterage.view.notice.PreviewPdfActivity import com.casic.xz.meterage.view.notice.PreviewTextActivity @@ -44,7 +49,16 @@ if (this.isBlank()) { return 404 } - return JSONObject(this).getInt("code") + val responseCode = JSONObject(this).getInt("code") + if (responseCode == 401) { + Log.d("HomePageFragment", "onDestroyView => 取消消息Timer") + HomePageFragment.timer.cancel() + "已在别的平台登录,当前设备已下线".show(BaseApplication.get()) + val intent = Intent(BaseApplication.get(), LoginActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + BaseApplication.get().startActivity(intent) + } + return responseCode } fun String.toErrorMessage(): String { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 4c93023..37f3d8c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -1,6 +1,7 @@ package com.casic.xz.meterage.fragment import android.graphics.Color +import android.util.Log import android.view.View import android.widget.LinearLayout import android.widget.TextView @@ -39,7 +40,11 @@ class HomePageFragment(private val userId: String) : KotlinBaseFragment() { - private val timer = object : Timer() {} + companion object { + lateinit var timer: Timer + } + + private val kTag = "HomePageFragment" private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel private lateinit var noticeViewModel: NoticeViewModel @@ -268,9 +273,11 @@ } }) - //消息滚动 + //消息滚动Timer + timer = Timer() timer.schedule(object : TimerTask() { override fun run() { + Log.d(kTag, "run => 滚动消息") weakReferenceHandler.sendEmptyMessage(2023030601) } }, 0, 5000)