Fix issue 1) not recognizes some usb device, 2) reconnect when ffmpeg encoder error

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
index 16322c6..bf53ce4 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/MainActivity.java
@@ -324,12 +324,13 @@ public class MainActivity extends AppCompatActivity implements SurfaceHolder.Cal
 
     @Override
     public void onEncoderError(String msg){
-        gLogger.error("onEncoderEvent: " + msg);
+        gLogger.error("onEncoderError: " + msg);
+        doUnbindService();
+        doBindService();
     }
 
     @Override
     public void onPublishing(String msg){
-        gLogger.error("onPublishing: " + msg);
         mServiceHealthMonitor.record();
     }
 

diff --git a/app/src/main/java/ai/suanzi/rtmpclient/UsbMonitor.java b/app/src/main/java/ai/suanzi/rtmpclient/UsbMonitor.java
index c862ff0..9076a9b 100644 (file)
--- a/app/src/main/java/ai/suanzi/rtmpclient/UsbMonitor.java
+++ b/app/src/main/java/ai/suanzi/rtmpclient/UsbMonitor.java
@@ -53,7 +53,7 @@ public class UsbMonitor {
     }
 
     private boolean isUvcCamera(UsbDevice device){
-        return (device.getDeviceProtocol() == 1 && device.getProductName().contains("Camera"));
+        return device.getProductName().toLowerCase().contains("camera") || (device.getDeviceProtocol() == 1);
     }
 
     public boolean hasUsbCamera(){