From: snickersun Date: Tue, 17 Nov 2020 09:06:07 +0000 (+0800) Subject: release V52 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d9ac4fdff369f44d8581f6f9e1012baad3e09ad4;p=factoryMode.git 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 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 --- 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 --- 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.isV20()){ + Display display = getWindowManager().getDefaultDisplay(); // 为获取屏幕宽、高 + Window window = getWindow(); + ViewGroup.LayoutParams windowLayoutParams = window.getAttributes(); // 获取对话框当前的参数值 + windowLayoutParams.width = 280;//(int) (display.getWidth() * 0.7); // 宽度设置为屏幕的0.95 + windowLayoutParams.height = 280;//(int) (display.getHeight() * 0.6); // 高度设置为屏幕的0.6 } } diff --git a/app/src/main/java/mobile/miki/TouchTest.java b/app/src/main/java/mobile/miki/TouchTest.java index 2b507fa..4a725b8 100644 --- 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()){ mDisplayHeight = 170; mDisplayWidth = 170; - }else{ + }else if(FTUtils.isV20()) { + mDisplayHeight = 280; + mDisplayWidth = 280; + }else { mDisplayHeight = myDisplay.getHeight(); mDisplayWidth = myDisplay.getWidth(); } 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 --- 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; import android.app.AlertDialog; import android.content.ComponentName; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; +import android.media.AudioManager; +import android.media.MediaPlayer; import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import java.io.IOException; + import mobile.miki.R; +import mobile.miki.util.Logger; public class ModeSelectActivity extends Activity implements OnClickListener { - Button engineer_button, more_button,unbound_button; + Button engineer_button, more_button,unbound_button,play1k_button; String ACTION_UNBOUND_TERMINAL = "com.enqualcomm.support.ACTION_UNBOUND_TERMINAL"; String ACTION_SMS_CMD = "com.enqualcomm.support.SMSCMD"; String KEY_CMD = "smsCmd"; String SERVICE_PKG_NAME = "com.enqualcomm.support"; String SERVICE_CLS_NAME = "com.enqualcomm.support.CoreService"; + + private MediaPlayer mediaPlayer; + @Override protected void onCreate(Bundle arg0) { super.onCreate(arg0); @@ -27,10 +36,12 @@ public class ModeSelectActivity extends Activity implements OnClickListener { engineer_button = (Button) findViewById(R.id.engineer_button); more_button = (Button) findViewById(R.id.more_button); unbound_button=(Button)findViewById(R.id.unbound_button); + play1k_button=(Button)findViewById(R.id.play1k_button); // unbound_button.setVisibility(View.GONE); engineer_button.setOnClickListener(this); more_button.setOnClickListener(this); unbound_button.setOnClickListener(this); + play1k_button.setOnClickListener(this); } @Override @@ -65,8 +76,35 @@ public class ModeSelectActivity extends Activity implements OnClickListener { } else if (v.getId() == R.id.unbound_button) { unBound(); + }else if (v.getId() == R.id.play1k_button){ + play1k(); } } + + private void play1k(){ + AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); + + Logger.d("maxVolume " + maxVolume); + audioManager.setStreamVolume(AudioManager.STREAM_MUSIC,maxVolume + , AudioManager.FLAG_SHOW_UI); + mediaPlayer = MediaPlayer.create(this, R.raw.sound1k_0db); + + if (mediaPlayer != null) { + mediaPlayer.stop(); + } + try { + //mediaPlayer.setOnCompletionListener(this); + mediaPlayer.setLooping(true); + mediaPlayer.prepare(); + mediaPlayer.start(); + return; + } catch (IllegalStateException e) { + return; + } catch (IOException e) { + } + + } private void startUnBound() { try { @@ -102,4 +140,13 @@ public class ModeSelectActivity extends Activity implements OnClickListener { }); build.show(); } + + @Override + protected void onDestroy() { + if (mediaPlayer != null) { + mediaPlayer.stop(); + mediaPlayer.release(); + } + super.onDestroy(); + } } 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 --- 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 { } return false; } + public static boolean isV20(){ + if(SystemProperties.get("persist.sys.id_num","").equalsIgnoreCase("V20") + || SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("C46")) { + 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/mode_select_activity.xml b/app/src/main/res/layout/mode_select_activity.xml index ac8cd23..e97c29f 100644 --- 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" android:layout_centerHorizontal="true" android:textSize="26sp" - android:layout_marginTop="30dp"/> + android:layout_marginTop="10dp"/>