浏览代码

android: make code a bit more readable

master
Saúl Ibarra Corretgé 5 年前
父节点
当前提交
f0dcb51915
共有 1 个文件被更改,包括 14 次插入17 次删除
  1. 14
    17
      android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java

+ 14
- 17
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java 查看文件

18
 
18
 
19
 import android.content.Context;
19
 import android.content.Context;
20
 import android.os.Build;
20
 import android.os.Build;
21
+import android.telecom.CallAudioState;
21
 import androidx.annotation.RequiresApi;
22
 import androidx.annotation.RequiresApi;
22
 
23
 
23
 import java.util.HashSet;
24
 import java.util.HashSet;
52
      */
53
      */
53
     private static int audioDeviceToRouteInt(String audioDevice) {
54
     private static int audioDeviceToRouteInt(String audioDevice) {
54
         if (audioDevice == null) {
55
         if (audioDevice == null) {
55
-            return android.telecom.CallAudioState.ROUTE_EARPIECE;
56
+            return CallAudioState.ROUTE_EARPIECE;
56
         }
57
         }
57
         switch (audioDevice) {
58
         switch (audioDevice) {
58
             case AudioModeModule.DEVICE_BLUETOOTH:
59
             case AudioModeModule.DEVICE_BLUETOOTH:
59
-                return android.telecom.CallAudioState.ROUTE_BLUETOOTH;
60
+                return CallAudioState.ROUTE_BLUETOOTH;
60
             case AudioModeModule.DEVICE_EARPIECE:
61
             case AudioModeModule.DEVICE_EARPIECE:
61
-                return android.telecom.CallAudioState.ROUTE_EARPIECE;
62
+                return CallAudioState.ROUTE_EARPIECE;
62
             case AudioModeModule.DEVICE_HEADPHONES:
63
             case AudioModeModule.DEVICE_HEADPHONES:
63
-                return android.telecom.CallAudioState.ROUTE_WIRED_HEADSET;
64
+                return CallAudioState.ROUTE_WIRED_HEADSET;
64
             case AudioModeModule.DEVICE_SPEAKER:
65
             case AudioModeModule.DEVICE_SPEAKER:
65
-                return android.telecom.CallAudioState.ROUTE_SPEAKER;
66
+                return CallAudioState.ROUTE_SPEAKER;
66
             default:
67
             default:
67
                 JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
68
                 JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
68
-                return android.telecom.CallAudioState.ROUTE_EARPIECE;
69
+                return CallAudioState.ROUTE_EARPIECE;
69
         }
70
         }
70
     }
71
     }
71
 
72
 
78
      */
79
      */
79
     private static Set<String> routesToDeviceNames(int supportedRouteMask) {
80
     private static Set<String> routesToDeviceNames(int supportedRouteMask) {
80
         Set<String> devices = new HashSet<>();
81
         Set<String> devices = new HashSet<>();
81
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_EARPIECE)
82
-                == android.telecom.CallAudioState.ROUTE_EARPIECE) {
82
+        if ((supportedRouteMask & CallAudioState.ROUTE_EARPIECE) == CallAudioState.ROUTE_EARPIECE) {
83
             devices.add(AudioModeModule.DEVICE_EARPIECE);
83
             devices.add(AudioModeModule.DEVICE_EARPIECE);
84
         }
84
         }
85
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_BLUETOOTH)
86
-                == android.telecom.CallAudioState.ROUTE_BLUETOOTH) {
85
+        if ((supportedRouteMask & CallAudioState.ROUTE_BLUETOOTH) == CallAudioState.ROUTE_BLUETOOTH) {
87
             devices.add(AudioModeModule.DEVICE_BLUETOOTH);
86
             devices.add(AudioModeModule.DEVICE_BLUETOOTH);
88
         }
87
         }
89
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_SPEAKER)
90
-                == android.telecom.CallAudioState.ROUTE_SPEAKER) {
88
+        if ((supportedRouteMask & CallAudioState.ROUTE_SPEAKER) == CallAudioState.ROUTE_SPEAKER) {
91
             devices.add(AudioModeModule.DEVICE_SPEAKER);
89
             devices.add(AudioModeModule.DEVICE_SPEAKER);
92
         }
90
         }
93
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_WIRED_HEADSET)
94
-                == android.telecom.CallAudioState.ROUTE_WIRED_HEADSET) {
91
+        if ((supportedRouteMask & CallAudioState.ROUTE_WIRED_HEADSET) == CallAudioState.ROUTE_WIRED_HEADSET) {
95
             devices.add(AudioModeModule.DEVICE_HEADPHONES);
92
             devices.add(AudioModeModule.DEVICE_HEADPHONES);
96
         }
93
         }
97
         return devices;
94
         return devices;
109
     }
106
     }
110
 
107
 
111
     @Override
108
     @Override
112
-    public void onCallAudioStateChange(final android.telecom.CallAudioState callAudioState) {
109
+    public void onCallAudioStateChange(final CallAudioState state) {
113
         module.runInAudioThread(new Runnable() {
110
         module.runInAudioThread(new Runnable() {
114
             @Override
111
             @Override
115
             public void run() {
112
             public void run() {
116
                 boolean audioRouteChanged
113
                 boolean audioRouteChanged
117
-                    = audioDeviceToRouteInt(module.getSelectedDevice()) != callAudioState.getRoute();
118
-                int newSupportedRoutes = callAudioState.getSupportedRouteMask();
114
+                    = audioDeviceToRouteInt(module.getSelectedDevice()) != state.getRoute();
115
+                int newSupportedRoutes = state.getSupportedRouteMask();
119
                 boolean audioDevicesChanged = supportedRouteMask != newSupportedRoutes;
116
                 boolean audioDevicesChanged = supportedRouteMask != newSupportedRoutes;
120
                 if (audioDevicesChanged) {
117
                 if (audioDevicesChanged) {
121
                     supportedRouteMask = newSupportedRoutes;
118
                     supportedRouteMask = newSupportedRoutes;

正在加载...
取消
保存