From: snickersun <scy@incartech.cn>
Date: Mon, 14 Sep 2020 13:43:01 +0000 (+0800)
Subject: release V49
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=9741b2d0c62753f229a490db90ba95cdc4f66a57;p=factoryMode.git

release V49
添加佩戴检测窗口
---

diff --git a/app/release/FactoryMode_V48_202009031956_release.apk b/app/release/FactoryMode_V49_202009142141_release.apk
similarity index 80%
rename from app/release/FactoryMode_V48_202009031956_release.apk
rename to app/release/FactoryMode_V49_202009142141_release.apk
index 8d9eda1..7074816 100644
Binary files a/app/release/FactoryMode_V48_202009031956_release.apk and b/app/release/FactoryMode_V49_202009142141_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index c86441b..e4ddfaa 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":48,"versionName":"202009031956","enabled":true,"outputFile":"FactoryMode_V48_202009031956_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V48_202009031956_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":49,"versionName":"202009142141","enabled":true,"outputFile":"FactoryMode_V49_202009142141_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V49_202009142141_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cd9e5b5..402f593 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -175,6 +175,9 @@
         <activity
             android:name=".HeartRate"
             android:label="@string/heartrate" />
+        <activity
+            android:name=".AntiMonitorActivity"
+            android:label="@string/anti_check" />
         <activity
             android:name=".MikeTest"
             android:label="@string/mic_title" />
diff --git a/app/src/main/java/mobile/miki/AntiMonitorActivity.java b/app/src/main/java/mobile/miki/AntiMonitorActivity.java
new file mode 100644
index 0000000..c87984a
--- /dev/null
+++ b/app/src/main/java/mobile/miki/AntiMonitorActivity.java
@@ -0,0 +1,174 @@
+package mobile.miki;
+
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Handler;
+import android.os.Message;
+import android.os.PowerManager;
+
+
+
+import android.content.Intent;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import com.ic.jni.ICJniUtils;
+
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import mobile.miki.mainui.ButtonViewTwo;
+import mobile.miki.mainui.TestMainActivity;
+import mobile.miki.util.Config;
+import mobile.miki.util.Logger;
+import static java.lang.Thread.sleep;
+
+public class AntiMonitorActivity extends BaseActivity implements View.OnClickListener, SensorEventListener {
+
+    private ButtonViewTwo buttonView;
+    boolean running;
+    private TextView tv_isweared;
+    private TextView tv_ppg;
+    private TextView tv_isweared_value;
+    private TextView tv_ppg_value;
+    private SensorManager mSensorManager=null;
+    private Sensor mAntiManager=null;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.heartrate_layout);
+        initView();
+
+        mSensorManager = (SensorManager)getSystemService(SENSOR_SERVICE);
+        mAntiManager = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+        boolean ret = mSensorManager.registerListener(this, mAntiManager, SensorManager.SENSOR_DELAY_UI);
+        Log.i( "dxc","AntiMonitor ret :: " + ret);
+
+
+    }
+
+    Handler mhandler=new Handler(new Handler.Callback() {
+        @Override
+        public boolean handleMessage(Message message) {
+
+            switch(message.what)
+            {
+                case 1: {
+                    Bundle bdl = message.getData();
+
+                    int anti = bdl.getInt("AntiEvent");
+                    tv_isweared_value.setText(" " + anti);
+
+                }
+                break;
+
+            }
+
+            return false;
+        }
+    });
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Log.i( "dxc","Anti Monitor onDestroy");
+        mSensorManager.unregisterListener(this);
+
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Log.i( "dxc","Anti Monitor onPause");
+
+    }
+
+    private void initView() {
+        buttonView = (ButtonViewTwo) findViewById(R.id.btn_set);
+        buttonView.btn_left.setOnClickListener(this);
+        buttonView.btn_right.setOnClickListener(this);
+        buttonView.setSuccessColor();
+        buttonView.btn_left.setClickable(true);
+
+        tv_isweared_value=(TextView)findViewById(R.id.tv_weared_value);
+        tv_isweared_value.setText("");
+
+        tv_ppg_value=(TextView)findViewById(R.id.tv_ppg_value);
+        tv_ppg_value.setVisibility(View.GONE);
+
+
+        tv_isweared=(TextView)findViewById(R.id.tv_isweared);
+        tv_isweared.setText("AntiCheck:");
+        tv_ppg=(TextView)findViewById(R.id.tv_ppg);
+        tv_ppg.setVisibility(View.GONE);
+
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent intent =  Config.getNextTestIntent(this,this.getClass());//new Intent(this, SimDetectActivity.class);
+        intent.putExtra("running", true);
+        Intent intent1 = new Intent(this, TestMainActivity.class);
+        // TestResult testResult = (TestResult) getApplicationContext();
+        switch (view.getId()) {
+
+            case R.id.btn_two_left:
+                if (!running) {
+                    startActivity(intent1);
+                } else {
+                    startActivity(intent);
+                }
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("anti", "true").commit();
+                finish();
+                break;
+            case R.id.btn_two_right:
+                if (!running) {
+                    startActivity(intent1);
+                } else {
+                    startActivity(intent);
+                }
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("anti", "false").commit();
+                finish();
+                break;
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent sensorEvent) {
+        float values[]=sensorEvent.values;
+        int length = values.length;
+        if (length>0) {
+            int current_anti_status = (int) sensorEvent.values[0];
+            Log.i("AntiMonitor", "近距离 " + current_anti_status);
+            Message msg = new Message();
+            Bundle bdl = new Bundle();
+            msg.what = 1;
+            bdl.putInt("AntiEvent",current_anti_status );
+            msg.setData(bdl);
+            mhandler.sendMessage(msg);
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int i) {
+        Log.i("dxc","onAccuracyChanged() is called "+sensor.getName()+" accuracy="+i);
+    }
+}
+
diff --git a/app/src/main/java/mobile/miki/util/Config.java b/app/src/main/java/mobile/miki/util/Config.java
index 63ec037..d6d18bc 100644
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -7,6 +7,7 @@ import android.content.Intent;
 import java.util.ArrayList;
 import java.util.List;
 
+import mobile.miki.AntiMonitorActivity;
 import mobile.miki.BatteryTestActivity;
 import mobile.miki.BlooToothActivity;
 import mobile.miki.BrightnessTest;
@@ -138,8 +139,10 @@ public class Config {
             return context.getResources().getString(R.string.ultraviolet);
         }else if (ClassName.equals(DSPActivity.class.getSimpleName())){
             return context.getResources().getString(R.string.dsp);
-        }else if (ClassName.equals(HeartRate.class.getSimpleName())){
+        }else if (ClassName.equals(HeartRate.class.getSimpleName())) {
             return context.getResources().getString(R.string.heartrate);
+        }else if (ClassName.equals(AntiMonitorActivity.class.getSimpleName())){
+            return context.getResources().getString(R.string.anti_check);
         }else if (ClassName.equals(TemperatureActivity.class.getSimpleName())){
             return context.getResources().getString(R.string.temperature);
         }else {
@@ -193,6 +196,8 @@ public class Config {
             intent = new Intent(context, DSPActivity.class);
         }else if (testItemName.equals(context.getResources().getString(R.string.heartrate))) {
             intent = new Intent(context, HeartRate.class);
+        }else if (testItemName.equals(context.getResources().getString(R.string.anti_check))) {
+            intent = new Intent(context, AntiMonitorActivity.class);
         }else if (testItemName.equals(context.getResources().getString(R.string.temperature))) {
             intent = new Intent(context, TemperatureActivity.class);
         }
@@ -279,10 +284,12 @@ public class Config {
             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/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index efbb6c1..9aea62a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -864,6 +864,7 @@
     <string name="tempAdjust">温度校准</string>
     <string name="temperature">温度测试</string>
     <string name="no_temperature">没发现测温设备！</string>
+    <string name="anti_check">佩戴检测</string>
 
     <string name="startRecord">开始录音</string>
     <string name="stopRecord">结束录音</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ddf94b2..a6fb074 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -406,6 +406,7 @@
     <string name="tempAdjust">Temperature Adjust 温度校准</string>
     <string name="temperature">Temperature</string>
     <string name="no_temperature">No Temperature device found!</string>
+    <string name="anti_check">AntiCheck</string>
 
     <string name="startRecord">Start recording</string>
     <string name="stopRecord">Stop recording</string>
diff --git a/app/version_code.properties b/app/version_code.properties
index 1126675..31880c5 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 03 19:56:10 CST 2020
-VERSION_CODE=48
+#Mon Sep 14 21:41:30 CST 2020
+VERSION_CODE=49