release V52

添加1k wave play窗口，测试喇叭功耗用

diff --git a/app/release/FactoryMode_V50_202009171815_release.apk b/app/release/FactoryMode_V52_202011171705_release.apk
similarity index 72%
rename from app/release/FactoryMode_V50_202009171815_release.apk
rename to app/release/FactoryMode_V52_202011171705_release.apk
index 658ac0a..fa7a83e 100644 (file)
Binary files a/app/release/FactoryMode_V50_202009171815_release.apk and b/app/release/FactoryMode_V52_202011171705_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 8a8b49c..c6b1614 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":50,"versionName":"202009171815","enabled":true,"outputFile":"FactoryMode_V50_202009171815_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V50_202009171815_release.apk","properties":{}}]
\ No newline at end of file
+[{"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

diff --git a/app/src/main/java/mobile/miki/BaseActivity.java b/app/src/main/java/mobile/miki/BaseActivity.java
index 45ff67b..8c3e3ba 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(); // 获取对话框当前的参数值\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.isV20()){\r
+            Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高\r
+            Window window = getWindow();\r
+            ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值\r
+            windowLayoutParams.width = 280;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95\r
+            windowLayoutParams.height = 280;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6\r
         }\r
     }\r
     \r

diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java
index 2b507fa..4a725b8 100644 (file)
--- a/app/src/main/java/mobile/miki/TouchTest.java
+++ b/app/src/main/java/mobile/miki/TouchTest.java
@@ -77,7 +77,10 @@ public class TouchTest extends BaseActivity {
                if (FTUtils.isA9()){\r
                        mDisplayHeight = 170;\r
                        mDisplayWidth = 170;\r
-               }else{\r
+               }else if(FTUtils.isV20()) {\r
+                       mDisplayHeight = 280;\r
+                       mDisplayWidth = 280;\r
+               }else {\r
                        mDisplayHeight = myDisplay.getHeight();\r
                        mDisplayWidth = myDisplay.getWidth();\r
                }\r

diff --git a/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java b/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
index c09ff62..027f613 100644 (file)
--- a/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
+++ b/app/src/main/java/mobile/miki/mainui/ModeSelectActivity.java
@@ -3,23 +3,32 @@ package mobile.miki.mainui;
 import android.app.Activity;\r
 import android.app.AlertDialog;\r
 import android.content.ComponentName;\r
+import android.content.Context;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.pm.PackageManager;\r
+import android.media.AudioManager;\r
+import android.media.MediaPlayer;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.widget.Button;\r
 \r
+import java.io.IOException;\r
+\r
 import mobile.miki.R;\r
+import mobile.miki.util.Logger;\r
 \r
 public class ModeSelectActivity extends Activity implements OnClickListener {\r
-       Button engineer_button, more_button,unbound_button;\r
+       Button engineer_button, more_button,unbound_button,play1k_button;\r
        String ACTION_UNBOUND_TERMINAL = "com.enqualcomm.support.ACTION_UNBOUND_TERMINAL";\r
        String ACTION_SMS_CMD = "com.enqualcomm.support.SMSCMD";\r
        String KEY_CMD = "smsCmd";\r
        String SERVICE_PKG_NAME = "com.enqualcomm.support";\r
        String SERVICE_CLS_NAME = "com.enqualcomm.support.CoreService";\r
+\r
+       private MediaPlayer mediaPlayer;\r
+\r
        @Override\r
        protected void onCreate(Bundle arg0) {\r
                super.onCreate(arg0);\r
@@ -27,10 +36,12 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
                engineer_button = (Button) findViewById(R.id.engineer_button);\r
                more_button = (Button) findViewById(R.id.more_button);\r
                unbound_button=(Button)findViewById(R.id.unbound_button);\r
+               play1k_button=(Button)findViewById(R.id.play1k_button);\r
 //             unbound_button.setVisibility(View.GONE);\r
                engineer_button.setOnClickListener(this);\r
                more_button.setOnClickListener(this);\r
                unbound_button.setOnClickListener(this);\r
+               play1k_button.setOnClickListener(this);\r
        }\r
 \r
        @Override\r
@@ -65,8 +76,35 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
                }\r
                else if (v.getId() == R.id.unbound_button) {\r
                        unBound();\r
+               }else if (v.getId() == R.id.play1k_button){\r
+                       play1k();\r
                }\r
        }\r
+\r
+       private void play1k(){\r
+               AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);\r
+               int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);\r
+\r
+               Logger.d("maxVolume " + maxVolume);\r
+               audioManager.setStreamVolume(AudioManager.STREAM_MUSIC,maxVolume\r
+                               , AudioManager.FLAG_SHOW_UI);\r
+               mediaPlayer = MediaPlayer.create(this, R.raw.sound1k_0db);\r
+\r
+               if (mediaPlayer != null) {\r
+                       mediaPlayer.stop();\r
+               }\r
+               try {\r
+                       //mediaPlayer.setOnCompletionListener(this);\r
+                       mediaPlayer.setLooping(true);\r
+                       mediaPlayer.prepare();\r
+                       mediaPlayer.start();\r
+                       return;\r
+               } catch (IllegalStateException e) {\r
+                       return;\r
+               } catch (IOException e) {\r
+               }\r
+\r
+       }\r
        private void startUnBound()\r
        {\r
                try {\r
@@ -102,4 +140,13 @@ public class ModeSelectActivity extends Activity implements OnClickListener {
                });\r
                build.show();\r
        }\r
+\r
+       @Override\r
+       protected void onDestroy() {\r
+               if (mediaPlayer != null) {\r
+                       mediaPlayer.stop();\r
+                       mediaPlayer.release();\r
+               }\r
+               super.onDestroy();\r
+       }\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 d3d0538..ede20a4 100644 (file)
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -205,7 +205,14 @@ public class FTUtils {
         }\r
         return false;\r
     }\r
+    public static boolean isV20(){\r
+        if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("V20")\r
+                || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("C46")) {\r
 \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/mode_select_activity.xml b/app/src/main/res/layout/mode_select_activity.xml
index ac8cd23..e97c29f 100644 (file)
--- a/app/src/main/res/layout/mode_select_activity.xml
+++ b/app/src/main/res/layout/mode_select_activity.xml
@@ -10,7 +10,7 @@
         android:text="@string/engineerMode"\r
         android:layout_centerHorizontal="true"\r
         android:textSize="26sp" \r
-        android:layout_marginTop="30dp"/>\r
+        android:layout_marginTop="10dp"/>\r
 \r
     <Button\r
         android:layout_below="@+id/engineer_button"\r
@@ -20,7 +20,7 @@
         android:text="@string/more"\r
         android:layout_centerHorizontal="true"\r
         android:textSize="26sp" \r
-        android:layout_marginTop="30dp"/>\r
+        android:layout_marginTop="10dp"/>\r
     \r
    <Button\r
         android:layout_below="@+id/more_button"\r
@@ -30,6 +30,14 @@
         android:text="@string/showProtocolInfo"\r
         android:layout_centerHorizontal="true"\r
         android:textSize="26sp" \r
-        android:layout_marginTop="30dp"/>\r
-\r
+        android:layout_marginTop="10dp"/>\r
+    <Button\r
+        android:layout_below="@+id/unbound_button"\r
+        android:id="@+id/play1k_button"\r
+        android:layout_width="wrap_content"\r
+        android:layout_height="wrap_content"\r
+        android:text="Play 1k Wave"\r
+        android:layout_centerHorizontal="true"\r
+        android:textSize="26sp"\r
+        android:layout_marginTop="10dp"/>\r
 </RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/res/raw/sound1k_0db.mp3 b/app/src/main/res/raw/sound1k_0db.mp3
new file mode 100644 (file)
index 0000000..9516b87
Binary files /dev/null and b/app/src/main/res/raw/sound1k_0db.mp3 differ

diff --git a/app/version_code.properties b/app/version_code.properties
index f9f0cec..2d6b1a8 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 17 18:15:02 CST 2020\r
-VERSION_CODE=50\r
+#Tue Nov 17 17:05:05 CST 2020\r
+VERSION_CODE=52\r

diff --git a/factorymode.iml b/factorymode.iml
index e438926..175b830 100644 (file)
--- a/factorymode.iml
+++ b/factorymode.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id="factorymode" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
+<module external.linked.project.id="factorymode" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">\r
   <component name="FacetManager">\r
     <facet type="java-gradle" name="Java-Gradle">\r
       <configuration>\r
@@ -8,10 +8,11 @@
       </configuration>\r
     </facet>\r
   </component>\r
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">\r
+  <component name="NewModuleRootManager" inherit-compiler-output="true">\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />\r
+      <excludeFolder url="file://$MODULE_DIR$/build" />\r
     </content>\r
     <orderEntry type="inheritedJdk" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r

diff --git a/watchlibrary/watchlibrary.iml b/watchlibrary/watchlibrary.iml
deleted file mode 100644 (file)
index ff1a55f..0000000
--- a/watchlibrary/watchlibrary.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<module external.linked.project.id=":watchlibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">\r
-  <component name="FacetManager">\r
-    <facet type="java-gradle" name="Java-Gradle">\r
-      <configuration>\r
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />\r
-        <option name="BUILDABLE" value="false" />\r
-      </configuration>\r
-    </facet>\r
-  </component>\r
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">\r
-    <exclude-output />\r
-    <content url="file://$MODULE_DIR$">\r
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />\r
-    </content>\r
-    <orderEntry type="inheritedJdk" />\r
-    <orderEntry type="sourceFolder" forTests="false" />\r
-  </component>\r
-</module>
\ No newline at end of file