Browse Source

修复gradle升级到4.1发布失败异常

main 2.0.1
jiangdongguo 7 years ago
parent
commit
2a54ac54e8
  1. 13
      .idea/libraries/animated_vector_drawable_25_3_1.xml
  2. 17
      .idea/libraries/appcompat_v7_25_3_1.xml
  3. 11
      .idea/libraries/auto_common_0_8.xml
  4. 12
      .idea/libraries/butterknife_8_8_1.xml
  5. 11
      .idea/libraries/butterknife_annotations_8_8_1.xml
  6. 11
      .idea/libraries/butterknife_compiler_8_8_1.xml
  7. 14
      .idea/libraries/common_1_5_20.xml
  8. 13
      .idea/libraries/espresso_core_2_2_2.xml
  9. 13
      .idea/libraries/espresso_idling_resource_2_2_2.xml
  10. 13
      .idea/libraries/exposed_instrumentation_api_publish_0_5.xml
  11. 11
      .idea/libraries/guava_19_0.xml
  12. 11
      .idea/libraries/hamcrest_core_1_3.xml
  13. 9
      .idea/libraries/hamcrest_integration_1_3.xml
  14. 9
      .idea/libraries/hamcrest_library_1_3.xml
  15. 11
      .idea/libraries/javapoet_1_9_0.xml
  16. 9
      .idea/libraries/javawriter_2_1_1.xml
  17. 9
      .idea/libraries/javax_annotation_api_1_2.xml
  18. 9
      .idea/libraries/javax_inject_1.xml
  19. 9
      .idea/libraries/jsr305_2_0_1.xml
  20. 11
      .idea/libraries/junit_4_12.xml
  21. 17
      .idea/libraries/recyclerview_v7_25_3_1.xml
  22. 17
      .idea/libraries/rules_0_5.xml
  23. 17
      .idea/libraries/runner_0_5.xml
  24. 11
      .idea/libraries/support_annotations_25_3_1.xml
  25. 17
      .idea/libraries/support_compat_25_3_1.xml
  26. 17
      .idea/libraries/support_core_ui_25_3_1.xml
  27. 17
      .idea/libraries/support_core_utils_25_3_1.xml
  28. 17
      .idea/libraries/support_fragment_25_3_1.xml
  29. 17
      .idea/libraries/support_media_compat_25_3_1.xml
  30. 10
      .idea/libraries/support_v4_25_3_1.xml
  31. 13
      .idea/libraries/support_vector_drawable_25_3_1.xml
  32. 15
      .idea/misc.xml
  33. 2
      build.gradle
  34. BIN
      build/generated/mockable-android-25.jar
  35. 74
      libusbcamera/libusbcamera.iml
  36. 2
      libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java
  37. 82
      libusbcamera/src/main/java/com/jiangdg/usbcamera/task/SaveYuvImageTask.java
  38. 45
      libusbcamera/src/main/java/com/jiangdg/usbcamera/utils/YUVBean.java
  39. 3
      libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
  40. 5
      local.properties

13
.idea/libraries/animated_vector_drawable_25_3_1.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="animated-vector-drawable-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/17dbf24c311d327da7565d7b9b8c7205d2b3f2c6/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/17dbf24c311d327da7565d7b9b8c7205d2b3f2c6/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/appcompat_v7_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="appcompat-v7-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/0cd2bc27aeb3658d5c6c161585652540e7ba1b97/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/0cd2bc27aeb3658d5c6c161585652540e7ba1b97/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/0cd2bc27aeb3658d5c6c161585652540e7ba1b97/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/0cd2bc27aeb3658d5c6c161585652540e7ba1b97/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/appcompat-v7/25.3.1/appcompat-v7-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/appcompat-v7/25.3.1/appcompat-v7-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/auto_common_0_8.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="auto-common-0.8">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/0.8/c6f7af0e57b9d69d81b05434ef9f3c5610d498c4/auto-common-0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto/auto-common/0.8/24705cafc9997c5eb6ae3270bd6234fdf9912bad/auto-common-0.8-sources.jar!/" />
</SOURCES>
</library>
</component>

12
.idea/libraries/butterknife_8_8_1.xml

@ -1,12 +0,0 @@
<component name="libraryTable">
<library name="butterknife-8.8.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/4a3309b3b2609dd8ff3f3cf5ad5164ad5e2b0f37/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/4a3309b3b2609dd8ff3f3cf5ad5164ad5e2b0f37/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/8.8.1/1de300f9b877d30cea69c2ba84a450549f023ab8/butterknife-8.8.1-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/butterknife_annotations_8_8_1.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="butterknife-annotations-8.8.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/8.8.1/bc373fb6bc7bca3035041b924f158fd2b946ee8d/butterknife-annotations-8.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/8.8.1/4f68b7085132dfeb48a0473bc589fdee8a3de757/butterknife-annotations-8.8.1-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/butterknife_compiler_8_8_1.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="butterknife-compiler-8.8.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-compiler/8.8.1/b2f4505a1babb7b7c11abbbf8ea4c90b18c3aeac/butterknife-compiler-8.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-compiler/8.8.1/97cf58a258bb347d7b8642f3f4996abd0f6adb6/butterknife-compiler-8.8.1-sources.jar!/" />
</SOURCES>
</library>
</component>

14
.idea/libraries/common_1_5_20.xml

@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="common-1.5.20">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/9cb24d48e4f17fd5184a5144bc99bdc343fa2f68/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/9cb24d48e4f17fd5184a5144bc99bdc343fa2f68/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/9cb24d48e4f17fd5184a5144bc99bdc343fa2f68/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/9cb24d48e4f17fd5184a5144bc99bdc343fa2f68/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

13
.idea/libraries/espresso_core_2_2_2.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="espresso-core-2.2.2">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/9c17ca252412141515c4eaf439346c3b03f42eeb/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/9c17ca252412141515c4eaf439346c3b03f42eeb/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-core/2.2.2/espresso-core-2.2.2-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-core/2.2.2/espresso-core-2.2.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/espresso_idling_resource_2_2_2.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="espresso-idling-resource-2.2.2">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/5c86e8eab3d72b00394bf9e598645f884c7c63a5/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/5c86e8eab3d72b00394bf9e598645f884c7c63a5/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/exposed_instrumentation_api_publish_0_5.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="exposed-instrumentation-api-publish-0.5">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/a6ea49c91460d946e46649e01e209781e6cf4b4a/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/a6ea49c91460d946e46649e01e209781e6cf4b4a/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/guava_19_0.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="guava-19.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/19.0/6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9/guava-19.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/19.0/91a4d115400e904f22b03a78deb355e9ea803cd4/guava-19.0-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/hamcrest_core_1_3.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="hamcrest-core-1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
</SOURCES>
</library>
</component>

9
.idea/libraries/hamcrest_integration_1_3.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="hamcrest-integration-1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/hamcrest_library_1_3.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="hamcrest-library-1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

11
.idea/libraries/javapoet_1_9_0.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="javapoet-1.9.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javapoet/1.9.0/ecc5cf9c221d55481163e773b24336db149e51/javapoet-1.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javapoet/1.9.0/71920669c77f467b56c8e3fb594758882b81f551/javapoet-1.9.0-sources.jar!/" />
</SOURCES>
</library>
</component>

9
.idea/libraries/javawriter_2_1_1.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="javawriter-2.1.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/javax_annotation_api_1_2.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="javax.annotation-api-1.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.2/479c1e06db31c432330183f5cae684163f186146/javax.annotation-api-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/javax_inject_1.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="javax.inject-1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/jsr305_2_0_1.xml

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="jsr305-2.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

11
.idea/libraries/junit_4_12.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="junit-4.12">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/recyclerview_v7_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="recyclerview-v7-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/7ea362fec5b11bcc6965bdd4b3893ed136ff8790/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/7ea362fec5b11bcc6965bdd4b3893ed136ff8790/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/7ea362fec5b11bcc6965bdd4b3893ed136ff8790/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/7ea362fec5b11bcc6965bdd4b3893ed136ff8790/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/recyclerview-v7/25.3.1/recyclerview-v7-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/recyclerview-v7/25.3.1/recyclerview-v7-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/rules_0_5.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="rules-0.5">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/9325b8d6b6f5f91ebcaea025e24b3709451d9d19/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/9325b8d6b6f5f91ebcaea025e24b3709451d9d19/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/9325b8d6b6f5f91ebcaea025e24b3709451d9d19/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/9325b8d6b6f5f91ebcaea025e24b3709451d9d19/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/rules/0.5/rules-0.5-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/rules/0.5/rules-0.5-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/runner_0_5.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="runner-0.5">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/4e49e96640bd62fb66d7bd1ea705ff8b23277b30/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/4e49e96640bd62fb66d7bd1ea705ff8b23277b30/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/4e49e96640bd62fb66d7bd1ea705ff8b23277b30/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/4e49e96640bd62fb66d7bd1ea705ff8b23277b30/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/runner/0.5/runner-0.5-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/runner/0.5/runner-0.5-sources.jar!/" />
</SOURCES>
</library>
</component>

11
.idea/libraries/support_annotations_25_3_1.xml

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="support-annotations-25.3.1">
<CLASSES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/support_compat_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="support-compat-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/b024312c4f67b2aaf003c39ec9cce3123bc11887/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/b024312c4f67b2aaf003c39ec9cce3123bc11887/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/b024312c4f67b2aaf003c39ec9cce3123bc11887/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/b024312c4f67b2aaf003c39ec9cce3123bc11887/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-compat/25.3.1/support-compat-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-compat/25.3.1/support-compat-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/support_core_ui_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="support-core-ui-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/43b6e8bc3dbd8ffc00905701a79b232e50db9ad7/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/43b6e8bc3dbd8ffc00905701a79b232e50db9ad7/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/43b6e8bc3dbd8ffc00905701a79b232e50db9ad7/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/43b6e8bc3dbd8ffc00905701a79b232e50db9ad7/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-core-ui/25.3.1/support-core-ui-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-core-ui/25.3.1/support-core-ui-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/support_core_utils_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="support-core-utils-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/42125c933a4a28eeee7ea740389ec2104ec08034/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/42125c933a4a28eeee7ea740389ec2104ec08034/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/42125c933a4a28eeee7ea740389ec2104ec08034/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/42125c933a4a28eeee7ea740389ec2104ec08034/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-core-utils/25.3.1/support-core-utils-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-core-utils/25.3.1/support-core-utils-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/support_fragment_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="support-fragment-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/56b6451666457b89e2ff15b61b1d9b3fe0e16db6/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/56b6451666457b89e2ff15b61b1d9b3fe0e16db6/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/56b6451666457b89e2ff15b61b1d9b3fe0e16db6/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/56b6451666457b89e2ff15b61b1d9b3fe0e16db6/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-fragment/25.3.1/support-fragment-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-fragment/25.3.1/support-fragment-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

17
.idea/libraries/support_media_compat_25_3_1.xml

@ -1,17 +0,0 @@
<component name="libraryTable">
<library name="support-media-compat-25.3.1">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/annotations.zip!/" />
<root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

10
.idea/libraries/support_v4_25_3_1.xml

@ -1,10 +0,0 @@
<component name="libraryTable">
<library name="support-v4-25.3.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/b0b6835705dfb4d5f4237a2b1cc10dbe254eb1af/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/b0b6835705dfb4d5f4237a2b1cc10dbe254eb1af/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

13
.idea/libraries/support_vector_drawable_25_3_1.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="support-vector-drawable-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/7a405513524c444d4aa139ab61911f927325318f/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/7a405513524c444d4aa139ab61911f927325318f/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
<root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

15
.idea/misc.xml

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@ -27,17 +24,7 @@
</value>
</option>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
build.gradle

@ -1,6 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
@ -11,6 +12,7 @@ buildscript {
allprojects {
repositories {
maven { url 'http://raw.github.com/saki4510t/libcommon/master/repository/' }
google()
jcenter()
}
}

BIN
build/generated/mockable-android-25.jar

Binary file not shown.

74
libusbcamera/libusbcamera.iml

@ -28,20 +28,21 @@
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@ -49,6 +50,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@ -77,49 +85,43 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-core-ui-25.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.serenegiant:common-1.5.20" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-core-utils-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-v4-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-fragment-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-media-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
<orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
<orderEntry type="library" name="com.serenegiant:common-1.5.20" level="project" />
<orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
<orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
<orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
<orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
<orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
<orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
<orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
</component>
</module>

2
libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java

@ -34,7 +34,7 @@ public class UVCCameraHelper {
private int previewHeight = 480;
public static int MODE_BRIGHTNESS = UVCCamera.PU_BRIGHTNESS;
public static int MODE_CONTRAST = UVCCamera.PU_CONTRAST;
//0-YUYV,1-MJPEG
//0-YUYV
private static final int PREVIEW_FORMAT = 0;
private static UVCCameraHelper mCameraHelper;

82
libusbcamera/src/main/java/com/jiangdg/usbcamera/task/SaveYuvImageTask.java

@ -1,82 +0,0 @@
package com.jiangdg.usbcamera.task;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.ImageFormat;
import android.graphics.Rect;
import android.graphics.YuvImage;
import android.os.AsyncTask;
import com.jiangdg.usbcamera.utils.YUVBean;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
/**保存YUV格式NV21图片
*
* Created by jiangdongguo on 2017-12-25下午9:13:01
*/
public class SaveYuvImageTask extends AsyncTask<Void, Void, Void> {
private static final String TAG = "SaveYuvImageTask";
private YUVBean yuvBean;
private Context mContext;
//转换结果回调接口
private OnSaveYuvResultListener mListener;
public interface OnSaveYuvResultListener{
void onSaveResult(String savePath);
}
public SaveYuvImageTask(YUVBean yuvBean, OnSaveYuvResultListener mListener) {
this.yuvBean = yuvBean;
this.mListener = mListener;
}
@Override
protected Void doInBackground(Void... params) {
if (yuvBean == null || yuvBean.getWidth() == 0
|| yuvBean.getHeight() == 0 || yuvBean.getYuvData() == null) {
return null;
}
saveYuv2Jpeg(yuvBean.getYuvData(),yuvBean.getWidth(),yuvBean.getHeight());
return null;
}
private void saveYuv2Jpeg(byte[] data,int width,int height){
YuvImage yuvImage = new YuvImage(data, ImageFormat.NV21, width, height, null);
ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length);
boolean result = yuvImage.compressToJpeg(new Rect(0, 0, width, height), 100, bos);
if(result){
byte[] buffer = bos.toByteArray();
Bitmap bmp = BitmapFactory.decodeByteArray(buffer, 0, buffer.length);
bmp.recycle();
String savPath = yuvBean.getPicPath();
File file = new File(savPath);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
bmp.compress(Bitmap.CompressFormat.JPEG, 100, fos);
try {
fos.flush();
fos.close();
//传递转换结果给调用者
mListener.onSaveResult(savPath);
} catch (IOException e) {
e.printStackTrace();
mListener.onSaveResult(null);
}
}
try {
bos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}

45
libusbcamera/src/main/java/com/jiangdg/usbcamera/utils/YUVBean.java

@ -1,45 +0,0 @@
package com.jiangdg.usbcamera.utils;
/** NV21数据类
*
* Created by jiangdongguo on 2018/1/26.
*/
public class YUVBean {
private int width;
private int height;
private byte[] yuvData;
private String picPath;
public int getWidth() {
return width;
}
public void setWidth(int width) {
this.width = width;
}
public int getHeight() {
return height;
}
public void setHeight(int height) {
this.height = height;
}
public byte[] getYuvData() {
return yuvData;
}
public void setYuvData(byte[] yuvData) {
this.yuvData = yuvData;
}
public String getPicPath() {
return picPath;
}
public void setPicPath(String picPath) {
this.picPath = picPath;
}
}

3
libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java

@ -20,9 +20,6 @@ import android.util.Log;
import android.view.Surface;
import android.view.SurfaceHolder;
import com.jiangdg.usbcamera.task.SaveYuvImageTask;
import com.jiangdg.usbcamera.utils.FileUtils;
import com.jiangdg.usbcamera.utils.YUVBean;
import com.serenegiant.usb.IFrameCallback;
import com.serenegiant.usb.Size;
import com.serenegiant.usb.USBMonitor;

5
local.properties

@ -7,6 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Fri Sep 29 23:06:03 CST 2017
ndk.dir=E\:\\Android\\Evironment\\android-sdk-windows\\ndk-bundle
sdk.dir=E\:\\Android\\Evironment\\android-sdk-windows
#Mon Nov 13 09:14:43 CST 2017
sdk.dir=E\:\\Environment\\android-sdk-windows

Loading…
Cancel
Save