From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 16 Jul 2021 11:54:57 +0000 (+0800)
Subject: adjust jpa language.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9e88bb0f23230c897e825880b2f9f90c0023ed8c;p=ichardware.git

adjust jpa language.
---

diff --git a/app/release/release/ICL02Sport_V29_202107071644_release.apk b/app/release/release/ICL02Sport_V31_202107072008_release.apk
similarity index 52%
rename from app/release/release/ICL02Sport_V29_202107071644_release.apk
rename to app/release/release/ICL02Sport_V31_202107072008_release.apk
index b6188ee..0c8541c 100644
Binary files a/app/release/release/ICL02Sport_V29_202107071644_release.apk and b/app/release/release/ICL02Sport_V31_202107072008_release.apk differ
diff --git a/app/release/release/output.json b/app/release/release/output.json
index 0f712c3..6354237 100644
--- a/app/release/release/output.json
+++ b/app/release/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":29,"versionName":"202107071644","enabled":true,"outputFile":"ICL02Sport_V29_202107071644_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Sport_V29_202107071644_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"202107072008","enabled":true,"outputFile":"ICL02Sport_V31_202107072008_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Sport_V31_202107072008_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
index 645b5d2..c6b7820 100644
--- a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
+++ b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java
@@ -10,6 +10,7 @@ import androidx.lifecycle.MutableLiveData;
 import com.ic.aidl.ped.IPedAidlInterface;
 import com.ic.aidl.ped.IPedRemoteService;
 import com.ic.aidl.ped.RecordParcelable;
+import com.ic.iclooger.ICLogger;
 import com.ic.sport.util.IcLog;
 import com.ic.sport.util.ServiceUtil;
 
diff --git a/app/src/main/java/com/ic/sport/util/IcLog.java b/app/src/main/java/com/ic/sport/util/IcLog.java
index 8c19a2c..cdc1671 100644
--- a/app/src/main/java/com/ic/sport/util/IcLog.java
+++ b/app/src/main/java/com/ic/sport/util/IcLog.java
@@ -1,6 +1,6 @@
 package com.ic.sport.util;
 
-import android.util.Log;
+import com.ic.iclooger.ICLogger;
 
 /**
  * @author RyanLee
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 55bd90a..507b165 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,9 +1,6 @@
 <resources>
     <string name="app_name">ICSport</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
 
     <string name="ped_head_name">Settings</string>
     <string name="ped_height_name">Tall</string>
@@ -39,8 +36,8 @@
     <string name="pedometer_unit_kg">kg</string>
     <string name="pedometer_personal_info_settings">personal settings</string>
     <string name="_0">0</string>
-    <string name="averagestep">average step</string>
-    <string name="sumstep">total step</string>
+    <string name="average_step">average step</string>
+    <string name="sum_step">total step</string>
     <string name="pedometer_unit_lb">pound</string>
     <string name="pedometer_unit_mile">mile</string>
     <string name="pedometer_unit_inch">inch</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 8326cde..4d61749 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,8 +1,5 @@
 <resources>
-    <string name="app_name">ICSport</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="app_name">フィットネス</string>
 
 
     <string name="ped_head_name">個人設定</string>
@@ -27,20 +24,20 @@
     <string name="pedometer_unit_step">ステップ</string>
     <string name="pedometer_setting_unit_step">ステップ</string>
     <string name="pedometer_unit_calorie">カロリー</string>
-    <string name="pedometer_unit_km">公里</string>
-    <string name="pedometer_history_7days">最近记录</string>
+    <string name="pedometer_unit_km">km</string>
+    <string name="pedometer_history_7days">最近の履歴</string>
     <string name="pedometer_today">今日</string>
     <string name="pedometer_goal">目标</string>
     <string name="pedometer_input_goal">请输入目标步数</string>
     <string name="pedometer_invalid_input">输入值无效</string>
-    <string name="pedometer_height">身高</string>
+    <string name="pedometer_height">身長</string>
     <string name="pedometer_weight">体重</string>
-    <string name="pedometer_unit_cm">厘米</string>
-    <string name="pedometer_unit_kg">千克</string>
-    <string name="pedometer_personal_info_settings">个人设置</string>
+    <string name="pedometer_unit_cm">cm</string>
+    <string name="pedometer_unit_kg">kg</string>
+    <string name="pedometer_personal_info_settings">個人設定</string>
     <string name="_0">0</string>
-    <string name="averagestep">平均步数</string>
-    <string name="sumstep">总步数</string>
+    <string name="average_step">平均步数</string>
+    <string name="sum_step">总步数</string>
     <string name="pedometer_unit_lb">磅</string>
     <string name="pedometer_unit_mile">英里</string>
     <string name="pedometer_unit_inch">英寸</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 4841326..2d9f16e 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,9 +1,6 @@
 <resources>
     <string name="app_name">运动</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
 
     <string name="ped_head_name">个人设置</string>
     <string name="ped_height_name">身高</string>
@@ -40,8 +37,8 @@
     <string name="pedometer_unit_kg">千克</string>
     <string name="pedometer_personal_info_settings">个人设置</string>
     <string name="_0">0</string>
-    <string name="averagestep">平均步数</string>
-    <string name="sumstep">总步数</string>
+    <string name="average_step">平均步数</string>
+    <string name="sum_step">总步数</string>
     <string name="pedometer_unit_lb">磅</string>
     <string name="pedometer_unit_mile">英里</string>
     <string name="pedometer_unit_inch">英寸</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 005eeed..6b8dbb5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,5 @@
 <resources>
-    <string name="app_name">ICSport</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
+    <string name="app_name">運動</string>
 
     <string name="ped_head_name">个人设置</string>
     <string name="ped_height_name">身高</string>
@@ -40,8 +36,8 @@
     <string name="pedometer_unit_kg">千克</string>
     <string name="pedometer_personal_info_settings">个人设置</string>
     <string name="_0">0</string>
-    <string name="averagestep">平均步数</string>
-    <string name="sumstep">总步数</string>
+    <string name="average_step">平均步数</string>
+    <string name="sum_step">总步数</string>
     <string name="pedometer_unit_lb">磅</string>
     <string name="pedometer_unit_mile">英里</string>
     <string name="pedometer_unit_inch">英寸</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index f7fcbc2..9c9948c 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jul 07 16:44:48 CST 2021
-VERSION_CODE=29
+#Wed Jul 07 20:08:00 CST 2021
+VERSION_CODE=31