修改云教练录制问题

camerakit/src/main/java/com/wonderkiln/camerakit/api16/Camera1.java

@@ -55,26 +55,26 @@ public class Camera1 extends CameraImpl {
 
     private static final String TAG = Camera1.class.getSimpleName();
 
-    private static final int FOCUS_AREA_SIZE_DEFAULT             = 300;
-    private static final int FOCUS_METERING_AREA_WEIGHT_DEFAULT  = 1000;
+    private static final int FOCUS_AREA_SIZE_DEFAULT = 300;
+    private static final int FOCUS_METERING_AREA_WEIGHT_DEFAULT = 1000;
     private static final int DELAY_MILLIS_BEFORE_RESETTING_FOCUS = 3000;
 
-    private int                      mCameraId;
-    private Camera                   mCamera;
-    private Camera.Parameters        mCameraParameters;
-    private CameraProperties         mCameraProperties;
-    private Camera.CameraInfo        mCameraInfo;
-    private Size                     mCaptureSize;
-    private Size                     mVideoSize;
-    private Size                     mPreviewSize;
-    private MediaRecorder            mMediaRecorder;
+    private int mCameraId;
+    private Camera mCamera;
+    private Camera.Parameters mCameraParameters;
+    private CameraProperties mCameraProperties;
+    private Camera.CameraInfo mCameraInfo;
+    private Size mCaptureSize;
+    private Size mVideoSize;
+    private Size mPreviewSize;
+    private MediaRecorder mMediaRecorder;
     private Camera.AutoFocusCallback mAutofocusCallback;
-    private boolean                  capturingImage = false;
+    private boolean capturingImage = false;
 
     private boolean mShowingPreview;
     private boolean mRecording;
-    private int     mDisplayOrientation;
-    private int     mDeviceOrientation;
+    private int mDisplayOrientation;
+    private int mDeviceOrientation;
 
     @Facing
     private int mFacing;
@@ -97,8 +97,8 @@ public class Camera1 extends CameraImpl {
 
     private boolean mLockVideoAspectRatio;
 
-    private Handler                 mainHandler = new Handler(Looper.getMainLooper());
-    private Handler                 mHandler    = new Handler();
+    private Handler mainHandler = new Handler(Looper.getMainLooper());
+    private Handler mHandler = new Handler();
     private FrameProcessingRunnable mFrameProcessor;
 
     private float mZoom = 1.f;
@@ -108,7 +108,7 @@ public class Camera1 extends CameraImpl {
     private final Object mCameraLock = new Object();
 
     private File mMediaRecorderOutputFile;
-    private int  orientation;
+    private int orientation;
 
     public Camera1(EventDispatcher eventDispatcher, PreviewImpl preview) {
         super(eventDispatcher, preview);
@@ -526,12 +526,15 @@ public class Camera1 extends CameraImpl {
         synchronized (mCameraLock) {
             if (mRecording) {
                 try {
-                    mMediaRecorder.stop();
+                    if (mMediaRecorder != null) {
+                        mMediaRecorder.stop();
+                    }
                     if (this.mVideoCallback != null) {
                         mVideoCallback.videoCaptured(mMediaRecorderOutputFile);
                         mVideoCallback = null;
                     }
                 } catch (RuntimeException e) {
+                    e.printStackTrace();
                     mMediaRecorderOutputFile.delete();
                 }
 

student/src/main/res/layout/record_video_layout.xml

@@ -9,7 +9,8 @@
     <com.wonderkiln.camerakit.CameraView
         android:id="@+id/camera"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
         android:layout_gravity="center_vertical"
         app:ckFacing="front"
         app:ckFlash="off"

teacher/src/main/res/layout/record_video_layout.xml

@@ -9,7 +9,8 @@
     <com.wonderkiln.camerakit.CameraView
         android:id="@+id/camera"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
         android:layout_gravity="center_vertical"
         app:ckFacing="front"
         app:ckFlash="off"