From 260d16e85d4cb374f01c93557f43b1e57cad7337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E7=BF=94?= <xuexiangjys@163.com>
Date: Wed, 20 Jun 2018 18:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xvideo-demo/build.gradle                               |  6 +++---
 .../com/xuexiang/xvideo/MediaRecorderFragment.java     | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/xvideo-demo/build.gradle b/xvideo-demo/build.gradle
index 88f9273..ddf7188 100644
--- a/xvideo-demo/build.gradle
+++ b/xvideo-demo/build.gradle
@@ -68,8 +68,8 @@ dependencies {
     implementation 'com.github.xuexiangjys.XUtil:xutil-core:1.1.3'
     implementation 'com.github.xuexiangjys.XUtil:xutil-sub:1.1.3'
     //XPage
-    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.1'
-    annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:2.2.1'
+    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.2'
+    annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:2.2.2'
     implementation 'com.github.xuexiangjys.XAOP:xaop-runtime:1.0.1'
     //butterknife的sdk
     implementation 'com.jakewharton:butterknife:8.8.1'
@@ -77,6 +77,6 @@ dependencies {
     implementation project(':xvideo-lib')
 
 //    implementation 'com.github.xuexiangjys:XVideo:1.0.1'
-    implementation 'com.github.xuexiangjys:NiceVieoPlayer:3.0.1'
+    implementation 'com.github.xuexiangjys:NiceVieoPlayer:3.0.2'
     implementation deps.glide
 }
diff --git a/xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java b/xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
index acb7006..4da1794 100644
--- a/xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
+++ b/xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
@@ -406,8 +406,7 @@ public void onBackPressed() {
                                 @Override
                                 public void onClick(DialogInterface dialog,
                                                     int which) {
-                                    mMediaObject.delete();
-                                    onCancel();
+                                    cancelRecord();
                                 }
 
                             })
@@ -416,6 +415,13 @@ public void onClick(DialogInterface dialog,
             return;
         }
 
+        cancelRecord();
+    }
+
+    /**
+     * 取消视频录制
+     */
+    protected void cancelRecord() {
         if (mMediaObject != null) {
             mMediaObject.delete();
         }