diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt index 5119b60..7dfa2f8 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt @@ -60,7 +60,7 @@ class MainActivity : BaseActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) /** 设置文本 */ - findViewById(R.id.main_text_version).text = "当前版本:$moduleVersion" + findViewById(R.id.main_text_version).text = "模块版本:$moduleVersion" findViewById(R.id.main_text_coloros_version).text = "系统版本:$colorOSVersion" when { /** 判断是否为 ColorOS 系统 */ diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt b/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt index f9d1fbd..cbee9f3 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt @@ -107,12 +107,12 @@ inline val isNotColorOS get() = !isColorOS */ val colorOSVersion get() = safeOf(default = "无法获取") { - classOf(name = "com.oplus.os.OplusBuild").let { + (classOf(name = "com.oplus.os.OplusBuild").let { it.field { name = "VERSIONS" }.ignoredError().of>() ?.get((it.method { name = "getOplusOSVERSION" }.ignoredError().get().invoke() ?: 23) - 1) } ?: findPropString(key = "ro.system.build.fingerprint", default = "无法获取") .split("ssi:")[1] - .split("/")[0].trim() + .split("/")[0].trim()) + " ${Build.DISPLAY}" } /** diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4cf4773..1369d51 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="5dp" android:alpha="0.8" - android:text="当前版本:%1" + android:text="模块版本:%1" android:textColor="@color/white" android:textSize="13sp" /> @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.8" - android:text="ColorOS 版本:%1" + android:text="系统版本:%1" android:textColor="@color/white" android:textSize="13sp" />