donghongyu
a0f1b0feb0
Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_robotaxi-p-app_254_220228_2.5.4
# Conflicts:
# core/function-impl/mogo-core-function-hmi/build.gradle
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/carcorder/CarcorderPreviewView.kt
# core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_carcorder_preview.xml
# libraries/map-usbcamera/build.gradle
# libraries/map-usbcamera/src/main/java/com/mogo/usbcamera/UVCCameraHelper.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/CameraDialog.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/DeviceFilter.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/IFrameCallback.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/Size.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/USBMonitor.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/USBVendorId.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/UVCCameraHandler.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/UVCCameraHandlerMultiSurface.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/IAudioEncoder.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/IVideoEncoder.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaAudioEncoder.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaSurfaceEncoder.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaVideoBufferEncoder.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/RecordParams.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/AACEncodeConsumer.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java
# libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/Mp4MediaMuxer.java
# libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libUVCCamera.so
# libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libjpeg-turbo1500.so
# libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libusb100.so
# libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libuvc.so
# libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libUVCCamera.so
# libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libjpeg-turbo1500.so
# libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libusb100.so
# libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libuvc.so
# libraries/map-usbcamera/src/main/jniLibs/x86/libUVCCamera.so
# libraries/map-usbcamera/src/main/jniLibs/x86/libjpeg-turbo1500.so
# libraries/map-usbcamera/src/main/jniLibs/x86/libusb100.so
# libraries/map-usbcamera/src/main/jniLibs/x86/libuvc.so
# libraries/map-usbcamera/src/main/jniLibs/x86_64/libUVCCamera.so
# libraries/map-usbcamera/src/main/jniLibs/x86_64/libjpeg-turbo1500.so
# libraries/map-usbcamera/src/main/jniLibs/x86_64/libusb100.so
# libraries/map-usbcamera/src/main/jniLibs/x86_64/libuvc.so
2022-03-01 16:12:57 +08:00
..
2022-02-17 20:07:25 +08:00
2022-02-24 17:47:33 +08:00
2022-02-15 14:25:52 +08:00
2022-02-17 20:07:25 +08:00
2022-02-15 14:25:52 +08:00
2022-02-15 14:26:38 +08:00
2022-02-09 15:30:56 +08:00