Selaa lähdekoodia

<注册界面长按挂断键播放测试音乐来测试喇叭>

weizhengliang 4 vuotta sitten
vanhempi
commit
69c90c030a

+ 1 - 1
app/build.gradle

@@ -25,7 +25,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.3"
+        versionName "1.31"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "BUILD_TIME", getDate()

+ 8 - 0
app/src/main/java/com/wdkl/callingbed2/service/SoundPoolManager.java

@@ -16,6 +16,7 @@ public class SoundPoolManager {
     private SoundPool soundPool;
     private HashMap<Integer, Integer> soundID = new HashMap<Integer, Integer>();
     private boolean isLoaded = false;
+    private boolean inited = false;
 
     public static SoundPoolManager getInstance() {
         if (instance == null) {
@@ -25,6 +26,10 @@ public class SoundPoolManager {
     }
 
     public void init() {
+        if (inited) {
+            return;
+        }
+
         if(Build.VERSION.SDK_INT > 21){
             SoundPool.Builder builder = new SoundPool.Builder();
             //传入音频数量
@@ -44,10 +49,13 @@ public class SoundPoolManager {
         soundID.put(1, soundPool.load(MyApplication.getAppContext(), R.raw.incoming_call, 1));
         //去电
         soundID.put(2, soundPool.load(MyApplication.getAppContext(), R.raw.outgoing_call, 1));
+        //测试
+        soundID.put(3, soundPool.load(MyApplication.getAppContext(), R.raw.audio_test, 1));
         soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
             @Override
             public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
                 isLoaded = true;
+                inited = true;
             }
         });
     }

+ 0 - 1
app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -598,7 +598,6 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         //20190415 waderson  测试
         ScreenManagerUtil.setScreenBrightness(context, 210);
 
-        SoundPoolManager.getInstance().init();
     }
 
     private void setListeners() {

+ 8 - 1
app/src/main/java/com/wdkl/callingbed2/ui/InitActivity.java

@@ -19,6 +19,7 @@ import com.wdkl.callingbed2.base.BaseActivity;
 import com.wdkl.callingbed2.common.Constants;
 import com.wdkl.callingbed2.entity.InitDataEntity;
 import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.service.SoundPoolManager;
 import com.wdkl.callingbed2.util.AutoRebootUtil;
 import com.wdkl.callingbed2.util.CutSerialPortUtil;
 import com.wdkl.callingbed2.util.DateUtil;
@@ -82,6 +83,8 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
         ivLoading.setVisibility(View.VISIBLE);
         animationDrawable = (AnimationDrawable) ivLoading.getBackground();
         animationDrawable.start();
+
+        SoundPoolManager.getInstance().init();
     }
 
     @Override
@@ -405,7 +408,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
 
         // mScreenExtinguishUtil.touchScreen();//===============================息屏
 
-        LogUtil.d("serialPortBedOnclick", "buffer[5]==" + buffer[5]);
+        LogUtil.d("serialPortBedOnclick", "buffer[5]==" + buffer[5] + ", buffer[8]==" + buffer[8]);
         //呼叫护士键短按/长按松开
         if (buffer[5] == 1 | buffer[5] == 2) {
             if (null != Constants.MAC_ADDRESS) {
@@ -421,6 +424,10 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
                 });
             }
         }
+
+        if (buffer[8] == 2) {
+            SoundPoolManager.getInstance().playSound(3);
+        }
     }
 
     @Override

BIN
app/src/main/res/raw/audio_test.mp3