diff --git a/README.md b/README.md
index 9997594..358d03e 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,24 @@
-# fay-android
-app会常驻手机后台，你可以随时随地保持与Fay数字人的沟通。
+# android 连接器
+android 连接器 app会常驻手机后台，你可以随时随地保持与Fay数字人（https://github.com/TheRamU/Fay）的沟通。
+
+
+
+
+
+
+
+**使用说明**
+
+1、工程使用android studio 开发，可以直接下载apk运行。
+
+2、若需要让app在公网环境保持与Fay的互通，在Fay中配置ngrok.cc 的id，并在服务器地址栏填上分配域名及端口（无须填写协议）。
+
+**更新说明**
+
+2023.12.25:
+
+1、增加重连机制；
+
+2、优化麦克风及蓝牙sco管理机制；
+
+3、增加麦克风开关及服务器地址管理。
\ No newline at end of file
diff --git a/fayConnectorDemo/.gitignore b/fayConnectorDemo/.gitignore
new file mode 100644
index 0000000..aa724b7
--- /dev/null
+++ b/fayConnectorDemo/.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
diff --git a/fayConnectorDemo/.idea/.gitignore b/fayConnectorDemo/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/fayConnectorDemo/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/fayConnectorDemo/.idea/compiler.xml b/fayConnectorDemo/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/fayConnectorDemo/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fayConnectorDemo/.idea/gradle.xml b/fayConnectorDemo/.idea/gradle.xml
new file mode 100644
index 0000000..a2d7c21
--- /dev/null
+++ b/fayConnectorDemo/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fayConnectorDemo/.idea/misc.xml b/fayConnectorDemo/.idea/misc.xml
new file mode 100644
index 0000000..1166903
--- /dev/null
+++ b/fayConnectorDemo/.idea/misc.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fayConnectorDemo/app/.gitignore b/fayConnectorDemo/app/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/fayConnectorDemo/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/fayConnectorDemo/app/build.gradle b/fayConnectorDemo/app/build.gradle
new file mode 100644
index 0000000..5715e7d
--- /dev/null
+++ b/fayConnectorDemo/app/build.gradle
@@ -0,0 +1,39 @@
+plugins {
+ id 'com.android.application'
+}
+
+android {
+ compileSdk 32
+
+ defaultConfig {
+ applicationId "com.yaheen.fayconnectordemo"
+ minSdk 29
+ targetSdk 32
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ 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.3.0'
+ implementation 'com.google.android.material:material:1.4.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+}
\ No newline at end of file
diff --git a/fayConnectorDemo/app/proguard-rules.pro b/fayConnectorDemo/app/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/fayConnectorDemo/app/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
\ No newline at end of file
diff --git a/fayConnectorDemo/app/src/androidTest/java/com/yaheen/fayconnectordemo/ExampleInstrumentedTest.java b/fayConnectorDemo/app/src/androidTest/java/com/yaheen/fayconnectordemo/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..3035a79
--- /dev/null
+++ b/fayConnectorDemo/app/src/androidTest/java/com/yaheen/fayconnectordemo/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.yaheen.fayconnectordemo;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ assertEquals("com.yaheen.fayconnectordemo", appContext.getPackageName());
+ }
+}
\ No newline at end of file
diff --git a/fayConnectorDemo/app/src/main/AndroidManifest.xml b/fayConnectorDemo/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..57506be
--- /dev/null
+++ b/fayConnectorDemo/app/src/main/AndroidManifest.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/FayConnectorService.java b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/FayConnectorService.java
new file mode 100644
index 0000000..960fc9c
--- /dev/null
+++ b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/FayConnectorService.java
@@ -0,0 +1,428 @@
+package com.yaheen.fayconnectordemo;
+
+import android.Manifest;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.os.IBinder;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.snackbar.Snackbar;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.Date;
+
+public class FayConnectorService extends Service {
+ private AudioRecord record;
+ private int recordBufsize = 0;
+ private Socket socket = null;
+ private InputStream in = null;
+ private OutputStream out = null;
+ public static boolean running = false;
+ private File cacheDir = null;
+ private String channelId = null;
+ private PendingIntent pendingIntent = null;
+ private NotificationManagerCompat notificationManager = null;
+ private long totalrece = 0;
+ private long totalsend = 0;
+ private AudioManager mAudioManager = null;
+ private Thread sendThread = null;
+ private Thread receThread = null;
+ private boolean isPlay = false;
+ private boolean isMic = false;
+ private boolean isRecordStarted = false;
+ BroadcastReceiver scoReceiver;
+
+
+ //创建通知
+ private String createNotificationChannel(String channelID, String channelNAME, int level) {
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+ NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+ NotificationChannel channel = new NotificationChannel(channelID, channelNAME, level);
+ manager.createNotificationChannel(channel);
+ return channelID;
+ } else {
+ return null;
+ }
+ }
+
+ // 定义广播的动作字符串
+ public static final String ACTION_CONTROL_MIC = "com.yaheen.fayconnectordemo.ACTION_CONTROL_MIC";
+
+ private final BroadcastReceiver micControlReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ boolean micEnabled = intent.getBooleanExtra("mic", false);
+ if (micEnabled) {
+ isMic = true;
+ } else {
+ isMic = false;
+ }
+ }
+ };
+ private void startMicrophone() {
+ //开启sco
+ mAudioManager.startBluetoothSco();
+ mAudioManager.setMode(mAudioManager.MODE_IN_CALL);
+ mAudioManager.setBluetoothScoOn(true);
+ //开始录音
+ record.startRecording();
+ isRecordStarted = true;
+ Log.d("fay", "麦克风启动成功");
+ }
+
+ private void stopMicrophone() {
+ //关闭sco
+ mAudioManager.stopBluetoothSco();
+ mAudioManager.setBluetoothScoOn(false);
+ mAudioManager.setMode(mAudioManager.MODE_NORMAL);
+ //停止录音
+ record.stop();
+ isRecordStarted = false;
+ Log.d("fay", "麦克风关闭成功");
+ }
+
+
+
+ @Nullable
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ super.onStartCommand(intent, START_FLAG_REDELIVERY, startId);
+ isMic = intent.getBooleanExtra("mic", false);
+ return Service.START_STICKY;
+
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.d("fay", "服务启动");
+
+ running = true;
+ this.cacheDir = getApplicationContext().getFilesDir();//getCacheDir();
+
+ // 注册广播接收器
+ IntentFilter filter = new IntentFilter(ACTION_CONTROL_MIC);
+ registerReceiver(micControlReceiver, filter);
+
+ //蓝牙sco状态监听
+ mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED);
+ scoReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -1);
+ if (AudioManager.SCO_AUDIO_STATE_CONNECTED == state) {
+ Log.d("fay", "蓝牙sco连接成功");
+ }
+ if (AudioManager.SCO_AUDIO_STATE_DISCONNECTED == state) {
+ Log.d("fay", "蓝牙sco关闭");
+ }
+ }
+ };
+ this.registerReceiver(scoReceiver, intentFilter);
+
+ //连接socket
+ String serverAddress = KVUtils.readData(getApplicationContext(), "ServerAddress");
+ if (serverAddress == null || serverAddress.split(":").length != 2) {
+ return;
+ }
+
+ //启动发送线程
+ sendThread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ if (ContextCompat.checkSelfPermission(FayConnectorService.this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
+ if (record == null) {
+ recordBufsize = AudioRecord
+ .getMinBufferSize(16000,
+ AudioFormat.CHANNEL_IN_MONO,
+ AudioFormat.ENCODING_PCM_16BIT);
+ record = new AudioRecord(MediaRecorder.AudioSource.MIC,
+ 16000,
+ AudioFormat.CHANNEL_IN_MONO,
+ AudioFormat.ENCODING_PCM_16BIT,
+ recordBufsize);
+
+ }
+
+ byte[] data = new byte[1024];
+ Log.d("fay", "开始传输音频");
+ while (running) {
+ try {
+ Thread.sleep(10);
+ }catch (Exception e){}
+ if (socket == null || socket.isClosed()){
+ try {
+ Thread.sleep(10000);
+ }catch (Exception ee){
+ }
+ reconnectSocket();
+ }
+ if (isPlay){
+ continue;
+ }
+ if (!isMic){
+ if (isRecordStarted) {
+ stopMicrophone();
+ }
+ continue;
+ }else {
+ if (!isRecordStarted) { //isPlay == true时在上面已经continue
+ startMicrophone();
+ }
+ }
+ int size = record.read(data, 0, 1024);
+ if (size > 0) {
+ try {
+ out.write(data);
+ }catch (Exception e){
+ Log.d("fay", "socket断开10秒后重连");
+ socket = null;
+ continue;
+ }
+ totalsend += data.length / 1024;
+ } else {//麦克风被占用了，等待10秒重新录取
+ stopMicrophone();
+ try {
+ Thread.sleep(10000);
+ } catch (Exception e) {
+ }
+ }
+ }
+ running = false;
+ record.stop();
+ record = null;
+ ((AudioManager) getSystemService(Context.AUDIO_SERVICE)).stopBluetoothSco();
+ try {
+ socket.close();
+ } catch (Exception e) {
+ }
+ socket = null;
+ Log.d("fay", "send线程结束");
+ }
+ }
+
+ }
+ });
+ sendThread.start();
+
+ //启动接收线程
+ receThread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ while (running) {
+ try {
+ if (socket == null || socket.isClosed()) {
+ try {
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ }
+ continue;
+ }
+ byte[] data = new byte[9];
+ byte[] wavhead = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};//文件传输开始标记
+ in.read(data);
+ if (Arrays.equals(wavhead, data)) {
+ Log.d("fay", "开始接收音频文件");
+ String filedata = "";
+ data = new byte[1024];
+ int len = 0;
+ while ((len = in.read(data)) != -1) {
+ byte[] temp = new byte[len];
+ System.arraycopy(data, 0, temp, 0, len);
+ filedata += MainActivity.bytesToHexString(temp);
+ int index = filedata.indexOf("080706050403020100");
+ if (filedata.length() > 9 && index > 0) {//wav文件结束标记
+ filedata = filedata.substring(0, index).replaceAll("F0F1F2F3F4F5F6F7F8", "");
+ File wavFile = new File(cacheDir, String.format("sample-%s.mp3", new Date().getTime() + ""));
+ wavFile.createNewFile();
+ FileOutputStream fos = new FileOutputStream(wavFile);
+ fos.write(MainActivity.decodeHexBytes(filedata.toCharArray()));
+ fos.close();
+ totalrece += filedata.length() / 2 / 1024;
+ Log.d("fay", "mp3文件接收完成:" + wavFile.getAbsolutePath() + "," + filedata.length() / 2);
+ try {
+ MediaPlayer player = new MediaPlayer();
+ player.setDataSource(wavFile.getAbsolutePath());
+ player.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+ @Override
+ public void onPrepared(MediaPlayer mp) {
+ isPlay = true;
+ Log.d("fay", "开始播放");
+ if (isRecordStarted) {
+ stopMicrophone();
+ }
+ try {
+ Thread.sleep(100);
+ } catch (Exception e) {
+
+ }
+ isPlay = true;
+ mp.start();
+ }
+ });
+ player.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+
+ @Override
+ public void onCompletion(MediaPlayer mp) {
+ Log.d("fay", "播放完成");
+ mp.release();
+ if (isRecordStarted) {
+ startMicrophone();
+ }
+ isPlay = false;
+ }
+
+ });
+ player.setVolume(1, 1);
+ player.setLooping(false);
+ player.prepareAsync();
+
+ } catch (IOException e) {
+ Log.e("fay", e.toString());
+ }
+ break;
+ }
+
+ }
+ Thread.sleep(300);
+ }
+ Thread.sleep(300);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ Log.d("fay", "rece线程结束");
+ }
+ });
+ receThread.start();
+
+ //通知栏
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try{
+ while (running) {
+ Thread.sleep(3000);
+ String statusStr = socket == null ? "正在连接" : "已经连接";
+ if (totalsend + totalrece > 2048){
+ inotify("fay connector demo", statusStr + "fay控制器，累计接收/发送：" + String.format("%.2f", (double)totalrece / 1024) + "/" + String.format("%.2f", (double)totalsend / 1024) + "MB");
+ } else {
+ inotify("fay connector demo", statusStr + "fay控制器，累计接收/发送：" + totalrece + "/" + totalsend + "KB");
+ }
+ }
+ inotify("fay connector demo", "已经断开fay控制器");
+ }catch (Exception e){
+ Log.e("fay", e.toString());
+ }finally {
+ FayConnectorService.this.stopSelf();
+ }
+ }
+ }).start();
+
+
+ }
+
+ private void inotify(String title, String content){
+ Intent intent = new Intent(this, MainActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ if (pendingIntent == null){
+ pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+ }
+ if (channelId == null){
+ channelId = createNotificationChannel("my_channel_ID", "my_channel_NAME", NotificationManager.IMPORTANCE_HIGH);
+ }
+ if (notificationManager == null){
+ notificationManager = NotificationManagerCompat.from(this);
+ }
+ NotificationCompat.Builder notification2 = new NotificationCompat.Builder(FayConnectorService.this, channelId)
+ .setContentTitle(title)
+ .setContentText(content)
+ .setContentIntent(pendingIntent)
+ .setSmallIcon(R.drawable.icon)
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setAutoCancel(true);
+ //notificationManager.notify(100, notification2.build());
+ startForeground(100, notification2.build());
+ }
+
+
+ @Override
+ public void onDestroy() {
+ Log.d("fay", "服务关闭");
+ super.onDestroy();
+ running = false;
+ if (isRecordStarted){
+ stopMicrophone();
+ }
+ if (socket != null && !socket.isClosed()) {
+ try {
+ socket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ stopForeground(true);
+ unregisterReceiver(micControlReceiver);
+ unregisterReceiver(scoReceiver);
+ }
+
+ private void reconnectSocket() {
+ if (socket != null && !socket.isClosed()) {
+ try {
+ socket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ String serverAddress = KVUtils.readData(getApplicationContext(), "ServerAddress");
+ if (serverAddress == null || serverAddress.split(":").length != 2) {
+ return;
+ }
+
+ try {
+ socket = new Socket(serverAddress.split(":")[0], Integer.parseInt(serverAddress.split(":")[1]));
+ in = socket.getInputStream();
+ out = socket.getOutputStream();
+ Log.d("fay", "重新连接 fay 控制器成功");
+ } catch (IOException e) {
+ Log.e("fay", "重新连接 fay 控制器失败", e);
+ }
+ }
+
+}
diff --git a/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/KVUtils.java b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/KVUtils.java
new file mode 100644
index 0000000..3b5630f
--- /dev/null
+++ b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/KVUtils.java
@@ -0,0 +1,96 @@
+package com.yaheen.fayconnectordemo;
+
+import android.content.Context;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class KVUtils {
+
+ private static final String FILE_NAME = "kv_data.txt";
+
+ // 写入数据
+ public static void writeData(Context context, String key, String value) {
+ File file = new File(context.getFilesDir(), FILE_NAME);
+ Map dataMap = new HashMap<>();
+
+ // 先读取现有的内容到 Map
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new FileReader(file));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ String[] parts = line.split("=", 2);
+ if (parts.length >= 2) {
+ dataMap.put(parts[0], parts[1]);
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ // 更新或添加新的键值对
+ dataMap.put(key, value);
+
+ // 将更新后的数据写回文件
+ BufferedWriter writer = null;
+ try {
+ writer = new BufferedWriter(new FileWriter(file, false)); // false 以覆盖方式写入
+ for (Map.Entry entry : dataMap.entrySet()) {
+ writer.write(entry.getKey() + "=" + entry.getValue());
+ writer.newLine();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (writer != null) {
+ try {
+ writer.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+
+ // 读取数据
+ public static String readData(Context context, String key) {
+ File file = new File(context.getFilesDir(), FILE_NAME);
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new FileReader(file));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ String[] parts = line.split("=", 2);
+ if (parts.length >= 2 && parts[0].equals(key)) {
+ return parts[1];
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return null;
+ }
+}
diff --git a/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/MainActivity.java b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/MainActivity.java
new file mode 100644
index 0000000..41ef873
--- /dev/null
+++ b/fayConnectorDemo/app/src/main/java/com/yaheen/fayconnectordemo/MainActivity.java
@@ -0,0 +1,178 @@
+package com.yaheen.fayconnectordemo;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import android.Manifest;
+import android.app.ActivityManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.google.android.material.snackbar.Snackbar;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+public class MainActivity extends AppCompatActivity {
+ private TextView tv = null;
+ private EditText serverAddress = null;
+ private Switch microphoneSwitch = null;
+ private boolean running = false;
+ private Intent serviceIntent = null;
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ String serverAddressStr = KVUtils.readData(getApplicationContext(), "ServerAddress");
+ serverAddress.setText(serverAddressStr == null ? "192.168.1.101:10001" : serverAddressStr);
+ microphoneSwitch.setChecked(Boolean.parseBoolean(KVUtils.readData(getApplicationContext(), "IsMic")));
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ tv = this.findViewById(R.id.tv);
+ serverAddress = this.findViewById(R.id.server_address);
+ microphoneSwitch = this.findViewById(R.id.microphone_switch);
+
+ String serverAddressStr = KVUtils.readData(getApplicationContext(), "ServerAddress");
+ serverAddress.setText(serverAddressStr == null ? "192.168.1.101:10001" : serverAddressStr);
+ microphoneSwitch.setChecked(Boolean.parseBoolean(KVUtils.readData(getApplicationContext(), "IsMic")));
+
+ serviceIntent = new Intent(this, FayConnectorService.class);
+
+ //按钮点击
+ tv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("fay","onclick");
+ String address = serverAddress.getText().toString();
+ if (address == null) {
+ return;
+ }
+
+ //记录服务器信息
+ KVUtils.writeData(getApplicationContext(), "ServerAddress", address);
+
+ running = FayConnectorService.running;//isServiceRunning();//同步service的运行状态,不好使！
+ if (!running){//运行
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {//开启
+ if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(MainActivity.this, Manifest.permission.RECORD_AUDIO)) {
+ Log.d("fay", "用户彻底拒绝了权限");
+ return;
+ } else {
+ // 用户未彻底拒绝授予权限
+ ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.RECORD_AUDIO}, 1);
+ }
+ }
+
+ if (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
+ Log.d("fay","权限ok");
+
+ Snackbar.make(view, "正在连接fay控制器", Snackbar.LENGTH_SHORT)
+ .setAction("Action", null).show();
+ serviceIntent.putExtra("mic", microphoneSwitch.isChecked());
+ startForegroundService(serviceIntent);
+ running = true;
+ }
+ }
+ } else{//关闭
+ stopService(serviceIntent);
+ Snackbar.make(view, "已经断开fay控制器", Snackbar.LENGTH_SHORT)
+ .setAction("Action", null).show();
+ running = false;
+ }
+
+ }
+ });
+
+ // 开关状态更改事件
+ microphoneSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ Intent intent = new Intent(FayConnectorService.ACTION_CONTROL_MIC);
+ intent.putExtra("mic", isChecked);
+ sendBroadcast(intent);//通知service麦克风状态改变
+ KVUtils.writeData(getApplicationContext(), "IsMic", isChecked + "");//记录状态
+
+ }
+ });
+ }
+
+
+ public static String bytesToHexString(byte[] data){
+ String result="";
+ for (int i = 0; i < data.length; i++) {
+ result+=Integer.toHexString((data[i] & 0xFF) | 0x100).toUpperCase().substring(1, 3);
+ }
+ return result;
+ }
+
+
+ public static byte[] decodeHexBytes(char[] data) {
+ int len = data.length;
+ if ((len & 0x01) != 0) {
+ throw new RuntimeException("未知的字符");
+ }
+ byte[] out = new byte[len >> 1];
+ for (int i = 0, j = 0; j < len; i++) {
+ int f = toDigit(data[j], j) << 4;
+ j++;
+ f = f | toDigit(data[j], j);
+ j++;
+ out[i] = (byte) (f & 0xFF);
+ }
+ return out;
+ }
+
+ protected static int toDigit(char ch, int index) {
+ int digit = Character.digit(ch, 16);
+ if (digit == -1) {
+ throw new RuntimeException("非法16进制字符 " + ch
+ + " 在索引 " + index);
+ }
+ return digit;
+ }
+
+ private boolean isServiceRunning() {
+ ActivityManager activityManager = (ActivityManager) this.getApplicationContext()
+ .getSystemService(Context.ACTIVITY_SERVICE);
+ ComponentName serviceName = new ComponentName("com.yaheen.fayconnectordemo", ".FayConnectorService");
+ PendingIntent intent = activityManager.getRunningServiceControlPanel(serviceName);
+ if (intent == null){
+ return false;
+ }
+ return true;
+
+ }
+}
\ No newline at end of file
diff --git a/fayConnectorDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/fayConnectorDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/fayConnectorDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+