From: snickersun <scy@incartech.cn>
Date: Mon, 12 Oct 2020 11:37:17 +0000 (+0800)
Subject: release ICL02Hardware V18
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=a1f3435917d9956535673cce9de3aab1e390f5f0;p=ichardware.git

release ICL02Hardware V18
添加英文，日文支持。
---

diff --git a/app/release/ICL02Hardware_V18_202010121935_release.apk b/app/release/ICL02Hardware_V18_202010121935_release.apk
new file mode 100644
index 0000000..c5e9126
Binary files /dev/null and b/app/release/ICL02Hardware_V18_202010121935_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 0000000..7a3abbe
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"202010121935","enabled":true,"outputFile":"ICL02Hardware_V18_202010121935_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Hardware_V18_202010121935_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java b/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java
index 430270f..53c51d1 100644
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java
+++ b/app/src/main/java/com/ic/hardware/fragment/pedometer/PedMainFragment.java
@@ -104,7 +104,7 @@ public class PedMainFragment extends Fragment {
         Ring r = new Ring(number, "", "", Color.GREEN, Color.YELLOW);
         List<Ring> mlistRing = new ArrayList<>();
         mlistRing.add(r);
-        mRingProgress.setData(mlistRing, 5000);
+        mRingProgress.setData(mlistRing, 500);
     }
 
     private void setupRingProgressNumberTv(int number) {
@@ -113,7 +113,7 @@ public class PedMainFragment extends Fragment {
         pedNumber.setTypeface(typeFace);
 
         ValueAnimator animator = ValueAnimator.ofInt(0, number);
-        animator.setDuration(5000);
+        animator.setDuration(500);
         animator.addUpdateListener(animation -> pedMainBinding.setPedNumber(animation.getAnimatedValue().toString()));
         animator.start();
     }
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000..91d08f8
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,29 @@
+<resources>
+    <string name="app_name">IcHardware</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>
+    <string name="tips_weight_name">Weight</string>
+    <string name="tips_target_name">Goal</string>
+
+    <string name="tips_height_unit">cm</string>
+    <string name="tips_weight_unit">kg</string>
+    <string name="tips_target_unit">steps</string>
+
+    <string name="ped_record_name">Records</string>
+    <string name="tips_calories_unit">kcal</string>
+    <string name="tips_distance_unit">km</string>
+
+
+
+    <string name="ped_main_today">Today</string>
+    <string name="ped_main_step">Steps</string>
+
+    <string name="program_abnormal">Sorry, program will exit on exception!</string>
+
+
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..6171ae4
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,28 @@
+<resources>
+    <string name="app_name">IcHardware</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>
+    <string name="tips_weight_name">体重</string>
+    <string name="tips_target_name">目標</string>
+
+    <string name="tips_height_unit">cm</string>
+    <string name="tips_weight_unit">kg</string>
+    <string name="tips_target_unit">æ­©</string>
+
+    <string name="ped_record_name">最近の記録</string>
+    <string name="tips_calories_unit">kcal</string>
+    <string name="tips_distance_unit">km</string>
+
+
+
+    <string name="ped_main_today">本日</string>
+    <string name="ped_main_step">æ­©</string>
+
+    <string name="program_abnormal">很抱歉,程序出现异常,即将退出</string>
+
+</resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..2b99c5e
--- /dev/null
+++ b/app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,51 @@
+<resources>
+    <string name="app_name">IcHardware</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>
+    <string name="tips_weight_name">体重</string>
+    <string name="tips_target_name">目标</string>
+
+    <string name="tips_height_unit">厘米</string>
+    <string name="tips_weight_unit">千克</string>
+    <string name="tips_target_unit">æ­¥</string>
+
+    <string name="ped_record_name">最近记录</string>
+    <string name="tips_calories_unit">大卡</string>
+    <string name="tips_distance_unit">公里</string>
+
+
+
+    <string name="ped_main_today">今日</string>
+    <string name="ped_main_step">æ­¥</string>
+
+    <string name="program_abnormal">很抱歉,程序出现异常,即将退出</string>
+
+
+    <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_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_weight">体重</string>
+    <string name="pedometer_unit_cm">厘米</string>
+    <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="pedometer_unit_lb">磅</string>
+    <string name="pedometer_unit_mile">英里</string>
+    <string name="pedometer_unit_inch">英寸</string>
+    <string name="pedometer_unit_foot">英尺</string>
+    <string name="reached_step_goal">已达到目标步数</string>
+</resources>
diff --git a/app/version_code.properties b/app/version_code.properties
index b08c398..f94e6f0 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Apr 10 16:29:48 CST 2020
-VERSION_CODE=17
+#Mon Oct 12 19:35:16 CST 2020
+VERSION_CODE=18