Skip to content

Commit 9ba101e

Browse files
committed
优化代码写法及代码逻辑
1 parent f3c9e38 commit 9ba101e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+219
-179
lines changed

app/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ plugins {
1313

1414
apply(plugin = "org.jetbrains.kotlin.kapt")
1515

16-
val LOG_ENABLE = rootProject.extra["LOG_ENABLE"].toString().toBoolean()
17-
val HOST_URL = rootProject.extra["HOST_URL"].toString()
18-
val BUGLY_ID = rootProject.extra["BUGLY_ID"].toString()
19-
val BUGLY_KEY = rootProject.extra["BUGLY_KEY"].toString()
16+
val logEnable = rootProject.extra["LOG_ENABLE"].toString().toBoolean()
17+
val hostUrl = rootProject.extra["HOST_URL"].toString()
18+
val buglyId = rootProject.extra["BUGLY_ID"].toString()
19+
val buglyKey = rootProject.extra["BUGLY_KEY"].toString()
2020

2121
// Android 代码规范文档:https://github.com/getActivity/AndroidCodeStandard
2222
android {
@@ -43,13 +43,13 @@ android {
4343
proguardFiles("proguard-sdk.pro", "proguard-app.pro")
4444

4545
// 日志开关
46-
buildConfigField("boolean", "LOG_ENABLE", LOG_ENABLE.toString())
46+
buildConfigField("boolean", "LOG_ENABLE", logEnable.toString())
4747
// 主机地址
48-
buildConfigField("String", "HOST_URL", "\"$HOST_URL\"")
48+
buildConfigField("String", "HOST_URL", "\"$hostUrl\"")
4949
// BuglyId
50-
buildConfigField("String", "BUGLY_ID", "\"$BUGLY_ID\"")
50+
buildConfigField("String", "BUGLY_ID", "\"$buglyId\"")
5151
// BuglyKey
52-
buildConfigField("String", "BUGLY_KEY", "\"$BUGLY_KEY\"")
52+
buildConfigField("String", "BUGLY_KEY", "\"$buglyKey\"")
5353

5454
// 仅保留 arm64-v8a 架构(需要注意的是 mmkv 库在 2.0 及之后的版本已经不支持在 32 位的机器上面运行)
5555
ndk {

app/src/main/java/com/hjq/demo/action/ImmersionAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ interface ImmersionAction : OnTitleBarListener {
1515
* 获取需要沉浸的顶部 View 对象
1616
*/
1717
fun getImmersionTopView(): View? {
18-
return null;
18+
return null
1919
}
2020

2121
/**
2222
* 获取需要沉浸的底部 View 对象
2323
*/
2424
fun getImmersionBottomView(): View? {
25-
return null;
25+
return null
2626
}
2727
}

app/src/main/java/com/hjq/demo/app/AppAdapter.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.hjq.demo.app
22

3+
import android.annotation.SuppressLint
34
import android.content.Context
45
import android.view.View
56
import androidx.annotation.IntRange
@@ -42,6 +43,7 @@ abstract class AppAdapter<T>(context: Context) :
4243
/**
4344
* 设置新的数据
4445
*/
46+
@SuppressLint("NotifyDataSetChanged")
4547
open fun setData(data: MutableList<T>?) {
4648
if (data == null) {
4749
dataSet.clear()
@@ -72,6 +74,7 @@ abstract class AppAdapter<T>(context: Context) :
7274
/**
7375
* 清空当前数据
7476
*/
77+
@SuppressLint("NotifyDataSetChanged")
7578
open fun clearData() {
7679
dataSet.clear()
7780
notifyDataSetChanged()

app/src/main/java/com/hjq/demo/app/AppApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AppApplication : Application() {
2525

2626
InitManager.preInitSdk(this)
2727
if (InitManager.isAgreePrivacy(this)) {
28-
InitManager.initSdk(this);
28+
InitManager.initSdk(this)
2929
}
3030
}
3131

app/src/main/java/com/hjq/demo/http/model/HttpCacheManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.tencent.mmkv.MMKV
1212
*/
1313
object HttpCacheManager {
1414

15-
private val HTTP_CACHE_CONTENT: MMKV = MMKV.mmkvWithID("http_cache_content");
15+
private val HTTP_CACHE_CONTENT: MMKV = MMKV.mmkvWithID("http_cache_content")
1616

1717
private val HTTP_CACHE_TIME: MMKV = MMKV.mmkvWithID("http_cache_time")
1818

app/src/main/java/com/hjq/demo/manager/InitManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.Context
66
import android.net.ConnectivityManager
77
import android.net.Network
88
import androidx.core.content.ContextCompat
9+
import androidx.core.content.edit
910
import androidx.lifecycle.Lifecycle
1011
import androidx.lifecycle.LifecycleOwner
1112
import com.chuckerteam.chucker.api.ChuckerInterceptor
@@ -72,7 +73,7 @@ object InitManager {
7273
*/
7374
fun setAgreePrivacy(context: Context, result: Boolean) {
7475
val sharedPreferences = context.getSharedPreferences(AGREE_PRIVACY_NAME, Context.MODE_PRIVATE)
75-
sharedPreferences.edit().putBoolean(KEY_AGREE_PRIVACY_RESULT, result).apply()
76+
sharedPreferences.edit { putBoolean(KEY_AGREE_PRIVACY_RESULT, result) }
7677
}
7778

7879
/**
@@ -126,7 +127,6 @@ object InitManager {
126127
// 友盟统计、登录、分享 SDK
127128
UmengClient.init(application, AppConfig.isLogEnable())
128129

129-
// Bugly 异常捕捉
130130
// Bugly 异常捕捉
131131
val builder = BuglyBuilder(AppConfig.getBuglyId(), AppConfig.getBuglyKey())
132132
builder.debugMode = AppConfig.isDebug()

app/src/main/java/com/hjq/demo/other/ArrowDrawable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class ArrowDrawable private constructor(private val builder: Builder) : Drawable
133133
invalidateSelf()
134134
}
135135

136-
class Builder constructor(private val context: Context) {
136+
class Builder(private val context: Context) {
137137

138138
/** 箭头高度 */
139139
var arrowHeight: Int

app/src/main/java/com/hjq/demo/other/CrashHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.SharedPreferences
66
import android.os.Process
77
import com.hjq.demo.ui.activity.common.CrashActivity
88
import com.hjq.demo.ui.activity.common.RestartActivity
9+
import kotlin.system.exitProcess
910

1011
/**
1112
* author : Android 轮子哥
@@ -67,6 +68,6 @@ class CrashHandler private constructor(private val application: Application) : T
6768

6869
// 杀死进程(这个事应该是系统干的,但是它会多弹出一个崩溃对话框,所以需要我们自己手动杀死进程)
6970
Process.killProcess(Process.myPid())
70-
System.exit(10)
71+
exitProcess(10)
7172
}
7273
}

app/src/main/java/com/hjq/demo/other/DebugLoggerTree.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class DebugLoggerTree : DebugTree() {
2121
override fun createStackElementTag(element: StackTraceElement): String {
2222
val tag = "(" + element.fileName + ":" + element.lineNumber + ")"
2323
// 日志 TAG 长度限制已经在 Android 8.0 被移除
24-
return if (tag.length <= MAX_TAG_LENGTH || isAndroid8()) {
25-
tag
26-
} else
27-
tag.take(MAX_TAG_LENGTH)
24+
return if (tag.length <= MAX_TAG_LENGTH || isAndroid8()) { tag } else tag.take(MAX_TAG_LENGTH)
2825
}
2926
}

app/src/main/java/com/hjq/demo/other/MaterialHeader.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package com.hjq.demo.other
33
import android.content.Context
44
import android.content.res.TypedArray
55
import android.graphics.Canvas
6-
import android.graphics.Color
76
import android.graphics.Paint
87
import android.graphics.Path
98
import android.util.AttributeSet
109
import android.widget.ImageView
1110
import androidx.annotation.ColorInt
1211
import androidx.annotation.ColorRes
1312
import androidx.core.content.ContextCompat
13+
import androidx.core.graphics.toColorInt
1414
import com.hjq.demo.R
1515
import com.hjq.smallest.width.dp2px
1616
import com.scwang.smart.refresh.header.material.CircleImageView
@@ -43,7 +43,7 @@ class MaterialHeader @JvmOverloads constructor(context: Context, attrs: Attribut
4343
/** 刷新球默认样式 */
4444
const val BALL_STYLE_DEFAULT: Int = 1
4545

46-
private val CIRCLE_BG_LIGHT: Int = Color.parseColor("#FAFAFA")
46+
private val CIRCLE_BG_LIGHT: Int = "#FAFAFA".toColorInt()
4747
private const val MAX_PROGRESS_ANGLE: Float = 0.8f
4848
}
4949

@@ -64,11 +64,11 @@ class MaterialHeader @JvmOverloads constructor(context: Context, attrs: Attribut
6464
minimumHeight = dp2px(100).toInt()
6565
progressDrawable = MaterialProgressDrawable(this)
6666
progressDrawable.setColorSchemeColors(
67-
Color.parseColor("#0099CC"),
68-
Color.parseColor("#FF4444"),
69-
Color.parseColor("#669900"),
70-
Color.parseColor("#AA66CC"),
71-
Color.parseColor("#FF8800"))
67+
"#0099CC".toColorInt(),
68+
"#FF4444".toColorInt(),
69+
"#669900".toColorInt(),
70+
"#AA66CC".toColorInt(),
71+
"#FF8800".toColorInt())
7272
circleView = CircleImageView(context, CIRCLE_BG_LIGHT)
7373
circleView.setImageDrawable(progressDrawable)
7474
circleView.alpha = 0f
@@ -81,21 +81,21 @@ class MaterialHeader @JvmOverloads constructor(context: Context, attrs: Attribut
8181
val typedArray: TypedArray = context.obtainStyledAttributes(attrs, R.styleable.MaterialHeader)
8282
showBezierWave = typedArray.getBoolean(R.styleable.MaterialHeader_srlShowBezierWave, showBezierWave)
8383
scrollableWhenRefreshing = typedArray.getBoolean(R.styleable.MaterialHeader_srlScrollableWhenRefreshing, scrollableWhenRefreshing)
84-
bezierPaint.color = typedArray.getColor(R.styleable.MaterialHeader_srlPrimaryColor, Color.parseColor("#11BBFF"))
84+
bezierPaint.color = typedArray.getColor(R.styleable.MaterialHeader_srlPrimaryColor, "#11BBFF".toColorInt())
8585
if (typedArray.hasValue(R.styleable.MaterialHeader_srlShadowRadius)) {
8686
val radius: Int = typedArray.getDimensionPixelOffset(R.styleable.MaterialHeader_srlShadowRadius, 0)
87-
val color: Int = typedArray.getColor(R.styleable.MaterialHeader_mhShadowColor, Color.parseColor("#000000"))
87+
val color: Int = typedArray.getColor(R.styleable.MaterialHeader_mhShadowColor, "#000000".toColorInt())
8888
bezierPaint.setShadowLayer(radius.toFloat(), 0f, 0f, color)
8989
setLayerType(LAYER_TYPE_SOFTWARE, null)
9090
}
9191
showBezierWave = typedArray.getBoolean(R.styleable.MaterialHeader_mhShowBezierWave, showBezierWave)
9292
scrollableWhenRefreshing = typedArray.getBoolean(R.styleable.MaterialHeader_mhScrollableWhenRefreshing, scrollableWhenRefreshing)
9393
if (typedArray.hasValue(R.styleable.MaterialHeader_mhPrimaryColor)) {
94-
bezierPaint.color = typedArray.getColor(R.styleable.MaterialHeader_mhPrimaryColor, Color.parseColor("#11BBFF"))
94+
bezierPaint.color = typedArray.getColor(R.styleable.MaterialHeader_mhPrimaryColor, "#11BBFF".toColorInt())
9595
}
9696
if (typedArray.hasValue(R.styleable.MaterialHeader_mhShadowRadius)) {
9797
val radius: Int = typedArray.getDimensionPixelOffset(R.styleable.MaterialHeader_mhShadowRadius, 0)
98-
val color: Int = typedArray.getColor(R.styleable.MaterialHeader_mhShadowColor, Color.parseColor("#000000"))
98+
val color: Int = typedArray.getColor(R.styleable.MaterialHeader_mhShadowColor, "#000000".toColorInt())
9999
bezierPaint.setShadowLayer(radius.toFloat(), 0f, 0f, color)
100100
setLayerType(LAYER_TYPE_SOFTWARE, null)
101101
}

0 commit comments

Comments
 (0)