提交代码

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 154
-        versionName "1.5.4"
+        versionCode 155
+        versionName "1.5.5"
         multiDexEnabled true
 
 
@@ -25,9 +25,9 @@ android {
 
 
         manifestPlaceholders = [
-                JPUSH_PKGNAME : appId,
+                JPUSH_PKGNAME: appId,
                 JPUSH_APPKEY : "530b223034b92715e0295047", //JPush 上注册的包名对应的 Appkey.
-                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
         ]
 
 //        javaCompileOptions {
@@ -79,7 +79,7 @@ android {
                 if (variant.buildType.name == 'release') {
                     def productVersion = "Rv" + releaseTime() + "V" + defaultConfig.versionName + "_Release_" + productFlavors[0].name + ".apk";
                     outputFileName = productVersion
-                } else if(variant.buildType.name == 'debug'){
+                } else if (variant.buildType.name == 'debug') {
                     def productVersion = "Rv" + releaseTime() + "V" + defaultConfig.versionName + "_Debug_" + productFlavors[0].name + ".apk";
                     outputFileName = productVersion
                 }

plugin_video/src/main/java/com/xxrv/video/activity/PreviewxActivity.java

@@ -159,15 +159,19 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
                     // TODO: 2019/11/14
                     break;
                 case RecorderUtils.SPEED_SUCCESS: // 变速成功
+                    mSpeedBar.isEnabled(false);
                 case RecorderUtils.VOLUME_SUCCESS: // 修改音量成功
+                    mVolumeBar.isEnabled(false);
                 case RecorderUtils.MUSIC_SUCCESS: // 修改音乐成功
                     mVideoView.play(mCurrPath);
                     break;
                 case RecorderUtils.SPEED_FAILURE: // 变速失败
                     showToast(getString(R.string.edit_failed));
+                    mSpeedBar.isEnabled(false);
                     break;
                 case RecorderUtils.VOLUME_FAILURE: // 修改音量失败
                     showToast(getString(R.string.edit_failed));
+                    mVolumeBar.isEnabled(false);
                     break;
                 default:
                     mTvLoding.setText(mHitText + " " + msg.what + "%");
@@ -176,6 +180,8 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
 
             if (msg.what > 100) {
                 showWaitDialog(false, "");
+                mSpeedBar.isEnabled(false);
+                mVolumeBar.isEnabled(false);
             }
             return false;
         }
@@ -409,7 +415,7 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
 
 
     private void loadCover(String inPath, long time) {
-        final int coverCount = 8;
+        final int coverCount = 6;
         loadCover = RecorderUtils.COVER_LOADING;
         // 帧提取器
         String thumb = RecorderUtils.getThumb(inPath);
@@ -476,6 +482,8 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
             return;
         }
 
+        mSpeedBar.isEnabled(true);
+
         showWaitDialog(true, getString(R.string.modified));
         EpEditor.changePTS(mVideoPath, file.getAbsolutePath(), speed, EpEditor.PTS.ALL, new OnEditorListener() {
             @Override
@@ -502,6 +510,7 @@ public class PreviewxActivity extends BaseStatusActivity<VideoPresenter> {
 
     private void changeVolume(int volume) {
         showWaitDialog(true, getString(R.string.modified));
+        mVolumeBar.isEnabled(true);
         mVideoView.stop();
 
         final String out = RecorderUtils.changeFileName(mVideoPath, "vol");

plugin_video/src/main/java/com/xxrv/video/weight/Xspeedbar.java

@@ -8,6 +8,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import android.widget.Toast;
+
 import com.xxrv.video.R;
 
 import java.util.ArrayList;
@@ -25,6 +27,7 @@ public class Xspeedbar extends FrameLayout {
     private int mWidth;
     private int mRectWidth;
     private OnChangeListener mListener;
+    private boolean type;
 
     public Xspeedbar(Context context) {
         this(context, null);
@@ -100,6 +103,10 @@ public class Xspeedbar extends FrameLayout {
             return;
         }
 
+        if (type){
+            return;
+        }
+
         views.get(mCurrt).setTextColor(getResources().getColor(R.color.white));
         views.get(select).setTextColor(getResources().getColor(R.color.colorMain));
         views.get(mCurrt).setBackgroundResource(R.color.transparent);
@@ -118,6 +125,10 @@ public class Xspeedbar extends FrameLayout {
         mRectWidth = mWidth / 5;
     }
 
+    public void isEnabled(boolean type) {
+       this.type = type;
+    }
+
 
     public interface OnChangeListener {
 

plugin_video/src/main/java/com/xxrv/video/weight/Xvolumebar.java

@@ -30,6 +30,7 @@ public class Xvolumebar extends View {
     private OnChangeListener mListener;
     private Paint mProPaint;
     private Paint mBgPaint;
+    private boolean type;
 
     public Xvolumebar(Context context) {
         this(context, null);
@@ -62,7 +63,9 @@ public class Xvolumebar extends View {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-
+        if (type) {
+            return true;
+        }
         switch (event.getAction()) {
             case MotionEvent.ACTION_MOVE:
                 curr = Math.round(event.getX() / mRectWidth * max);
@@ -123,6 +126,10 @@ public class Xvolumebar extends View {
         canvas.drawCircle(movex, centerY, radius, mBgPaint);
     }
 
+    public void isEnabled(boolean type) {
+        this.type = type;
+    }
+
     public interface OnChangeListener {
         void change(int curr);
     }