release V49
authorsnickersun <scy@incartech.cn>
Mon, 14 Sep 2020 13:43:01 +0000 (21:43 +0800)
committersnickersun <scy@incartech.cn>
Mon, 14 Sep 2020 13:43:01 +0000 (21:43 +0800)
添加佩戴检测窗口

app/release/FactoryMode_V49_202009142141_release.apk [moved from app/release/FactoryMode_V48_202009031956_release.apk with 80% similarity]
app/release/output.json
app/src/main/AndroidManifest.xml
app/src/main/java/mobile/miki/AntiMonitorActivity.java [new file with mode: 0644]
app/src/main/java/mobile/miki/util/Config.java
app/src/main/res/values-zh-rCN/strings.xml
app/src/main/res/values/strings.xml
app/version_code.properties

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