release V107

 优化适配L69A UI，以及补充back key的测试。
 加大获取温数据的菜单字号。

diff --git a/app/release/FactoryMode_V105_202106170943_release.apk b/app/release/FactoryMode_V107_202106201846_release.apk
similarity index 94%
rename from app/release/FactoryMode_V105_202106170943_release.apk
rename to app/release/FactoryMode_V107_202106201846_release.apk
index 9285988..a991d07 100644 (file)
Binary files a/app/release/FactoryMode_V105_202106170943_release.apk and b/app/release/FactoryMode_V107_202106201846_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 80a9f95..5136750 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":106,"versionName":"202106172337","enabled":true,"outputFile":"FactoryMode_V106_202106172337_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V106_202106172337_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":107,"versionName":"202106201846","enabled":true,"outputFile":"FactoryMode_V107_202106201846_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V107_202106201846_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/BaseActivity.java b/app/src/main/java/mobile/miki/BaseActivity.java
index 01a0d7f..07f779e 100644 (file)
--- a/app/src/main/java/mobile/miki/BaseActivity.java
+++ b/app/src/main/java/mobile/miki/BaseActivity.java
@@ -48,6 +48,12 @@ public class BaseActivity extends Activity {
             ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值
             windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95
             windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6
+        }else if (FTUtils.isL69A()){
+            Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高
+            Window window = getWindow();
+            ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值
+            windowLayoutParams.width = 240;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95
+            windowLayoutParams.height = 240;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6
         }
 //        else if(FTUtils.isV20() || FTUtils.isGT09()){
 //            Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高

diff --git a/app/src/main/java/mobile/miki/HeartRate.java b/app/src/main/java/mobile/miki/HeartRate.java
index dd870f6..ec5eee4 100644 (file)
--- a/app/src/main/java/mobile/miki/HeartRate.java
+++ b/app/src/main/java/mobile/miki/HeartRate.java
@@ -55,7 +55,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
         if(FTUtils.isV20()){
             mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
             mHeartRate = mSensorManager.getDefaultSensor(TYPE_HEART_RATE);
-            boolean ret = mSensorManager.registerListener(this, mHeartRate, SensorManager.SENSOR_DELAY_UI);
+            boolean ret = mSensorManager.registerListener(this, mHeartRate, SensorManager.SENSOR_DELAY_NORMAL);
             Log.i("dxc", "Heart Rate PPG_EGC_TYPE_IC66 opened ret :: " + ret);
 
         }else {
@@ -65,7 +65,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
 
                 mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
                 mHeartRate = mSensorManager.getDefaultSensor(TYPE_HEART_RATE);
-                boolean ret = mSensorManager.registerListener(this, mHeartRate, SensorManager.SENSOR_DELAY_UI);
+                boolean ret = mSensorManager.registerListener(this, mHeartRate, SensorManager.SENSOR_DELAY_NORMAL);
                 Log.i("dxc", "Heart Rate PPG_EGC_TYPE_IC66 opened ret :: " + ret);
 
             } else {
@@ -214,7 +214,7 @@ public class HeartRate extends BaseActivity implements View.OnClickListener, Sen
         Message msg=new Message();
         Bundle bdl=new Bundle();
         msg.what=1;
-        bdl.putString("isweared", ((int)values[4] == 2)?"1":"0");
+        bdl.putString("isweared", String.valueOf(values[4]));
         bdl.putString("PPG",String.valueOf(values[0]));
         msg.setData(bdl);
         mhandler.sendMessage(msg);

diff --git a/app/src/main/java/mobile/miki/KeysTestActivity.java b/app/src/main/java/mobile/miki/KeysTestActivity.java
index d88cdaa..cdfdcbc 100644 (file)
--- a/app/src/main/java/mobile/miki/KeysTestActivity.java
+++ b/app/src/main/java/mobile/miki/KeysTestActivity.java
@@ -131,7 +131,7 @@ public class KeysTestActivity extends BaseActivity implements
             mKeyMapList.addAll(Arrays.asList(keyMapsLieBao));
         } else if (FTUtils.isSugar()) {
             mKeyMapList.addAll(Arrays.asList(keyMapsSUGAR));
-        } else if (FTUtils.isQ3F()||FTUtils.isV20()) {
+        } else if (FTUtils.isL69A()|| FTUtils.isQ3F()||FTUtils.isV20()) {
             mKeyMapList.addAll(Arrays.asList(keyMapsQ3F));
         } else {
             mKeyMapList.addAll(Arrays.asList(keyMapsDefault));

diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java
index 5af4fbc..e944338 100644 (file)
--- a/app/src/main/java/mobile/miki/TouchTest.java
+++ b/app/src/main/java/mobile/miki/TouchTest.java
@@ -74,12 +74,15 @@ public class TouchTest extends BaseActivity {
                Display myDisplay = getWindowManager().getDefaultDisplay();
 
 
-               if (FTUtils.isA9()){
+               if (FTUtils.isA9()) {
                        mDisplayHeight = 170;
                        mDisplayWidth = 170;
 //             }else if(FTUtils.isV20()|| FTUtils.isGT09()) {
 //                     mDisplayHeight = 280;
 //                     mDisplayWidth = 280;
+               }else if (FTUtils.isL69A()){
+                       mDisplayHeight = 240;
+                       mDisplayWidth = 240;
                }else {
                        mDisplayHeight = myDisplay.getHeight();
                        mDisplayWidth = myDisplay.getWidth();

diff --git a/app/src/main/java/mobile/miki/adapter/AgeingListAdapter.java b/app/src/main/java/mobile/miki/adapter/AgeingListAdapter.java
index 92da73c..fc4a728 100644 (file)
--- a/app/src/main/java/mobile/miki/adapter/AgeingListAdapter.java
+++ b/app/src/main/java/mobile/miki/adapter/AgeingListAdapter.java
@@ -42,7 +42,6 @@ public class AgeingListAdapter extends BaseAdapter {
         convertView = mInflater.inflate(R.layout.testmain_adapter, null);\r
         TextView text = (TextView) convertView.findViewById(R.id.text_item);\r
         text.setText(list.get(position));\r
-\r
         return convertView;\r
     }\r
 \r

diff --git a/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java b/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
index e07fb8f..312a340 100644 (file)
--- a/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
+++ b/app/src/main/java/mobile/miki/ageingmode/AgeingBaseActivity.java
@@ -52,6 +52,12 @@ public class AgeingBaseActivity extends Activity {
             ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
             windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
             windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
+        }else if (FTUtils.isL69A()){\r
+            Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
+            Window window = getWindow();\r
+            ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+            windowLayoutParams.width = 240;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+            windowLayoutParams.height = 240;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
         }\r
     }\r
     private void _getIntent() {\r

diff --git a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
index dce9923..8a3caaa 100644 (file)
--- a/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
+++ b/app/src/main/java/mobile/miki/lcd/LcdJudgActivity.java
@@ -49,6 +49,12 @@ public class LcdJudgActivity extends Activity implements android.view.View.OnCli
                        ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
                        windowLayoutParams.width = 170;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
                        windowLayoutParams.height = 170;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
+               }else if (FTUtils.isL69A()){\r
+                       Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
+                       Window window = getWindow();\r
+                       ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+                       windowLayoutParams.width = 240;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+                       windowLayoutParams.height = 240;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\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 c156845..674b2ca 100644 (file)
--- a/app/src/main/java/mobile/miki/util/Config.java
+++ b/app/src/main/java/mobile/miki/util/Config.java
@@ -299,7 +299,7 @@ public class Config {
             testResultList.add("temperature");\r
             testResultList.add("vibrator");\r
             testResultList.add("anti");\r
-        } else if (FTUtils.isL56A()){\r
+        } else if (FTUtils.isL56A()) {\r
             list.add(context.getString(R.string.test_keypad));\r
             list.add(context.getString(R.string.shakeTest));\r
             list.add(context.getString(R.string.heartrate));\r
@@ -307,6 +307,18 @@ public class Config {
             testResultList.add("vibrator");\r
             testResultList.add("heartrate");\r
 \r
+            list.add(context.getString(R.string.temperature));\r
+            testResultList.add("temperature");\r
+        } else if (FTUtils.isL69A()){\r
+            list.add(context.getString(R.string.test_keypad));\r
+            testResultList.add("keys");\r
+            list.add(context.getString(R.string.shakeTest));\r
+            testResultList.add("vibrator");\r
+            list.add(context.getString(R.string.heartrate));\r
+            testResultList.add("heartrate");\r
+            list.remove(context.getString(R.string.camera));\r
+            testResultList.remove("camera");\r
+\r
             list.add(context.getString(R.string.temperature));\r
             testResultList.add("temperature");\r
 \r

diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index d145e20..1cf49ae 100644 (file)
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -308,9 +308,18 @@ public class FTUtils {
         return false;\r
     }\r
     public static boolean isL56A(){\r
-        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A")||SystemProperties.get("persist.sys.id_num","").contains("L69"))\r
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("L56A"))\r
             return true;\r
         else\r
             return false;\r
     }\r
+\r
+    public static boolean isL69A(){\r
+        if(SystemProperties.get("persist.sys.id_num","").contains("L69"))\r
+            return true;\r
+        else\r
+            return false;\r
+    }\r
+\r
+\r
 }\r

diff --git a/app/src/main/res/layout/dig_layout_testlist.xml b/app/src/main/res/layout/dig_layout_testlist.xml
index 53c9d16..55c5989 100644 (file)
--- a/app/src/main/res/layout/dig_layout_testlist.xml
+++ b/app/src/main/res/layout/dig_layout_testlist.xml
@@ -394,7 +394,7 @@
                 android:layout_height="match_parent"\r
                 android:gravity="center"\r
                 android:text="@string/temp_data_get_text"\r
-                android:textSize="15sp" />\r
+                android:textSize="22sp" />\r
         </LinearLayout>\r
 \r
 \r

diff --git a/app/src/main/res/layout/dig_layout_testlist_280.xml b/app/src/main/res/layout/dig_layout_testlist_280.xml
index 73588d0..cfa6a37 100644 (file)
--- a/app/src/main/res/layout/dig_layout_testlist_280.xml
+++ b/app/src/main/res/layout/dig_layout_testlist_280.xml
@@ -394,7 +394,7 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/temp_data_get_text"
-                android:textSize="15sp" />
+                android:textSize="22sp" />
         </LinearLayout>
 
 

diff --git a/app/version_code.properties b/app/version_code.properties
index 37efe85..3d75f41 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jun 17 23:37:37 CST 2021\r
-VERSION_CODE=106\r
+#Sun Jun 20 18:46:12 CST 2021\r
+VERSION_CODE=107\r