Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/zl/sdk/OutHelp.java

app/src/main/java/com/zl/sdk/OutHelp.java

@@ -150,7 +150,8 @@ public final class OutHelp implements KPListener {
     private void initReceiver() {
         LogUtil.d(TAG + "初始化：initReceiver");
         TriggerReceiver triggerReceiver = new TriggerReceiver();
-        IntentFilter intentfilter = new IntentFilter("android.net.conn.CONNECTIVITY_CHANGE");
+        IntentFilter intentfilter = new IntentFilter(TriggerReceiver.ACTION_CONNECTIVITY_CHANGE);
+        intentfilter.addAction(TriggerReceiver.ACTION_VOLUME_CHANGED_ACTION);
         intentfilter.addAction(Intent.ACTION_USER_PRESENT);
         intentfilter.addAction(Intent.ACTION_SCREEN_ON);
         intentfilter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
@@ -558,11 +559,17 @@ public final class OutHelp implements KPListener {
     }
 
     public static class TriggerReceiver extends BroadcastReceiver {
+
+        private static final String ACTION_CONNECTIVITY_CHANGE = "android.net.conn.CONNECTIVITY_CHANGE";
+        private static final String ACTION_VOLUME_CHANGED_ACTION = "android.media.VOLUME_CHANGED_ACTION";
+
         @Override
         public void onReceive(Context context, Intent intent) {
+
             if (intent == null) {
                 return;
             }
+            LogUtil.d(TAG + "外展广播 :" + intent.getAction());
 
             if (!DataManager.get().checkOutOpen(context)) {
                 LogUtil.d(TAG + "外展未开启,不接收广播");

app/src/main/java/com/zl/sdk/out/ActionFrom.java

@@ -8,7 +8,9 @@ public enum ActionFrom {
     ACTION_TIMER(4),
     ACTION_BATTERY_CHANGED(5),
     ACTION_PACKAGE_RESTARTED(6),
-    ACTION_OTHER(5);
+
+    ACTION_VOLUME_CHANGED(7),
+    ACTION_OTHER(8);
 
 
     private int action;