Forráskód Böngészése

refactor(更新)
- 调整日志输出级别
- 增加语言地区过滤功能
- 关闭Debug模式

周文健 2 hónapja
szülő
commit
25b70597c1

+ 4 - 1
app/src/main/java/com/grkj/iscs/ISCSApplication.kt

@@ -58,12 +58,13 @@ import java.util.Locale
 class ISCSApplication : Application() {
     private val logger: Logger = LoggerFactory.getLogger(ISCSApplication::class.java)
 
-    companion object{
+    companion object {
         /**
          * 检查钥匙信息任务
          */
         val checkKeyInfoTask: CheckKeyInfoTask by lazy { CheckKeyInfoTask() }
     }
+
     /**
      * 程序创建
      */
@@ -83,6 +84,8 @@ class ISCSApplication : Application() {
         }
         if (ISCSConfig.DEBUG) {
             LogUtils.setGlobalLogLevel(Level.DEBUG)
+        } else {
+            LogUtils.setGlobalLogLevel(Level.INFO)
         }
         System.loadLibrary("sqlcipher")   // 新库必须手动加载
         I18nManager.init(

+ 7 - 0
shared/src/main/java/com/grkj/shared/config/Constants.kt

@@ -43,6 +43,13 @@ object Constants {
 
     const val DEBUG: Boolean = false
 
+    /**
+     * 语言地区过滤
+     * CN
+     * US
+     */
+    val languageFilter: List<String> = listOf()
+
     /*************************  虹软ArcSoft  *************************/
     const val ACTIVE_KEY = "8551-11XJ-913K-J1CN"
     const val APP_ID = "FTN3G4pk8n2RKwjD955sRapRjbYQFefwhHd4sBZMYEz6"

+ 10 - 3
shared/src/main/java/com/grkj/shared/utils/i18n/LanguageRegistry.kt

@@ -1,5 +1,6 @@
 package com.grkj.shared.utils.i18n
 
+import com.grkj.shared.config.Constants
 import java.util.Locale
 
 object LanguageRegistry {
@@ -29,12 +30,18 @@ object LanguageRegistry {
      */
     fun entriesFromSources(
         targetRegion: String?,
-        sortByDisplay: Boolean = true
+        sortByDisplay: Boolean = true,
+        filterRegion: List<String> = Constants.languageFilter
     ): List<LanguageEntry> {
         val curTag = currentLocale().toLanguageTag()
-        val list = availableLocales().map { it.toEntry() }.map {
-            it.copy(isSelected = it.tag.equals(curTag, true))
+        val list = availableLocales().filter { locale ->
+            filterRegion.none {
+                locale.toLanguageTag().contains(it)
+            }
         }
+            .map { it.toEntry() }.map {
+                it.copy(isSelected = it.tag.equals(curTag, true))
+            }
         if (!sortByDisplay) return list
         val dispLocale = LocaleUtils.regionToLocale(targetRegion)
         return list.sortedBy { entry ->

+ 1 - 1
ui-base/src/main/java/com/grkj/ui_base/config/ISCSConfig.kt

@@ -15,7 +15,7 @@ object ISCSConfig {
     /**
      * Debug模式
      */
-    const val DEBUG: Boolean = true
+    const val DEBUG: Boolean = false
 
     /**
      * 是否在注册设备