Android でのハンズフリーに対応する

.github/workflows/build.yml

@@ -192,8 +192,14 @@ jobs:
         if: matrix.name == 'android'
         run: |
           sudo apt-get -y install ninja-build
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+        if: matrix.name == 'android'
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2.0.10
+        uses: android-actions/setup-android@v3.2.0
         if: matrix.name == 'android'
       - run: pip3 install numpy
       - run: python3 run.py --test --package ${{ matrix.name }}

android/Sora/.gitignore

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

android/Sora/Sora/.gitignore

@@ -0,0 +1 @@
+/build

android/Sora/Sora/build.gradle

@@ -0,0 +1,30 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    namespace 'jp.shiguredo.sora'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 21
+
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+}

android/Sora/Sora/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android/Sora/Sora/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+</manifest>

android/Sora/Sora/src/main/java/jp/shiguredo/sora/audiomanager/MainThreadWrapper.java

@@ -0,0 +1,69 @@
+package jp.shiguredo.sora.audiomanager;
+
+import android.content.Context;
+
+class MainThreadWrapper implements SoraAudioManager {
+    private SoraAudioManager soraAudioManager;
+
+    private static class OnChangeRouteObserverWrapper implements OnChangeRouteObserver {
+        OnChangeRouteObserver observer;
+
+        public OnChangeRouteObserverWrapper(OnChangeRouteObserver observer) {
+            this.observer = observer;
+        }
+
+        public void OnChangeRoute() {
+            //メインスレッドでない場合はメインスレッドで再実行
+            if (!SoraThreadUtils.runOnMainThread(this::OnChangeRoute)) {
+                return;
+            }
+
+            if (this.observer == null) {
+                return;
+            }
+            this.observer.OnChangeRoute();
+        }
+    }
+
+    MainThreadWrapper(Context context) {
+        //メインスレッドでない場合はメインスレッドで再実行
+        if (!SoraThreadUtils.runOnMainThread(() -> {
+            this.soraAudioManager = SoraAudioManagerFactory.create(context);
+        })) {
+            return;
+        }
+        this.soraAudioManager = SoraAudioManagerFactory.create(context);
+    }
+
+    @Override
+    public void start(OnChangeRouteObserver observer) {
+        //メインスレッドでない場合はメインスレッドで再実行
+        if (!SoraThreadUtils.runOnMainThread(() -> start(observer))) {
+            return;
+        }
+        soraAudioManager.start(new OnChangeRouteObserverWrapper(observer));
+    }
+
+    @Override
+    public void stop() {
+        //メインスレッドでない場合はメインスレッドで再実行
+        if (!SoraThreadUtils.runOnMainThread(this::stop)) {
+            return;
+        }
+        soraAudioManager.stop();
+    }
+
+    @Override
+    public void setHandsfree(boolean on) {
+        //メインスレッドでない場合はメインスレッドで再実行
+        if (!SoraThreadUtils.runOnMainThread(() -> setHandsfree(on))) {
+            return;
+        }
+        soraAudioManager.setHandsfree(on);
+    }
+
+    @Override
+    public boolean isHandsfree() {
+        return soraAudioManager.isHandsfree();
+    }
+}

android/Sora/Sora/src/main/java/jp/shiguredo/sora/audiomanager/SoraAudioManager.java

@@ -0,0 +1,23 @@
+package jp.shiguredo.sora.audiomanager;
+
+public interface SoraAudioManager {
+    interface OnChangeRouteObserver {
+        // オーディオデバイスの変更を通知するコールバック
+        void OnChangeRoute();
+    }
+
+    /*
+     * オーディオの制御を開始する
+     * Java は destructor がないので start - stop にする
+     */
+    void start(OnChangeRouteObserver observer);
+
+    // オーディオの制御を終了する
+    void stop();
+
+    // ハンズフリーに設定する
+    void setHandsfree(boolean on);
+
+    // ハンズフリーかを確認する
+    boolean isHandsfree();
+}