Merge branch 'new_master' into new_for_phone

.gitignore

@@ -15,3 +15,4 @@
 /.idea
 /gradlew
 /gradle
+/app/src/main/assets/Daemon.apk

app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java

@@ -483,16 +483,18 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         LogUtils.i(TAG, "按键KeyCode: " + keyCode);
         switch (keyCode) {
             case KeyEvent.KEYCODE_PAGE_UP:
+            case KeyEvent.KEYCODE_NUMPAD_ADD:
                 audioManager.adjustStreamVolume(
                         AudioManager.STREAM_SYSTEM,
                         AudioManager.ADJUST_RAISE,
-                        AudioManager.FLAG_SHOW_UI);
+                        AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_SHOW_UI);
                 break;
             case KeyEvent.KEYCODE_PAGE_DOWN:
+            case KeyEvent.KEYCODE_NUMPAD_SUBTRACT:
                 audioManager.adjustStreamVolume(
                         AudioManager.STREAM_SYSTEM,
                         AudioManager.ADJUST_LOWER,
-                        AudioManager.FLAG_SHOW_UI);
+                        AudioManager.FLAG_PLAY_SOUND | AudioManager.FLAG_SHOW_UI);
                 break;
         }
         return super.onKeyDown(keyCode, event);