Skip to content

Commit ea669fa

Browse files
refactor(*):
1、去掉基类网络判断 2、添加消息滚动动画 3、去掉基类Activity栈管理
1 parent dd38249 commit ea669fa

File tree

3 files changed

+28
-68
lines changed

3 files changed

+28
-68
lines changed

app/src/main/java/com/pengxh/kt/lib/MainActivity.kt

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ package com.pengxh.kt.lib
22

33
import android.graphics.Color
44
import android.os.Handler
5-
import android.view.animation.AlphaAnimation
6-
import android.view.animation.AnimationSet
7-
import android.view.animation.TranslateAnimation
8-
import android.widget.TextSwitcher
95
import android.widget.TextView
106
import com.google.gson.Gson
117
import com.google.gson.reflect.TypeToken
128
import com.pengxh.kt.lite.base.KotlinBaseActivity
139
import com.pengxh.kt.lite.extensions.convertColor
1410
import com.pengxh.kt.lite.extensions.readAssetsFile
11+
import com.pengxh.kt.lite.extensions.setAnimation
1512
import com.pengxh.kt.lite.utils.WeakReferenceHandler
1613
import kotlinx.android.synthetic.main.activity_main.*
1714
import java.text.SimpleDateFormat
@@ -105,25 +102,6 @@ class MainActivity : KotlinBaseActivity() {
105102
timer.cancel()
106103
}
107104

108-
//上下滚动消息动画扩展
109-
fun TextSwitcher.setAnimation() {
110-
val translateIn = TranslateAnimation(0f, 0f, 50f, 0f)
111-
val alphaIn = AlphaAnimation(0f, 1f)
112-
val animatorSetIn = AnimationSet(true)
113-
animatorSetIn.addAnimation(translateIn)
114-
animatorSetIn.addAnimation(alphaIn)
115-
animatorSetIn.duration = 1000
116-
this.inAnimation = animatorSetIn
117-
118-
val translateOut = TranslateAnimation(0f, 0f, 0f, -50f)
119-
val alphaOut = AlphaAnimation(1f, 0f)
120-
val animatorSetOut = AnimationSet(true)
121-
animatorSetOut.addAnimation(translateOut)
122-
animatorSetOut.addAnimation(alphaOut)
123-
animatorSetOut.duration = 1000
124-
this.outAnimation = animatorSetOut
125-
}
126-
127105
/**
128106
* 时间差-小时
129107
* */
Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,17 @@
11
package com.pengxh.kt.lite.base
22

3-
import android.content.BroadcastReceiver
4-
import android.content.Context
5-
import android.content.Intent
6-
import android.net.ConnectivityManager
73
import android.os.Bundle
8-
import android.provider.Settings
9-
import android.view.WindowManager
104
import androidx.appcompat.app.AppCompatActivity
11-
import com.pengxh.kt.lite.extensions.isNetworkConnected
12-
import com.pengxh.kt.lite.utils.BroadcastManager
13-
import com.pengxh.kt.lite.utils.PageNavigationManager
14-
import com.pengxh.kt.lite.widget.dialog.NoNetworkDialog
155

166
abstract class KotlinBaseActivity : AppCompatActivity() {
177

18-
private lateinit var broadcastManager: BroadcastManager
19-
208
override fun onCreate(savedInstanceState: Bundle?) {
219
super.onCreate(savedInstanceState)
2210
setContentView(initLayoutView())
2311
setupTopBarLayout()
2412
initData()
2513
observeRequestState()
2614
initEvent()
27-
PageNavigationManager.addActivity(this)
28-
broadcastManager = BroadcastManager.obtainInstance(this)
29-
broadcastManager.addAction(
30-
object : BroadcastReceiver() {
31-
override fun onReceive(context: Context?, intent: Intent?) {
32-
if (!context!!.isNetworkConnected()) {
33-
/**
34-
* 捕获用户在有网情况下登录进入APP,后来又处于断网状态会导致闪退的Bug
35-
* */
36-
try {
37-
NoNetworkDialog.Builder()
38-
.setContext(this@KotlinBaseActivity)
39-
.setOnDialogButtonClickListener(object :
40-
NoNetworkDialog.OnDialogButtonClickListener {
41-
override fun onButtonClick() {
42-
startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
43-
}
44-
}).build().show()
45-
} catch (e: WindowManager.BadTokenException) {
46-
e.printStackTrace()
47-
}
48-
}
49-
}
50-
}, ConnectivityManager.CONNECTIVITY_ACTION
51-
)
5215
}
5316

5417
/**
@@ -75,12 +38,4 @@ abstract class KotlinBaseActivity : AppCompatActivity() {
7538
* 初始化业务逻辑
7639
*/
7740
abstract fun initEvent()
78-
79-
/**
80-
* 取消协程
81-
* */
82-
override fun onDestroy() {
83-
broadcastManager.destroy(ConnectivityManager.CONNECTIVITY_ACTION)
84-
super.onDestroy()
85-
}
8641
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.pengxh.kt.lite.extensions
2+
3+
import android.view.animation.AlphaAnimation
4+
import android.view.animation.AnimationSet
5+
import android.view.animation.TranslateAnimation
6+
import android.widget.TextSwitcher
7+
8+
/**
9+
* 上下滚动消息动画扩展
10+
* */
11+
fun TextSwitcher.setAnimation() {
12+
val translateIn = TranslateAnimation(0f, 0f, 50f, 0f)
13+
val alphaIn = AlphaAnimation(0f, 1f)
14+
val animatorSetIn = AnimationSet(true)
15+
animatorSetIn.addAnimation(translateIn)
16+
animatorSetIn.addAnimation(alphaIn)
17+
animatorSetIn.duration = 1000
18+
this.inAnimation = animatorSetIn
19+
20+
val translateOut = TranslateAnimation(0f, 0f, 0f, -50f)
21+
val alphaOut = AlphaAnimation(1f, 0f)
22+
val animatorSetOut = AnimationSet(true)
23+
animatorSetOut.addAnimation(translateOut)
24+
animatorSetOut.addAnimation(alphaOut)
25+
animatorSetOut.duration = 1000
26+
this.outAnimation = animatorSetOut
27+
}

0 commit comments

Comments
 (0)