minor fix

MalitsPlus · Jul 14, 2021 · 3e62cc8 · 3e62cc8
1 parent ea44cf4
commit 3e62cc8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.github.malitsplus.shizurunotes"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 47
-        versionName "1.7.2"
+        versionCode 48
+        versionName "1.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/db/DBHelper.kt b/app/src/main/java/com/github/malitsplus/shizurunotes/db/DBHelper.kt
@@ -490,15 +490,23 @@ class DBHelper private constructor(
      * @return
      */
     fun getCharaPromotionBonus(unitId: Int): List<RawPromotionBonus>? {
-        return  getBeanListByRaw(
-            """
-                SELECT * 
-                FROM promotion_bonus
-                WHERE unit_id=$unitId 
-                ORDER BY promotion_level DESC 
-                """,
-            RawPromotionBonus::class.java
-        )
+        // 考虑国服未实装的情况
+        val count = getOne("""SELECT COUNT(*) 
+                                FROM sqlite_master 
+                                WHERE type='table' 
+                                AND name='promotion_bonus'""")
+
+        return if (count.equals("1")) {
+            getBeanListByRaw(
+                """
+                    SELECT * 
+                    FROM promotion_bonus
+                    WHERE unit_id=$unitId 
+                    ORDER BY promotion_level DESC 
+                    """,
+                RawPromotionBonus::class.java
+            )
+        } else null
     }
 
     /***