更新demo

Tamsiree · Jul 3, 2018 · 637371d · 637371d
1 parent 47535c3
commit 637371d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle
@@ -17,13 +17,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
+
         }
     }
 }
 
 dependencies {
     implementation project(':RxKit')
     implementation project(':RxUI')
+    implementation project(':RxCamera')
     implementation project(':RxFeature')
     //    implementation project(':RxCamera')
     compileOnly fileTree(include: ['*.jar'], dir: 'libs')
@@ -52,7 +54,7 @@ dependencies {
     implementation 'com.jaredrummler:animated-svg-view:1.0.4'
     implementation 'cc.solart:turbo-recyclerview-helper:1.0.3-beta'
     implementation 'com.afollestad.material-dialogs:core:0.9.3.0'
-    implementation 'com.github.google:cameraview:3eaeac09a7'
+//    implementation 'com.github.google:cameraview:3eaeac09a7'
     implementation 'com.orhanobut:logger:2.2.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     configurations.all {

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityRxExifTool.java
@@ -9,10 +9,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.android.cameraview.CameraView;
+import com.vondear.camera.RxCameraView;
+import com.vondear.camera.tool.RxCameraTool;
 import com.vondear.rxdemo.R;
 import com.vondear.rxtool.RxBarTool;
-import com.vondear.rxtool.RxCameraTool;
 import com.vondear.rxtool.RxFileTool;
 import com.vondear.rxtool.RxLocationTool;
 import com.vondear.rxtool.RxPermissionsTool;
@@ -35,7 +35,7 @@
 public class ActivityRxExifTool extends ActivityBaseLocation {
 
     @BindView(R.id.camera)
-    CameraView mCameraView;
+    RxCameraView mCameraView;
     @BindView(R.id.btn_take_camera)
     Button mBtnTakeCamera;
     @BindView(R.id.tv_gps)
@@ -73,19 +73,19 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initCamera() {
-        mCameraView.addCallback(new CameraView.Callback() {
+        mCameraView.addCallback(new RxCameraView.Callback() {
             @Override
-            public void onCameraOpened(CameraView cameraView) {
+            public void onCameraOpened(RxCameraView cameraView) {
                 super.onCameraOpened(cameraView);
             }
 
             @Override
-            public void onCameraClosed(CameraView cameraView) {
+            public void onCameraClosed(RxCameraView cameraView) {
                 super.onCameraClosed(cameraView);
             }
 
             @Override
-            public void onPictureTaken(CameraView cameraView, final byte[] data) {
+            public void onPictureTaken(RxCameraView cameraView, final byte[] data) {
                 super.onPictureTaken(cameraView, data);
                 initCameraEvent(data);
             }

diff --git a/RxDemo/src/main/res/layout/activity_rx_exif_tool.xml b/RxDemo/src/main/res/layout/activity_rx_exif_tool.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context="com.vondear.rxdemo.activity.ActivityRxExifTool">
 
-    <com.google.android.cameraview.CameraView
+    <com.vondear.camera.RxCameraView
         android:id="@+id/camera"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
 
-    </com.google.android.cameraview.CameraView>
+    </com.vondear.camera.RxCameraView>
 
     <LinearLayout
         android:layout_width="0dp"