From: kfl_614 <kfl_614@163.com>
Date: Fri, 4 Dec 2020 09:16:22 +0000 (+0800)
Subject: add locatioin strings.xml
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=8c4bcc2eca434a514cbdfad57eba77fc0be47102;p=ichardware.git

add locatioin strings.xml
---

diff --git a/app/release/ICL02Hardware_V21_202012040920_release.apk b/app/release/ICL02Hardware_V21_202012040920_release.apk
new file mode 100644
index 0000000..a6b1df2
Binary files /dev/null and b/app/release/ICL02Hardware_V21_202012040920_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 7a3abbe..f6bea12 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +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
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"202012040920","enabled":true,"outputFile":"ICL02Hardware_V21_202012040920_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Hardware_V21_202012040920_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java b/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java
index 672ebbc..bf3308f 100644
--- a/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java
+++ b/app/src/main/java/com/ic/hardware/fragment/pedometer/PedRecordFragment.java
@@ -46,7 +46,6 @@ public class PedRecordFragment extends Fragment {
     @Override
     public void onDetach() {
         super.onDetach();
-
     }
 
     @Override
diff --git a/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java b/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java
index 4a9ef4f..d1a3a51 100644
--- a/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java
+++ b/app/src/main/java/com/ic/hardware/widget/WidgetImageTextLayout.java
@@ -44,7 +44,7 @@ public class WidgetImageTextLayout extends LinearLayout {
         mValueTv.setTextColor(color);
     }
 
-    @BindingAdapter(value = {"icApp:widgetImageValue", "icApp:widgetImageUnit", "icApp:widgetImageIcon","icApp:widgetImageColor"}, requireAll = false)
+    @BindingAdapter(value = {"widgetImageValue", "widgetImageUnit", "widgetImageIcon","widgetImageColor"}, requireAll = false)
     public static void updateTimeText(WidgetImageTextLayout view, String value, String unit, int iconResId,int color) {
         if (view != null) {
             view.updateWidgetImageText(value, unit, iconResId,color);
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 91d08f8..84e2061 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -19,11 +19,31 @@
     <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>
 
-
+    <string name="pedometer_unit_step">step</string>
+    <string name="pedometer_setting_unit_step">step</string>
+    <string name="pedometer_unit_calorie">calory</string>
+    <string name="pedometer_unit_km">km</string>
+    <string name="pedometer_history_7days">record</string>
+    <string name="pedometer_today">today</string>
+    <string name="pedometer_goal">aim</string>
+    <string name="pedometer_input_goal">goal</string>
+    <string name="pedometer_invalid_input">invalid value</string>
+    <string name="pedometer_height">height</string>
+    <string name="pedometer_weight">weight</string>
+    <string name="pedometer_unit_cm">cm</string>
+    <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="pedometer_unit_lb">pound</string>
+    <string name="pedometer_unit_mile">mile</string>
+    <string name="pedometer_unit_inch">inch</string>
+    <string name="pedometer_unit_foot">feet</string>
+    <string name="reached_step_goal">completed</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6171ae4..d8e140d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,10 +19,32 @@
     <string name="tips_distance_unit">km</string>
 
 
-
     <string name="ped_main_today">本日</string>
     <string name="ped_main_step">æ­©</string>
 
-    <string name="program_abnormal">很抱歉,程序出现异常,即将退出</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/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f1c94d..3e4d8bc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,9 +19,32 @@
     <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 f94e6f0..7e076d2 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Oct 12 19:35:16 CST 2020
-VERSION_CODE=18
+#Fri Dec 04 09:20:50 CST 2020
+VERSION_CODE=21