From: snickersun <scy@incartech.cn>
Date: Fri, 20 Nov 2020 14:55:23 +0000 (+0800)
Subject: release V53
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=77ca1a51574c08fc1668ce13dc7eb3908b36154f;p=factoryMode.git

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
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
--- 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
--- 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;
 
     private TextView tv_temperature;
+    private TextView tv_temperatureOut;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -58,13 +59,17 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
 
 
             double temp=ICJniUtils.getTemperature();
+            double tempout=ICJniUtils.getTemperatureOrigin();
             //double adjust=ICJniUtils.getTemperatureAdjustValue();
 
             String tempstr=String.format("%1$.2f",temp);
-          //  tempstr=tempstr+" ("+String.format("%1$.2f",adjust)+")";
+            String tempstrOut=String.format("%1$.2f",tempout);
+
+            //  tempstr=tempstr+" ("+String.format("%1$.2f",adjust)+")";
 
             tv_temperature.setText(tempstr);
-            Logger.d("Temperature:"+tempstr);
+            tv_temperatureOut.setText(tempstrOut);
+            Logger.d("Temperature:"+tempstr+" TemperatureOut:"+tempstrOut);
             return false;
         }
     });
@@ -108,6 +113,7 @@ public class TemperatureActivity extends BaseActivity implements View.OnClickLis
         buttonView.setSuccessColor();
         buttonView.btn_left.setClickable(true);
         tv_temperature=(TextView)findViewById(R.id.tv_temperature_value);
+        tv_temperatureOut=(TextView)findViewById(R.id.tv_temperature_value_out);
 
     }
 
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
--- 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");
             testResultList.remove("camera");
             testResultList.add("anti");
+        } else if (FTUtils.isQ3FT()){
+            list.add(context.getString(R.string.test_keypad));
+            list.add(context.getString(R.string.heartrate));
+            list.add(context.getString(R.string.temperature));
+            list.remove(context.getString(R.string.camera));
+            list.add(context.getString(R.string.anti_check));
+            testResultList.add("keys");
+            testResultList.add("heartrate");
+            testResultList.add("temperature");
+            testResultList.remove("camera");
+            testResultList.add("anti");
         } else if (FTUtils.isQ3F()){
 
             list.add(context.getString(R.string.test_keypad));
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
--- 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 {
         }
         return false;
     }
+    public static  boolean isQ3FT(){
+
+        if ( SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("VitracK")) {
+            return true;
+        }
+        return false;
+    }
     public static  boolean isQ3F(){
 
         if (getMODEL().contains("C41-QL02")||getMODEL().contains("C41S-QL02")|| SystemProperties.get("ro.product.isQ3F","").equalsIgnoreCase("true") || SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("q3f")) {
diff --git a/app/src/main/res/layout/temperature_layout.xml b/app/src/main/res/layout/temperature_layout.xml
index e10d908..dc85dac 100644
--- 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"
                 android:textSize="36sp" />
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_temperatureO"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/temperature"
+                android:textSize="24sp" />
+
+            <TextView
 
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=":" />
+
+            <TextView
+                android:id="@+id/tv_temperature_value_out"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0"
+                android:textSize="36sp" />
+        </LinearLayout>
     </LinearLayout>
 
     <mobile.miki.mainui.ButtonViewTwo
diff --git a/app/version_code.properties b/app/version_code.properties
index 2d6b1a8..40d27ed 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Nov 17 17:05:05 CST 2020
-VERSION_CODE=52
+#Fri Nov 20 22:53:22 CST 2020
+VERSION_CODE=53