release V53

添加Q3FT产品测试，支持心率、体温、佩戴功能。

diff --git a/app/release/FactoryMode_V52_202011171705_release.apk b/app/release/FactoryMode_V53_202011202253_release.apk
similarity index 83%
rename from app/release/FactoryMode_V52_202011171705_release.apk
rename to app/release/FactoryMode_V53_202011202253_release.apk
index fa7a83e..52f8526 100644 (file)
Binary files a/app/release/FactoryMode_V52_202011171705_release.apk and b/app/release/FactoryMode_V53_202011202253_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index c6b1614..507b0e6 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":52,"versionName":"202011171705","enabled":true,"outputFile":"FactoryMode_V52_202011171705_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V52_202011171705_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":53,"versionName":"202011202253","enabled":true,"outputFile":"FactoryMode_V53_202011202253_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V53_202011202253_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/TemperatureActivity.java b/app/src/main/java/mobile/miki/TemperatureActivity.java
index b51b9e4..6353a0a 100644 (file)
--- a/app/src/main/java/mobile/miki/TemperatureActivity.java
+++ b/app/src/main/java/mobile/miki/TemperatureActivity.java
@@ -27,6 +27,7 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
     Timer mTimer=null;\r
 \r
     private TextView tv_temperature;\r
+    private TextView tv_temperatureOut;\r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
@@ -58,13 +59,17 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
 \r
 \r
             double temp=ICJniUtils.getTemperature();\r
+            double tempout=ICJniUtils.getTemperatureOrigin();\r
             //double adjust=ICJniUtils.getTemperatureAdjustValue();\r
 \r
             String tempstr=String.format("%1$.2f",temp);\r
-          //  tempstr=tempstr+" ("+String.format("%1$.2f",adjust)+")";\r
+            String tempstrOut=String.format("%1$.2f",tempout);\r
+\r
+            //  tempstr=tempstr+" ("+String.format("%1$.2f",adjust)+")";\r
 \r
             tv_temperature.setText(tempstr);\r
-            Logger.d("Temperature:"+tempstr);\r
+            tv_temperatureOut.setText(tempstrOut);\r
+            Logger.d("Temperature:"+tempstr+" TemperatureOut:"+tempstrOut);\r
             return false;\r
         }\r
     });\r
@@ -108,6 +113,7 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
         buttonView.setSuccessColor();\r
         buttonView.btn_left.setClickable(true);\r
         tv_temperature=(TextView)findViewById(R.id.tv_temperature_value);\r
+        tv_temperatureOut=(TextView)findViewById(R.id.tv_temperature_value_out);\r
 \r
     }\r
 \r

diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java
index d6d18bc..030b810 100644 (file)
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -290,6 +290,17 @@ public class Config {
             testResultList.add("temperature");\r
             testResultList.remove("camera");\r
             testResultList.add("anti");\r
+        } else if (FTUtils.isQ3FT()){\r
+            list.add(context.getString(R.string.test_keypad));\r
+            list.add(context.getString(R.string.heartrate));\r
+            list.add(context.getString(R.string.temperature));\r
+            list.remove(context.getString(R.string.camera));\r
+            list.add(context.getString(R.string.anti_check));\r
+            testResultList.add("keys");\r
+            testResultList.add("heartrate");\r
+            testResultList.add("temperature");\r
+            testResultList.remove("camera");\r
+            testResultList.add("anti");\r
         } else if (FTUtils.isQ3F()){\r
 \r
             list.add(context.getString(R.string.test_keypad));\r

diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index ede20a4..21f7cee 100644 (file)
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -213,6 +213,13 @@ public class FTUtils {
         }\r
         return false;\r
     }\r
+    public static  boolean isQ3FT(){\r
+\r
+        if ( SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("VitracK")) {\r
+            return true;\r
+        }\r
+        return false;\r
+    }\r
     public static  boolean isQ3F(){\r
 \r
         if (getMODEL().contains("C41-QL02")||getMODEL().contains("C41S-QL02")|| SystemProperties.get("ro.product.isQ3F","").equalsIgnoreCase("true") || SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("q3f")) {\r

diff --git a/app/src/main/res/layout/temperature_layout.xml b/app/src/main/res/layout/temperature_layout.xml
index e10d908..dc85dac 100644 (file)
--- a/app/src/main/res/layout/temperature_layout.xml
+++ b/app/src/main/res/layout/temperature_layout.xml
@@ -34,7 +34,32 @@
                 android:text="0"\r
                 android:textSize="36sp" />\r
         </LinearLayout>\r
+        <LinearLayout\r
+            android:layout_width="match_parent"\r
+            android:layout_height="match_parent"\r
+            android:orientation="horizontal">\r
+\r
+            <TextView\r
+                android:id="@+id/tv_temperatureO"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:text="@string/temperature"\r
+                android:textSize="24sp" />\r
+\r
+            <TextView\r
 \r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:layout_weight="1"\r
+                android:text=":" />\r
+\r
+            <TextView\r
+                android:id="@+id/tv_temperature_value_out"\r
+                android:layout_width="wrap_content"\r
+                android:layout_height="wrap_content"\r
+                android:text="0"\r
+                android:textSize="36sp" />\r
+        </LinearLayout>\r
     </LinearLayout>\r
 \r
     <mobile.miki.mainui.ButtonViewTwo\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 2d6b1a8..40d27ed 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 17 17:05:05 CST 2020\r
-VERSION_CODE=52\r
+#Fri Nov 20 22:53:22 CST 2020\r
+VERSION_CODE=53\r