1、修复在材料仓库中查看材料需求量的技能升级项显示错误（忘记×3）的问题；

2、部分文本修改。
ssttkkl · Mar 2, 2019 · 65c6e8e · 65c6e8e
1 parent 4d66441
commit 65c6e8e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId "com.ssttkkl.fgoplanningtool"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 20190127
-        versionName "v1.2.2"
+        versionCode 20190302
+        versionName "v1.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true

diff --git a/app/src/main/java/com/ssttkkl/fgoplanningtool/ui/iteminfo/ItemInfoFragmentViewModel.kt b/app/src/main/java/com/ssttkkl/fgoplanningtool/ui/iteminfo/ItemInfoFragmentViewModel.kt
@@ -59,7 +59,7 @@ class ItemInfoFragmentViewModel : ViewModel() {
             val requirement = HashMap<String, Long>()
             servant.skillItems.forEach { itemsForCurLevel ->
                 itemsForCurLevel.forEach { item ->
-                    requirement[item.codename] = (requirement[item.codename] ?: 0) + item.count
+                    requirement[item.codename] = (requirement[item.codename] ?: 0) + item.count * 3
                 }
             }
             requirement.map { Item(it.key, it.value) }

diff --git a/app/src/main/res/layout/fragment_informupdate_respack.xml b/app/src/main/res/layout/fragment_informupdate_respack.xml
@@ -91,7 +91,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:onClick="@{() -> viewModel.onClickUpdate()}"
-                android:text="@string/autoUpdateResPack" />
+                android:text="@string/autoUpdate" />
         </LinearLayout>
     </GridLayout>
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="closeDrawer">关闭侧边栏</string>
     <string name="backAgainToExitApp">再按一次返回键退出应用</string>
 
-    <string name="servantDetailList">灵基一览</string>
+    <string name="servantDetailList">英灵图鉴</string>
 
     <string name="databaseManage">管理账号</string>
     <string name="rename">重命名</string>
@@ -64,7 +64,7 @@
     <string name="illegalRemainedExp">“升级剩余经验”不能大于该等级升级需要的经验值</string>
     <string name="illegalLevel">“等级”不能超出该角色的合法等级范围</string>
 
-    <string name="servantBaseList">灵基一览</string>
+    <string name="servantBaseList">英灵图鉴</string>
     <string name="switchToGridView">切换到网格视图</string>
     <string name="switchToListView">切换到列表视图</string>
     <string name="sortAndFilter">排序与过滤</string>
@@ -235,4 +235,5 @@
     <string name="versionName">版本名称</string>
     <string name="RemindMeLater">稍后再说</string>
     <string name="download">下载</string>
+    <string name="autoUpdate">自动更新</string>
 </resources>