diff --git a/app/build.gradle b/app/build.gradle index 17e74d2..e158951 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 diff --git a/app/build.gradle b/app/build.gradle index 17e74d2..e158951 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 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 744e3a1..b52c7d0 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 @@ -10,7 +10,6 @@ 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 @@ -51,7 +50,6 @@ } 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) diff --git a/app/build.gradle b/app/build.gradle index 17e74d2..e158951 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 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 744e3a1..b52c7d0 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 @@ -10,7 +10,6 @@ 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 @@ -51,7 +50,6 @@ } 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) diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt b/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt deleted file mode 100644 index c6bf0bb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.xz.meterage.extensions - -import android.view.animation.AlphaAnimation -import android.view.animation.AnimationSet -import android.view.animation.TranslateAnimation -import android.widget.TextSwitcher - -//上下滚动消息动画扩展 -fun TextSwitcher.setAnimation() { - val translateIn = TranslateAnimation(0f, 0f, 50f, 0f) - val alphaIn = AlphaAnimation(0f, 1f) - val animatorSetIn = AnimationSet(true) - animatorSetIn.addAnimation(translateIn) - animatorSetIn.addAnimation(alphaIn) - animatorSetIn.duration = 1000 - this.inAnimation = animatorSetIn - - val translateOut = TranslateAnimation(0f, 0f, 0f, -50f) - val alphaOut = AlphaAnimation(1f, 0f) - val animatorSetOut = AnimationSet(true) - animatorSetOut.addAnimation(translateOut) - animatorSetOut.addAnimation(alphaOut) - animatorSetOut.duration = 1000 - this.outAnimation = animatorSetOut -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 17e74d2..e158951 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 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 744e3a1..b52c7d0 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 @@ -10,7 +10,6 @@ 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 @@ -51,7 +50,6 @@ } 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) diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt b/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt deleted file mode 100644 index c6bf0bb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/extensions/TextSwitcher.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.casic.xz.meterage.extensions - -import android.view.animation.AlphaAnimation -import android.view.animation.AnimationSet -import android.view.animation.TranslateAnimation -import android.widget.TextSwitcher - -//上下滚动消息动画扩展 -fun TextSwitcher.setAnimation() { - val translateIn = TranslateAnimation(0f, 0f, 50f, 0f) - val alphaIn = AlphaAnimation(0f, 1f) - val animatorSetIn = AnimationSet(true) - animatorSetIn.addAnimation(translateIn) - animatorSetIn.addAnimation(alphaIn) - animatorSetIn.duration = 1000 - this.inAnimation = animatorSetIn - - val translateOut = TranslateAnimation(0f, 0f, 0f, -50f) - val alphaOut = AlphaAnimation(1f, 0f) - val animatorSetOut = AnimationSet(true) - animatorSetOut.addAnimation(translateOut) - animatorSetOut.addAnimation(alphaOut) - animatorSetOut.duration = 1000 - this.outAnimation = animatorSetOut -} \ No newline at end of file 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 9ae9284..655099b 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 @@ -13,7 +13,6 @@ import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.diffCurrentTime import com.casic.xz.meterage.extensions.formatToDate -import com.casic.xz.meterage.extensions.setAnimation import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.NoticeListModel import com.casic.xz.meterage.model.RemindListModel @@ -30,6 +29,7 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.setAnimation import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.vm.LoadState