From d3762b49b037dca8aa8050afb45f12038a96495c Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Sun, 9 Oct 2022 10:14:04 +0800
Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81volume=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 3ee8323..9d6c3b7 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -161,7 +161,7 @@ export default class VideoPlayer extends Component {
     };
   }
 
-  componentDidUpdate = prevProps => {
+  componentDidUpdate = (prevProps) => {
     const {isFullscreen} = this.props;
 
     if (prevProps.isFullscreen !== isFullscreen) {
@@ -881,7 +881,10 @@ export default class VideoPlayer extends Component {
         const position = this.state.volumeOffset + gestureState.dx;
 
         this.setVolumePosition(position);
-        state.volume = this.calculateVolumeFromVolumePosition();
+        const volume = this.calculateVolumeFromVolumePosition();
+        state.volume = volume;
+        typeof this.props.onVolume === 'function' &&
+          this.props.onVolume(volume);
 
         if (state.volume <= 0) {
           state.muted = true;
@@ -1087,7 +1090,7 @@ export default class VideoPlayer extends Component {
         {...this.player.seekPanResponder.panHandlers}>
         <View
           style={styles.seekbar.track}
-          onLayout={event =>
+          onLayout={(event) =>
             (this.player.seekerWidth = event.nativeEvent.layout.width)
           }
           pointerEvents={'none'}>
@@ -1217,7 +1220,7 @@ export default class VideoPlayer extends Component {
         <View style={[styles.player.container, this.styles.containerStyle]}>
           <Video
             {...this.props}
-            ref={videoPlayer => (this.player.ref = videoPlayer)}
+            ref={(videoPlayer) => (this.player.ref = videoPlayer)}
             resizeMode={this.state.resizeMode}
             volume={this.state.volume}
             paused={this.state.paused}

From aeb87ad700ae508d33aff7b847cefe8bada42ed1 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 17 Oct 2022 10:22:06 +0800
Subject: [PATCH 02/17] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=80=8D?=
 =?UTF-8?q?=E9=80=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1005659 --user=刘泽潭 【交互易用】视频文件支持预览 https://www.tapd.cn/23787791/s/1539334
---
 VideoPlayer.js | 135 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 117 insertions(+), 18 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 9d6c3b7..6b96a0a 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, { Component } from 'react';
 import Video from 'react-native-video';
 import {
   TouchableWithoutFeedback,
@@ -33,6 +33,7 @@ export default class VideoPlayer extends Component {
     rate: 1,
     showTimeRemaining: true,
     showHours: false,
+    disableRate: false,
   };
 
   constructor(props) {
@@ -70,6 +71,7 @@ export default class VideoPlayer extends Component {
       currentTime: 0,
       error: false,
       duration: 0,
+      showRatePan: false,
     };
 
     /**
@@ -110,6 +112,7 @@ export default class VideoPlayer extends Component {
       togglePlayPause: this._togglePlayPause.bind(this),
       toggleControls: this._toggleControls.bind(this),
       toggleTimer: this._toggleTimer.bind(this),
+      showOrHideRatePan: this._showOrHideRatePan.bind(this),
     };
 
     /**
@@ -162,7 +165,7 @@ export default class VideoPlayer extends Component {
   }
 
   componentDidUpdate = (prevProps) => {
-    const {isFullscreen} = this.props;
+    const { isFullscreen } = this.props;
 
     if (prevProps.isFullscreen !== isFullscreen) {
       this.setState({
@@ -271,7 +274,7 @@ export default class VideoPlayer extends Component {
    * Either close the video or go to a
    * new page.
    */
-  _onEnd() {}
+  _onEnd() { }
 
   /**
    * Set the error state to true which then
@@ -526,6 +529,16 @@ export default class VideoPlayer extends Component {
     this.setState(state);
   }
 
+  /**
+   * Toggle between showing time remaining or
+   * video duration in the timer control
+   */
+  _showOrHideRatePan() {
+    let state = this.state;
+    state.showRatePan = !state.showRatePan;
+    this.setState(state);
+  }
+
   /**
    * The default 'onBack' function pops the navigator
    * and as such the video player requires a
@@ -1008,13 +1021,13 @@ export default class VideoPlayer extends Component {
     return (
       <View style={styles.volume.container}>
         <View
-          style={[styles.volume.fill, {width: this.state.volumeFillWidth}]}
+          style={[styles.volume.fill, { width: this.state.volumeFillWidth }]}
         />
         <View
-          style={[styles.volume.track, {width: this.state.volumeTrackWidth}]}
+          style={[styles.volume.track, { width: this.state.volumeTrackWidth }]}
         />
         <View
-          style={[styles.volume.handle, {left: this.state.volumePosition}]}
+          style={[styles.volume.handle, { left: this.state.volumePosition }]}
           {...this.player.volumePanResponder.panHandlers}>
           <Image
             style={styles.volume.icon}
@@ -1053,6 +1066,9 @@ export default class VideoPlayer extends Component {
     const playPauseControl = this.props.disablePlayPause
       ? this.renderNullControl()
       : this.renderPlayPause();
+    const rateControl = this.props.disableRate
+      ? this.renderNullControl()
+      : this.renderRate();
 
     return (
       <Animated.View
@@ -1061,18 +1077,23 @@ export default class VideoPlayer extends Component {
           {
             opacity: this.animations.bottomControl.opacity,
             marginBottom: this.animations.bottomControl.marginBottom,
+            // backgroundColor: 'white'
           },
         ]}>
         <ImageBackground
           source={require('./assets/img/bottom-vignette.png')}
-          style={[styles.controls.column]}
+          style={[styles.controls.column, {flex: 1, justifyContent: 'flex-end'}]}
           imageStyle={[styles.controls.vignette]}>
-          {seekbarControl}
           <SafeAreaView
             style={[styles.controls.row, styles.controls.bottomControlGroup]}>
             {playPauseControl}
-            {this.renderTitle()}
+            {seekbarControl}
+            {/* {this.renderTitle()} */}
             {timerControl}
+            <View style={{ width: 70, alignItems: 'center', flexDirection: 'column'}}>
+              {this.state.showRatePan && this.renderRatebar()}
+              {rateControl}
+            </View>
           </SafeAreaView>
         </ImageBackground>
       </Animated.View>
@@ -1106,12 +1127,12 @@ export default class VideoPlayer extends Component {
           />
         </View>
         <View
-          style={[styles.seekbar.handle, {left: this.state.seekerPosition}]}
+          style={[styles.seekbar.handle, { left: this.state.seekerPosition }]}
           pointerEvents={'none'}>
           <View
             style={[
               styles.seekbar.circle,
-              {backgroundColor: this.props.seekColor || '#FFF'},
+              { backgroundColor: this.props.seekColor || '#FFF' },
             ]}
             pointerEvents={'none'}
           />
@@ -1135,6 +1156,41 @@ export default class VideoPlayer extends Component {
     );
   }
 
+  setRate = (v) => {
+    this.setState({
+      showRatePan: false,
+      rate: v,
+    });
+  }
+
+  renderRatebar() {
+    const rateArr = [0.75, 1.0, 1.25, 1.5, 1.75, 2.0];
+    const { rate } = this.state;
+    return (
+      <View
+        style={styles.ratebar.container}
+        collapsable={false}
+        {...this.player.seekPanResponder.panHandlers}>
+
+        {rateArr.map((v) => {
+          return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
+            <Text style={{color: rate === v ? '#ff0000' : '#ffffff'}}>{`倍速${v}x`}</Text>
+          </TouchableWithoutFeedback>)
+        })}
+      </View>
+    );
+  }
+
+  renderRate() {
+    const { rate } = this.state;
+    let label = `倍速${rate}x`;
+    return this.renderControl(
+      <Text style={styles.controls.rateText}>{label}</Text>,
+      this.methods.showOrHideRatePan,
+      { marginLeft: 10 },
+    );
+  }
+
   /**
    * Render our title...if supplied.
    */
@@ -1312,12 +1368,13 @@ const styles = {
       justifyContent: 'space-between',
       height: null,
       width: null,
+      // backgroundColor: 'green'
     },
     vignette: {
       resizeMode: 'stretch',
     },
     control: {
-      padding: 16,
+      padding: 4,
     },
     text: {
       backgroundColor: 'transparent',
@@ -1351,11 +1408,13 @@ const styles = {
     },
     bottomControlGroup: {
       alignSelf: 'stretch',
-      alignItems: 'center',
+      alignItems: 'flex-end',
       justifyContent: 'space-between',
       marginLeft: 12,
       marginRight: 12,
       marginBottom: 0,
+      flex: 1,
+      // backgroundColor: 'blue',
     },
     volume: {
       flexDirection: 'row',
@@ -1365,7 +1424,7 @@ const styles = {
     },
     playPause: {
       position: 'relative',
-      width: 80,
+      width: 30,
       zIndex: 0,
     },
     title: {
@@ -1378,7 +1437,7 @@ const styles = {
       textAlign: 'center',
     },
     timer: {
-      width: 80,
+      // backgroundColor: 'green'
     },
     timerText: {
       backgroundColor: 'transparent',
@@ -1386,6 +1445,12 @@ const styles = {
       fontSize: 11,
       textAlign: 'right',
     },
+    rateText: {
+      backgroundColor: 'transparent',
+      color: '#FFF',
+      fontSize: 11,
+      textAlign: 'right',
+    },
   }),
   volume: StyleSheet.create({
     container: {
@@ -1416,12 +1481,46 @@ const styles = {
       marginLeft: 7,
     },
   }),
+  ratebar: StyleSheet.create({
+    container: {
+      alignSelf: 'stretch',     
+      // backgroundColor: 'blue',
+      maxHeight: 300,
+      marginBottom: 20,
+      justifyContent: 'space-between',
+      flex: 1,
+    },
+    track: {
+      backgroundColor: '#333',
+      height: 1,
+      position: 'relative',
+      top: 14,
+      width: '100%',
+    },
+   
+    handle: {
+      position: 'absolute',
+      marginLeft: -7,
+      height: 28,
+      width: 28,
+    },
+    circle: {
+      borderRadius: 12,
+      position: 'relative',
+      top: 8,
+      left: 8,
+      height: 12,
+      width: 12,
+    },
+  }),
   seekbar: StyleSheet.create({
     container: {
-      alignSelf: 'stretch',
       height: 28,
-      marginLeft: 20,
-      marginRight: 20,
+      marginLeft: 4,
+      marginRight: 4,
+      // flexDirection: 'row',
+      // backgroundColor: 'blue',
+      flex: 1,
     },
     track: {
       backgroundColor: '#333',

From 60095b6c6148804c31fe0660274ca08b47ecd248 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Wed, 19 Oct 2022 16:08:26 +0800
Subject: [PATCH 03/17] feat: ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1005659 --user=刘泽潭 【交互易用】视频文件支持预览 https://www.tapd.cn/23787791/s/1539334
---
 VideoPlayer.js           | 176 +++++++++++++++++++++++++--------------
 assets/img/expand.png    | Bin 1204 -> 0 bytes
 assets/img/expand@2x.png | Bin 1269 -> 0 bytes
 assets/img/expand@3x.png | Bin 1406 -> 1845 bytes
 assets/img/shrink.png    | Bin 1236 -> 0 bytes
 assets/img/shrink@2x.png | Bin 1448 -> 0 bytes
 assets/img/shrink@3x.png | Bin 1631 -> 1802 bytes
 7 files changed, 113 insertions(+), 63 deletions(-)
 delete mode 100644 assets/img/expand.png
 delete mode 100644 assets/img/expand@2x.png
 delete mode 100644 assets/img/shrink.png
 delete mode 100644 assets/img/shrink@2x.png

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 6b96a0a..29f70d2 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -165,8 +165,8 @@ export default class VideoPlayer extends Component {
   }
 
   componentDidUpdate = (prevProps) => {
-    const { isFullscreen } = this.props;
-
+    const { isFullscreen, title } = this.props;
+    this.opts.title = title;
     if (prevProps.isFullscreen !== isFullscreen) {
       this.setState({
         isFullscreen,
@@ -297,6 +297,11 @@ export default class VideoPlayer extends Component {
    * two toggles fullscreen mode.
    */
   _onScreenTouch() {
+    if (this.state.showRatePan) {
+      this.setState({
+        showRatePan: false,
+      });
+    }
     if (this.player.tapActionTimeout) {
       clearTimeout(this.player.tapActionTimeout);
       this.player.tapActionTimeout = 0;
@@ -447,6 +452,7 @@ export default class VideoPlayer extends Component {
     if (this.mounted) {
       let state = this.state;
       state.showControls = false;
+      state.showRatePan = false;
       this.hideControlAnimation();
       typeof this.events.onHideControls === 'function' &&
         this.events.onHideControls();
@@ -524,9 +530,9 @@ export default class VideoPlayer extends Component {
    * video duration in the timer control
    */
   _toggleTimer() {
-    let state = this.state;
-    state.showTimeRemaining = !state.showTimeRemaining;
-    this.setState(state);
+    // let state = this.state;
+    // state.showTimeRemaining = !state.showTimeRemaining;
+    // this.setState(state);
   }
 
   /**
@@ -560,12 +566,13 @@ export default class VideoPlayer extends Component {
    * or duration. Formatted to look as 00:00.
    */
   calculateTime() {
-    if (this.state.showTimeRemaining) {
-      const time = this.state.duration - this.state.currentTime;
-      return `-${this.formatTime(time)}`;
-    }
+    // if (this.state.showTimeRemaining) {
+    const { currentTime, duration } = this.state;
+    // const time = this.state.duration - this.state.currentTime;
+    return `${this.formatTime(currentTime)}/${this.formatTime(duration)}`;
+    // }
 
-    return this.formatTime(this.state.currentTime);
+    // return this.formatTime(this.state.currentTime);
   }
 
   /**
@@ -968,12 +975,10 @@ export default class VideoPlayer extends Component {
     const backControl = this.props.disableBack
       ? this.renderNullControl()
       : this.renderBack();
+    const titleControl = this.renderTitle();
     const volumeControl = this.props.disableVolume
       ? this.renderNullControl()
       : this.renderVolume();
-    const fullscreenControl = this.props.disableFullscreen
-      ? this.renderNullControl()
-      : this.renderFullscreen();
 
     return (
       <Animated.View
@@ -989,10 +994,12 @@ export default class VideoPlayer extends Component {
           style={[styles.controls.column]}
           imageStyle={[styles.controls.vignette]}>
           <SafeAreaView style={styles.controls.topControlGroup}>
+            <View style={{flexDirection: 'row', alignItems: 'center'}}>
             {backControl}
+            {titleControl}
+            </View>
             <View style={styles.controls.pullRight}>
               {volumeControl}
-              {fullscreenControl}
             </View>
           </SafeAreaView>
         </ImageBackground>
@@ -1069,6 +1076,10 @@ export default class VideoPlayer extends Component {
     const rateControl = this.props.disableRate
       ? this.renderNullControl()
       : this.renderRate();
+    const fullscreenControl = this.props.disableFullscreen
+      ? this.renderNullControl()
+      : this.renderFullscreen();
+    const { isFullscreen } = this.state;
 
     return (
       <Animated.View
@@ -1082,21 +1093,43 @@ export default class VideoPlayer extends Component {
         ]}>
         <ImageBackground
           source={require('./assets/img/bottom-vignette.png')}
-          style={[styles.controls.column, {flex: 1, justifyContent: 'flex-end'}]}
+          style={[styles.controls.column, { justifyContent: 'flex-end' }]}
           imageStyle={[styles.controls.vignette]}>
-          <SafeAreaView
-            style={[styles.controls.row, styles.controls.bottomControlGroup]}>
-            {playPauseControl}
-            {seekbarControl}
-            {/* {this.renderTitle()} */}
-            {timerControl}
-            <View style={{ width: 70, alignItems: 'center', flexDirection: 'column'}}>
-              {this.state.showRatePan && this.renderRatebar()}
-              {rateControl}
-            </View>
-          </SafeAreaView>
+          {isFullscreen ? (
+            <SafeAreaView
+              style={[styles.controls.row, styles.controls.bottomControlGroup]}
+            >
+              {playPauseControl}
+              {seekbarControl}
+              {timerControl}
+              <View style={{ flexDirection: 'row', alignItems: 'center', }}>
+                {rateControl}
+                {fullscreenControl}
+              </View>
+            </SafeAreaView>
+          ) : (
+
+            <SafeAreaView
+              style={[styles.controls.bottomControlGroupVertical]}
+            >
+              {this.state.showRatePan && this.renderVerticalRatebar()}
+              <View style={[{ flexDirection: 'row', marginBottom: 12 }]}>
+                {seekbarControl}
+              </View>
+              <View style={[styles.controls.row]}>
+                <View style={{ flexDirection: 'row' }}>
+                  {playPauseControl}
+                  {timerControl}
+                </View>
+                <View style={{ flexDirection: 'row' }}>
+                  {rateControl}
+                  {fullscreenControl}
+                </View>
+              </View>
+            </SafeAreaView>
+          )}
         </ImageBackground>
-      </Animated.View>
+      </Animated.View >
     );
   }
 
@@ -1163,31 +1196,49 @@ export default class VideoPlayer extends Component {
     });
   }
 
-  renderRatebar() {
-    const rateArr = [0.75, 1.0, 1.25, 1.5, 1.75, 2.0];
+  renderVerticalRatebar() {
+    const rateArr = [0.75, 1.0, 1.25, 1.5, 2.0];
     const { rate } = this.state;
+    console.log("renderVerticalRatebar");
     return (
       <View
         style={styles.ratebar.container}
-        collapsable={false}
-        {...this.player.seekPanResponder.panHandlers}>
+        collapsable={false} >
 
         {rateArr.map((v) => {
           return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
-            <Text style={{color: rate === v ? '#ff0000' : '#ffffff'}}>{`倍速${v}x`}</Text>
+            <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', margin: 4 }}>{`${v}倍`}</Text>
           </TouchableWithoutFeedback>)
         })}
       </View>
     );
   }
 
+
+  renderHorRatebar() {
+    const rateArr = [0.75, 1.0, 1.25, 1.5, 2.0];
+    const { rate } = this.state;
+    return (
+      <SafeAreaView
+        style={styles.ratebar.absContainer}
+        collapsable={false} >
+
+        {rateArr.map((v) => {
+          return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
+            <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', margin: 4 }}>{`${v}倍`}</Text>
+          </TouchableWithoutFeedback>)
+        })}
+      </SafeAreaView>
+    );
+  }
+
   renderRate() {
     const { rate } = this.state;
     let label = `倍速${rate}x`;
     return this.renderControl(
       <Text style={styles.controls.rateText}>{label}</Text>,
       this.methods.showOrHideRatePan,
-      { marginLeft: 10 },
+      { marginRight: 12 },
     );
   }
 
@@ -1269,6 +1320,7 @@ export default class VideoPlayer extends Component {
    * Provide all of our options and render the whole component.
    */
   render() {
+    const { isFullscreen, showRatePan } = this.state;
     return (
       <TouchableWithoutFeedback
         onPress={this.events.onScreenTouch}
@@ -1295,6 +1347,8 @@ export default class VideoPlayer extends Component {
           {this.renderLoader()}
           {this.renderTopControls()}
           {this.renderBottomControls()}
+
+          {isFullscreen && showRatePan && this.renderHorRatebar()}
         </View>
       </TouchableWithoutFeedback>
     );
@@ -1408,12 +1462,22 @@ const styles = {
     },
     bottomControlGroup: {
       alignSelf: 'stretch',
-      alignItems: 'flex-end',
+      alignItems: 'center',
       justifyContent: 'space-between',
       marginLeft: 12,
       marginRight: 12,
       marginBottom: 0,
-      flex: 1,
+      // flex: 1,
+      // backgroundColor: 'blue',
+    },
+    bottomControlGroupVertical: {
+      alignSelf: 'stretch',
+      alignItems: 'stretch',
+      // justifyContent: 'space-between',
+      marginLeft: 12,
+      marginRight: 12,
+      marginBottom: 0,
+      flexDirection: 'column',
       // backgroundColor: 'blue',
     },
     volume: {
@@ -1429,7 +1493,7 @@ const styles = {
     },
     title: {
       alignItems: 'center',
-      flex: 0.6,
+      // flex: 0.6,
       flexDirection: 'column',
       padding: 0,
     },
@@ -1483,35 +1547,21 @@ const styles = {
   }),
   ratebar: StyleSheet.create({
     container: {
-      alignSelf: 'stretch',     
-      // backgroundColor: 'blue',
-      maxHeight: 300,
-      marginBottom: 20,
-      justifyContent: 'space-between',
-      flex: 1,
-    },
-    track: {
-      backgroundColor: '#333',
-      height: 1,
-      position: 'relative',
-      top: 14,
-      width: '100%',
+      flexDirection: 'row',
+      backgroundColor: 'rgba(66,66,66,0.9)',
+      borderRadius: 4,
+      marginBottom: 12,
+      marginHorizontal: 8,
+      justifyContent: 'space-around',
     },
-   
-    handle: {
+    absContainer: {
       position: 'absolute',
-      marginLeft: -7,
-      height: 28,
-      width: 28,
-    },
-    circle: {
-      borderRadius: 12,
-      position: 'relative',
-      top: 8,
-      left: 8,
-      height: 12,
-      width: 12,
-    },
+      top: 0,
+      bottom: 0,
+      right: 0,
+      backgroundColor: 'rgba(22,22,22,0.9)',
+      justifyContent: 'space-around',
+    }
   }),
   seekbar: StyleSheet.create({
     container: {
diff --git a/assets/img/expand.png b/assets/img/expand.png
deleted file mode 100644
index ffdf2f3c598833e9ecfdd7736902d9f3cdb067ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1204
zcmaJ>U1%It6rNN}wu_M%rAFz)Wr7;P`MWc-Gk46|q&u5t!Hw%?#T7-pJ98%)llke)
zO?MM4w$+wsW0B%Rq##v9->Tq~s7PxN?VCOn5d|N7s2~W|2Pta2lkCPmgbp)v?>%$A
zbH4L8uhwP`4d(C7a~wBVnYQa}y(4>a{p|g4aOgT)?xE!-osB%&#tGpj-Ka%CCBSo}
zPO!Ut_!~0Laks4cjV5hYAGMq)5OJm>c7m9pId1$wC&tbKp`b<P{IJOX{^=Jy@ZBQ+
zq+XS)af!_P(<=#?U72Y(D+>;C`2&xD@s7m|1cYMH2^PcD>J<4cyB6DLVu=S^Ds-X9
zZ<A_PYoHV*1n6Qxa1<2+1Br@`ps76spsW-mS(6kbD5}M7O$ObIXWkOmv+DL#*B3h#
z`FToXOOo2{w%At1D4Anegd`bC5DH8~NS8y3J3^R__AJ;WbrL_OeiVYtB5p-Xw8%52
z+aUyTwYp<COuLC<DU&)lmK0Hzf*^})OFN}?@;{ATwbRCOOr$zVqou@Q_3%b}V3xa^
zJIWLp8|$&eXGOt_cH}GtB%~F)$g?k^>$?^*iR>VS2+(w(pm~r8NHK|kJwsJn&@esJ
z>e<;1uj;z0%cV(VOcfNRTrf?fB3n@o%0}5J%VrN-2~&zghxB~=%y$=yZi=-^3Bfc<
z8d0>^>w?;RM5A;*ib1KARb3Z#FjmEmA7<hQvr=tGZj;16Lfok&3cyybEq@mthNmJ=
z@l-+69Z%3)kL5s<RRJMPpzb=li7?;AyEo);yH}Zn#S-@@Sy0zJ;y@%28Dc?E3?v}W
zbp)a*1=BDJimn%UiBXiY_PL>*dLq`N*>-0**kNb9NXTX?VZ-xO^6oQi@Ge#C$wudg
z*7eQJ%?~!$e|})-nmn|(d2Ide%g^4v@$vcJq_wrR=T`Ms`d+vO!M_6=Z{6l{`^E;7
zix|9}*H-(kzV_=cBYUpo;IaKLPn`OD&&j@WKR$hH?fZ!@zdn0>n1kFZn$F)zxj!!-
zZV4{`-4px&`s^$FJ#uQ|#k-!i`1{D{z>)jUuJ0W?{n5}u?#$JJPfomk^39Qwk;`3}
z9sWoD@c17;zO-*xKR59?mt4$)GaKh-;*Cp>*GA4)j`rtd?)^938U5+Xw@0)8NTobu
KUpV;uiT?l>Ziesx

diff --git a/assets/img/expand@2x.png b/assets/img/expand@2x.png
deleted file mode 100644
index befd5c49c2e606b9a2928802bda552dbe7a98288..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1269
zcmaJ>eQeZZ81J%yI3=7>f`~Dt7y{;c{kmTJHal@#Z`&o@*p3Ukm`Hf9eY-Wce$aN_
zZ4hOQ%wde6Cd5E68IUL;F%XTxV8S+r0sY4q1?3Mz=3*R3L}HXE1mA9VlRp-kw(t8s
zeSXjLd%n7_qrG)$<1>u}K`hO*sX4q-;j?5hek-kyP2go^kS+vU93v=04-w6}Q$%FO
zg54;Gpx(dZ5^5rd`Vli<2nyLviso1`80y3-mW$B@(X^rBLal@XvWU7(J4yY1_8di;
zdXnlAvuxH)p&qksz(ZRG+Vk2#Ndr2y;YG5kqF@6S3LsgrdTn2+B&k`u3f_leh9YNG
zf>M&2BUQ+DkSWJQq!>%k8Yl3i1Y(>BcsU*=d6r8sY@Fc$%?S#=<1AUdDD2JC4JD_x
zRDI!7lIjTpS7DfPxg0ACF~{r1SO6H7XLz2*8noYU2e3lh{+gNv75SQHx`FA~WM~l<
zoxUJRVWx8-SZ+2uZ`k&$iNYykD$r%P7|U2z7}u<}ALP*gG#1qM^ZhPja>#f3JPp^w
zSW^Sz+&$b;sEFApn>`a31@@|r)@LC*$f!vQe~Ia)t^gUa8sHGk%NkF|4Ia^elMxLK
zNf3&>BpaYuv$GIh5Jf>`Q)wWzBseaekYykMmE$(DQd&y0at)iY{Q%k;s`)mt?<!V(
zC{{^%2nLRqcbwi@7j*PEf#df$E}2S&RTpC-xh@Me(+<V!!&1#ft|HHT73nRWW0AAD
zR?G!>NQM9m&JgIhs2OxzH*gN(tUv<*5ijbRC<91U@%jTfoa<FA!LhhCN(wK=4W#ja
zMl26$j*|cl3|*s9oJ+`(l;A`$K{1#j6SmI-?Nk%t9u2qi!+{U;<ArQIQyw0kDe3f4
zf~c#{sLlDx)!%;TY@A>pC%*a1?}|9r*58fXyB*!8fAHZ2|Ifu!tM8s#8##XPv(otU
zuSFxn(cb;n4%utJ{8f9s;o>EB?}d}gzSC}Ae)-=6yDM#7CzkC#vm=;%>gxTyO{-?w
zh_@rk`wias;gc}8<lg1+>4>=L(W84#G*5E$$hzT!H&;xLcAnoq{$t(eGar4;?L4-8
zrI9!^c;qE@^NK5lpPl;qV+XpvZ#_(Ya{ZSVc7FQC*6r7)CI@Gpdqm#a^F_nH<!9a;
zeFZ+d>%BY4mWFSKo*0Tkbv6B#e0;cbFweFx%8l)s;D3tzJ$Cl1nJ1_JxKSdm+!{K6
n<i<b8R^4WA)m=Qd=xO54wyDDC$h+@^KcY;!UHy3D_C5arUdFZ{

diff --git a/assets/img/expand@3x.png b/assets/img/expand@3x.png
index 426d8eab54399c1d7057757a36da88cb12c67072..900ded5f2f698c1f35324a4d29091829d2c59c38 100644
GIT binary patch
literal 1845
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

literal 1406
zcmaJ>eM}o=7%%b>WWx}}g%KByW0HMvy^nt0(L$jG=|Z6^n00ED<N97Xp}lfFXhAnd
z#g8Q_Y&a8_Y-17qgDg6TgE=Fc!Qht2hb$%=frK%m3F%P7_}KpPJ)pQh$ll!D``&ZU
z?|FXD*PV1$ypo!dnW9puQtf3n7u+?<oty-p%thh=+;+<)Zn;Y2<q#_YRgp)m1&H0p
zdVveDo|eX2z@$>ee<W19Ww)c8;Y6RBRdm#0UjU+2DpO%Nz;g9KMrwgq@SD-Uf4Gh!
zg2#*=(K!f5zzXVwvQ`OHwN_Mft@Rx3K?@5IQ<#AUd_ZQAu&==%WWr{2-7W*qiWo<c
zbrreZjBb!}JDiABlmMbr>oJbhP>6w6lRBC*YV#0^AoVz*#Yq|?H4MD81hTnM=uPtQ
zjLTNK=?lJ@(K=ZUFgP9xh14O9T9mvHOVc<(;S_~I4J_E=m)S7p59Y)y*g%kzgn%rF
zenhdz){0HC8HG$YLhuC~jxEFf;AWy=%J487z)3ZM`+Q1V>)Jut1^%b8t#+`wB>-?2
z2#QS-2kXJ-#K16jPj{p!LN-jLB*3Du4K|T$@&UhWx0zA+MePwh3~dAiN0R`fj2wk&
zc?w`OX#^O{8#J0)%3$Q_+L)bf@uUqdosBk>>PfOhZ#2>x+D4MagrUSxLKtIMyFVzi
zeh$QZ3ySXzto5l_#wr0;7Nu%YY>0J%vrd%7V4WC1tX8G!I<*ej=U_R(uZZ_6rP_$x
z1|*>wcuFPFhpgwC5w_uB;59T)@)}I5<9JN#;b9K6ga)H&7En45r!&$lx{3EZk;9E%
zg%TJ`AV!IybXp#86paCbVlk35&=}2oI1Fe>z0qLMlRBLq#UVvpX`d(BDJFtFsvNh5
z1HNpH7x2TGlHl;jV}BV{s<@Bswxa6rbacA^P<&BZ(%fuXUi#Em|Gb>OckbZY^TQ{O
zoiEMr9~!Leo?3`TUA+TDO_|$U^V$7hXUE^HXg+=?>w}KHq3AEOjrl{3*&X?P6O)Dc
zeeZaY^VttunH$6EA6LJn$uHZH*ZZ0lb2N)<i=XtlqVIJ^bM~Bhb!F+&{nyrdt~HmP
zd}GGlGdg!Lt|pQh-}YzwNaSqBqn$6v$?-eh9<fBO5rLkJq?F#DZk+foBiWfUYASnt
z>Vj$iQ2(>@qlc1~N}9SapF294_<Kv|gK5i==SZyQed}1<<W%;Dl~@6~^Wxd>Pp_|c
zS9`yh>D+a>>Ov;}D69MS;oOPAmE*<B&#dmdN-pp2JvMi@VB#@0KG<!UX|reT8o<MQ
zcFd1o9gcXfWVzb^xVt9i8N!FV?B#ED9WBr563P$UH035HwEq^VAu`j_bCV(?Hp`1I
zeI1{UkeQQrZXzwq_dZ`J|99!kLrdFyswKR9@7zMdmD`uROhU)Ntxr!C&X}DKI@_IN
b*Ap{TE2sJ1inNZOl|Q1rq{8-1aZThuecbo(

diff --git a/assets/img/shrink.png b/assets/img/shrink.png
deleted file mode 100644
index 8979a506aca70f498eaff227ad8abd45753e5069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1236
zcmaJ>PiP}m7@r#VkJ$!d*9s{fh6(6acK*CcCNpnnY`U4$4VW6zfZ3e(W#&yY+s+?n
zrkk{frFBJ85#7Bg=)qn*cv-1<P(*|!m&FAU@#4a+1ok2eQc$QM);CR4_fU42nfKl|
z-|zc=-@n<aF1(tEPsJ&UN|Y~ZHL^ZSo{7^Z$@{y%r8-$sVW|-=x@OoxKBndjw}t7l
zjh1i?BV+B&J9vhoVm+(g2pg5xRNb{X6zOnX+aqX-nwjl-NMFVw-NH+jlV|?;_Irl5
zj6Cy(R1qp(5x1?2>poswU#RQr%Q`fe*;nY9u1XBpI7D>UUU34on`aK}s$?IDd4@hv
z377NCkW`~mrHihQX^G3RI>?B$3^^b{QOTaCMFHe^A<F~Ef{aS;tUw=L4Dse0rdreH
z4}FnSo@s}nr}BKK)8RT9&h?iF7D8SSc~NAE1{<t7A?mVDkRDmkaG?8^7h0}EM;1}b
zT@CXLVLA-K_9~Sl!%lFRD3UV1i##510&m+<TnE}gSi}F*I95BTuX&iS;lN$>by5#A
zJpz;5J=syDNZ6>a`xYq*TG3p6)y7U(*76Mb!WovKLIn#t1eg^SU1YPSh*<~}%pz0H
zWLl!En6Ndnb1WWc<jMgk&*uOr<rD>Gpa#GNK`zN9K^bAoP7oqT$0OfX<a>w}o`_Y8
zK1QMI*IjpI)CJYH8@fT;_2^<Ts=CBU^tlSsEhiFBN2MA@u3_K0ij8^SwdsRgtJX0*
zWHSRzU}o5?q?>HkFi8%wLWYG9VNo)4Nr8wt#2b(0aM-IvLSpeolvGj5nphVhiv<y}
z0LYMqrlGSq3v!Aq=YS;T7@kn%qxN~Mokk+kqtW(gILP5>ys$%N$|u9qyz|TZWbg)M
zZLZ$^wY9guzaOKo;_auYMElghEj-$I@&2iPygzmObpPkgy>#-E^w#wPHGOL=^;NPr
zOYLx%-YG~Rwi~CfCHhSx^_0|0^yIPKv$b)wd1Ya&rdD@eDm*H^`|y0VIoV6x=zp+r
z_vGN-crh+aq<-6OfBIhO_wjUEf9A~152s^0`Q(0V@J->L#LL$v;pMFpKW;WAde=9(
zy%T2*=BH%!-!G}b!|i_g3Nuc9Hq+QEEdEuaP3DK>xd$(NjOJ1w-E0(}+xYrS<?dAT
j?LTYH=i%6{y+OsOSnT!};PV@k(SN2~TF`D?xct_CfhvyX

diff --git a/assets/img/shrink@2x.png b/assets/img/shrink@2x.png
deleted file mode 100644
index 03adefdc27fc4e53c2f9ddafaac666dd23d27f1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1448
zcmaJ>TTB#J7#?=Hh+HIWXsSjS1`;o2b}l=!yEA3E?Lb+|(iK*^p{6=Jd&V7MXV%#P
zR%_~FENZ0IXr)AXps8u>L#y?{2Ta;(XqBX~*p^m}RwaEv+qBw?p{dcH1(y0ioXpHQ
z=b!)k|L?!eeqYN=c}rI;MGz#<(<rpU6@yRtl1%viwRrj#T$UU40i#Wmjb2d)NNq?9
z0@M=`w}4h4hPH1T2bBn7-lzBjM!?(5OIpM#CUvawNED(Gq_R356{SvKph2)jQC-;Y
z=RU_!CFH_hWxb>~>IPw@afc4tcC`4V9i0*v!m6v#$~X@VM1Ucp@ko~%<Kr%D)-DhC
zNil(;vnocX3!5Vq@cK}<rUR6<+Hr}p(Wry7QY=S1nF^F9DLX+j1jXT$jfXcwqVpF9
zz3CyDZxtHmeZi9p3mZn1Cy3tOUTd$-s_9!Gmg5MLCTJRm8hC8GYKU=Mjg_S=2p}fu
zO4Lv^6-`<cgIc%Y!XVSR5F$~pcfqh4n@<!>84(ww1Z5?ONF*88tai+31^?4nR6FM1
z9tA`zh-uxr1nVJ}rNA(E&vuklglza%bOjbg>=HDoI|5Y0Be*d5#TrsVJm&<Y#8CjJ
zof3^RG7WH!asphG9X4B#b~t4&n6k4NzQJK<oDH>Z&e33}sCv88$=Nu8qUuOTy`!FV
zrm!A0W{9c;Qofa>Z%Tldop~mfck4hjG~KUhU8yecg*8Kqg|#T^b|<UOT3K|BSCkYr
zDPEf_)m-EP(3Kt#YS6U^I-6@=S%il}wsA5g+i-@JWSj}fFb522!#Pd_G#ipwCnsX_
z_|Q{1oa<F6fw4qWlz5tDWFXNT4oF(WDayg&oE(yHz)*Il!(pdb){YU7B9UyLr`jnc
zf<2ntE(`}eEQ}XW;Y{gpc#2Oft3Z&nvmT+=AHN=)dGh3mAFaw7`!?5{oyebgSYoo8
zKb@}OPdu(R4QB=4G~LVSyIQnwxpHU7T7GdjJy=}1by@9X(Zq$)ftt!y<J7;2p`5+f
zm-$#rxTqezSW%~cZAaw~&bdbhN%MoI@{3)_{wp_2eFv^4;+DhGAogOvn%~#)RlavM
zN#+c`Jbka=<XanScBYS0N5Xdtp4(VBFfcH(`|`?5H!{ZLn&F&vk224EVd)<nolf+W
znwX8I#%-I|zn4DtS|TveUM$z@!iq!3IA7^Ed&Yji))O1P%PDK!ci;3;0F}$?Zf!ze
z&uyM4dA{NNni0#$))#VyZhzV5U-wzz%IuvPQ`Z>J{hGbTqt$uM7upZ{%+W(9A6K4l
zdZ+1jUO|@Wfu%y<l(_Ooe|yo-=@sX99UW4aTHdakDl7Q0Y{RNIvb)>DMOew{@}G_v
zvD{JjNKoi*o4!-vbAYPDQcv)g4<~MvHr{*}G#*U*yD)I~w}Rm4S|hgPu=Eh+Wb4QL
zpWJD|Gjd!<#;G=Ca@SdNu*!6A=KX8SGmmASIgTa1_x^MF5}80c{yJrzvLI=hNXMR2
VlkDE3Mah4sr@lq_q;B)>{{R+^?Zf~8

diff --git a/assets/img/shrink@3x.png b/assets/img/shrink@3x.png
index ab012dfba619d8b01f28104486085bdabbe6c573..090cb4a847547bb61386241e60d8b2cd8f186087 100644
GIT binary patch
literal 1802
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

literal 1631
zcmaJ>eM}Q)7(YHc70_u7;B35|5)rxHM|<tvLFJ=`SzUoaql`?)_4*#veq3n}DVRAv
zGKL$<RHmD53%U)06N5q)-H3{cMw~{MO{OLjX2R65nV^ebi`x~b^AF?Y?%wx(?)g2>
z@A<k-1$nQ<PM<d&f}mLQa#NwaYUD@vQndVD=i2kByd+9F#Zr+dNL8E<Kv{Ot24J(B
zD+7gqvsYJ~1?dnJ(d4ieOU0JgSzdIjxuA|Z;P%RB2ujZgcsbq)B-jSZ93BI5=lf#_
z?64b<)szLdc#WXkvAo6yifZz#e2tT5>`2BkI6c712HZg6;DFoZ@v{K~GGUjM_dzj+
zz!NHx(|}BpDz+5BM$rdgO07eALPNrOMomx*No!MK5+`&RuEhujB{ZyjYjJq$LS%0~
zyTBHja;JRBCj(M0NnRGis;a8gRT{PEE0eJdgW)7blBleK`l~$>7eGD!g&_+j;OBh~
zujCLtaL^)W6DuVHA~T%~!R@tJo*MS}rxGQn3=42xj8Nm4+Z~K+LfbDDg8ykeSKDu`
z_5!RB_{B;eFV{m@7y`?=d$FUSqRfWP_c`REa4wU`SGs{mGMfyD{6%ed*ja`KIL{CO
zC25{SwE_uHhM)n;33`pjM(SySv4!kB51*^oY3bZ-oYCj%2qH&E(~O2O5kxkw&(Y`L
zbO>wq_$AK6gOG2B?0XWMmHR?0YxDt55`9)tbcMR0pj?zhf4S&|jmBWrDK!NrTR7g~
z35u5lOEnp}3HTiAfj!qJy5WgjvySKR&<h$yAOsDnrFa3=+66fWT3mxN3<pTc&QmnQ
zAyat!GdY~>Raqj(;tf$^NlGgKo@7vflN?GAdIn_#JC6b_p`-PB9YIk#1d}OZ!S;Ek
zokAkHM}ym^!yzA@ju-IAGv$+q=V9x~pCBmQZ8l|D16Rj(Wh{>%l&3d*yQ1P{g<i3>
z;kN>5mX+=7@eF+3;8f@r_nQ@pesfyWVY<nqu5W92H(IqHY5IAeo_5TAD^+>#pYWN@
zM3>vpmwtHWvMp<|TaW)%AL(24>QJR(WMv>R?tOX&#N1!Gw0j`2eR$&#QufKT`yHcn
z#QE~tcIW;t6-OJz;kC!=Mybs0RO|JR2UU+^`ToS%g6{^$w^&aTBNcNpo%7n1X$jL)
zV#E~uj(3|XChBsexFj<v&?;}^-@C7DL()&hHHNzyTa;~jx<9V5-c{E!w{7*|7FpqH
z^xMgq`QFb|&5^A`(3P>$<l*%X^1^Cr)2{T-`p5zuI;GkmD2$mz&8fjnGh@OAM&h@Z
zBD>%-6$y3UnD;CgSyl98xG9`$KAAGqw?FIQ{JXc8Xu|~6(ebullQK$EExR3Gr71gm
zF6;$w9w}(ctP77C-{*XC=HQx)xJ&GZJBL%(hULtO?(F&NdL=gd^ooVG{}v85u<S4~
zr?l_K>H+2Pvd=ric3e{QZPxiqvv*ev_BJdiDxQDH+L3*7<JOMuC)>gw><Le8Ig~S+
z(*7Pl|4y^9sJQyPa>x0&#tW6}+Pghb$!Q6!=xpyEzkP0NRLnc^L(rOp8TYPP58V8s
zbN7y<RY=J%{THceB{Q}qUH)L#mHvyB#@>>}E2V31tjDE4le;<wXaCV<87sZ{Xi-<-
z+*RBbzslfbY*@W;vuE_NIyJHzi|Q>h9_fuvzOi)H#=ciBoapeb-V7E~nRi_p^5BgX
z5!!*o@;r;G`1c=dLwh6rXH~glCrWDbhwJjgqM@B^-B88xTWIi?Z_ddx9mp=N{|{Q`
BOR)d|


From 962d1a08dff9047c11eefa802e6a1fbb4e0c7591 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Fri, 18 Nov 2022 11:31:14 +0800
Subject: [PATCH 04/17] feat: ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1005659 --user=刘泽潭 【交互易用】视频文件支持预览 https://www.tapd.cn/23787791/s/1539334
---
 VideoPlayer.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 29f70d2..534648c 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1093,7 +1093,7 @@ export default class VideoPlayer extends Component {
         ]}>
         <ImageBackground
           source={require('./assets/img/bottom-vignette.png')}
-          style={[styles.controls.column, { justifyContent: 'flex-end' }]}
+          style={[styles.controls.column, { justifyContent: 'flex-end', paddingBottom: 20 }]}
           imageStyle={[styles.controls.vignette]}>
           {isFullscreen ? (
             <SafeAreaView
@@ -1506,13 +1506,13 @@ const styles = {
     timerText: {
       backgroundColor: 'transparent',
       color: '#FFF',
-      fontSize: 11,
+      fontSize: 14,
       textAlign: 'right',
     },
     rateText: {
       backgroundColor: 'transparent',
       color: '#FFF',
-      fontSize: 11,
+      fontSize: 14,
       textAlign: 'right',
     },
   }),

From 51b4ccb9251f6048ef75932c9bdb98f6e5dd1d43 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 21 Nov 2022 20:31:36 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1033361 --user=刘泽潭 【测试环境】【移动端】【视频预览】ios手机，切换倍速时，不太灵敏。 https://www.tapd.cn/23787791/s/1583908
---
 VideoPlayer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 534648c..4cb960a 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1199,7 +1199,7 @@ export default class VideoPlayer extends Component {
   renderVerticalRatebar() {
     const rateArr = [0.75, 1.0, 1.25, 1.5, 2.0];
     const { rate } = this.state;
-    console.log("renderVerticalRatebar");
+
     return (
       <View
         style={styles.ratebar.container}
@@ -1207,7 +1207,7 @@ export default class VideoPlayer extends Component {
 
         {rateArr.map((v) => {
           return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
-            <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', margin: 4 }}>{`${v}倍`}</Text>
+            <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', paddingVertical: 4, paddingHorizontal: 8 }}>{`${v}倍`}</Text>
           </TouchableWithoutFeedback>)
         })}
       </View>

From 977a11cc7d426523030dd46911a8784d700c360b Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 21 Nov 2022 21:15:28 +0800
Subject: [PATCH 06/17] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=A8=AA?=
 =?UTF-8?q?=E5=B1=8F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1033369 --user=刘泽潭 【测试环境】【移动端】【视频预览】横屏播放，播放结束后，点击播放按钮重新播放，播放窗口变小，倍速位置不正确，半屏图标不正确，返回按钮不容易点击。 https://www.tapd.cn/23787791/s/1583920
---
 VideoPlayer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 4cb960a..24d536c 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -53,7 +53,7 @@ export default class VideoPlayer extends Component {
       // Controls
 
       isFullscreen:
-        this.props.isFullScreen || this.props.resizeMode === 'cover' || false,
+        this.props.isFullscreen || this.props.resizeMode === 'cover' || false,
       showTimeRemaining: this.props.showTimeRemaining,
       showHours: this.props.showHours,
       volumeTrackWidth: 0,
@@ -1409,6 +1409,10 @@ const styles = {
     },
   }),
   controls: StyleSheet.create({
+    back: {
+      paddingVertical: 4,
+      paddingHorizontal: 6,
+    },  
     row: {
       flexDirection: 'row',
       alignItems: 'center',

From 5f3aba2591157da325fff2e02dcf32b6d7790a75 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Thu, 24 Nov 2022 14:00:50 +0800
Subject: [PATCH 07/17] fix: ui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1033604 --user=刘泽潭 【测试环境】【移动端】【视频预览】视频播放时，未显示进度条和切换全屏按钮，此时点击进度条区或点右下角，可调节进度，可切换成全屏。 https://www.tapd.cn/23787791/s/1589915
---
 VideoPlayer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 24d536c..18e6d59 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -139,11 +139,11 @@ export default class VideoPlayer extends Component {
 
     this.animations = {
       bottomControl: {
-        marginBottom: new Animated.Value(0),
+        marginBottom: new Animated.Value(-100),
         opacity: new Animated.Value(initialValue),
       },
       topControl: {
-        marginTop: new Animated.Value(0),
+        marginTop: new Animated.Value(-100),
         opacity: new Animated.Value(initialValue),
       },
       video: {

From 609fdafe36082cdf41d613f7db86d780485cfcfb Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 28 Nov 2022 16:09:48 +0800
Subject: [PATCH 08/17] =?UTF-8?q?fix:=20=E6=94=BE=E5=A4=A7=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1033833 --user=刘泽潭 【测试环境】【移动端】【视频预览】全屏时，切换竖屏按钮点击不灵敏。 {#_orginal_url#}
---
 VideoPlayer.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 18e6d59..9163cd3 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1102,7 +1102,7 @@ export default class VideoPlayer extends Component {
               {playPauseControl}
               {seekbarControl}
               {timerControl}
-              <View style={{ flexDirection: 'row', alignItems: 'center', }}>
+              <View style={{ flexDirection: 'row', alignItems: 'center', marginRight: 10 }}>
                 {rateControl}
                 {fullscreenControl}
               </View>
@@ -1238,7 +1238,7 @@ export default class VideoPlayer extends Component {
     return this.renderControl(
       <Text style={styles.controls.rateText}>{label}</Text>,
       this.methods.showOrHideRatePan,
-      { marginRight: 12 },
+      { marginRight: 6 },
     );
   }
 
@@ -1489,6 +1489,7 @@ const styles = {
     },
     fullscreen: {
       flexDirection: 'row',
+      paddingHorizontal: 8,
     },
     playPause: {
       position: 'relative',

From ae9a6d59e95d0443023193f3c93c4c6ba5e27468 Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Tue, 10 Jan 2023 17:45:12 +0800
Subject: [PATCH 09/17] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js                                |  35 ++++++++++++++----
 assets/img/back.png                           | Bin 1173 -> 0 bytes
 assets/img/back@2x.png                        | Bin 1260 -> 0 bytes
 assets/img/back@3x.png                        | Bin 1443 -> 505 bytes
 assets/img/expand@3x.png                      | Bin 1845 -> 1406 bytes
 assets/img/{shrink@3x.png => rotation@3x.png} | Bin
 6 files changed, 28 insertions(+), 7 deletions(-)
 delete mode 100644 assets/img/back.png
 delete mode 100644 assets/img/back@2x.png
 rename assets/img/{shrink@3x.png => rotation@3x.png} (100%)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 9163cd3..b0afebc 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -18,7 +18,7 @@ import padStart from 'lodash/padStart';
 export default class VideoPlayer extends Component {
   static defaultProps = {
     toggleResizeModeOnFullscreen: true,
-    controlAnimationTiming: 500,
+    controlAnimationTiming: 300,
     doubleTapTime: 130,
     playInBackground: false,
     playWhenInactive: false,
@@ -34,6 +34,7 @@ export default class VideoPlayer extends Component {
     showTimeRemaining: true,
     showHours: false,
     disableRate: false,
+    showExpand: false,
   };
 
   constructor(props) {
@@ -96,6 +97,7 @@ export default class VideoPlayer extends Component {
       onExitFullscreen: this.props.onExitFullscreen,
       onShowControls: this.props.onShowControls,
       onHideControls: this.props.onHideControls,
+      onExpand: this.props.onExpand,
       onLoadStart: this._onLoadStart.bind(this),
       onProgress: this._onProgress.bind(this),
       onSeek: this._onSeek.bind(this),
@@ -112,6 +114,7 @@ export default class VideoPlayer extends Component {
       togglePlayPause: this._togglePlayPause.bind(this),
       toggleControls: this._toggleControls.bind(this),
       toggleTimer: this._toggleTimer.bind(this),
+      toggleExpand: this._toggleExpand.bind(this),
       showOrHideRatePan: this._showOrHideRatePan.bind(this),
     };
 
@@ -305,7 +308,7 @@ export default class VideoPlayer extends Component {
     if (this.player.tapActionTimeout) {
       clearTimeout(this.player.tapActionTimeout);
       this.player.tapActionTimeout = 0;
-      this.methods.toggleFullscreen();
+      // this.methods.toggleFullscreen();
       const state = this.state;
       if (state.showControls) {
         this.resetControlTimeout();
@@ -525,6 +528,10 @@ export default class VideoPlayer extends Component {
     this.setState(state);
   }
 
+  _toggleExpand() {
+    typeof this.events.onExpand === 'function' && this.events.onExpand();
+  }
+
   /**
    * Toggle between showing time remaining or
    * video duration in the timer control
@@ -1049,10 +1056,7 @@ export default class VideoPlayer extends Component {
    * Render fullscreen toggle and set icon based on the fullscreen state.
    */
   renderFullscreen() {
-    let source =
-      this.state.isFullscreen === true
-        ? require('./assets/img/shrink.png')
-        : require('./assets/img/expand.png');
+    let source = require('./assets/img/rotation.png');
     return this.renderControl(
       <Image source={source} />,
       this.methods.toggleFullscreen,
@@ -1060,6 +1064,15 @@ export default class VideoPlayer extends Component {
     );
   }
 
+  renderExpand() {
+    let source = require('./assets/img/expand.png');
+    return this.renderControl(
+      <Image source={source} />,
+      this.methods.toggleExpand,
+      styles.controls.fullscreen,
+    );
+  }
+
   /**
    * Render bottom control group and wrap it in a holder
    */
@@ -1079,6 +1092,10 @@ export default class VideoPlayer extends Component {
     const fullscreenControl = this.props.disableFullscreen
       ? this.renderNullControl()
       : this.renderFullscreen();
+    const expandControl = this.props.showExpand
+      ? this.renderExpand()
+      : this.renderNullControl();
+    
     const { isFullscreen } = this.state;
 
     return (
@@ -1124,6 +1141,7 @@ export default class VideoPlayer extends Component {
                 <View style={{ flexDirection: 'row' }}>
                   {rateControl}
                   {fullscreenControl}
+                  {expandControl}
                 </View>
               </View>
             </SafeAreaView>
@@ -1206,7 +1224,10 @@ export default class VideoPlayer extends Component {
         collapsable={false} >
 
         {rateArr.map((v) => {
-          return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
+          return (<TouchableWithoutFeedback onPress={() => {
+            this.setRate(v);
+            typeof this.props.onRate === 'function' && this.props.onRate(v);
+          }}>
             <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', paddingVertical: 4, paddingHorizontal: 8 }}>{`${v}倍`}</Text>
           </TouchableWithoutFeedback>)
         })}
diff --git a/assets/img/back.png b/assets/img/back.png
deleted file mode 100644
index dc94629c5b15504eb78305c0e418437b16880e60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1173
zcmaJ>O>Epm6n2wBN=n*<!l4xsBj-X${r@{AOR`<>HY>5|YP%>~sS=sB$BC8rr}m_~
ziHfx3Lg0XU=z%LjLL3kx;#5%y0XZ}(+(RV}AaQPUi(0AMak3kFh-%rMndkSt_q{)V
zUY)x<GJIi}VVIHftX-q)YxFsL>Q(yI@BcSKm-D39AXg)gv`~VXyc;z!C<kZ}*D!L|
zZtUPGh8f)S>kZPVd}ujQz@touZwE0&GtAU<J4VhjCZLHI{V>Nq`uP_Y_->A!*D7Kq
zF5o49c0IvY*XQca`mzIEcKQP_)wZaC022h-!Ah7~?Hqex*P{DOEU@4}g)HaTLsE@O
z6%?Wb1C7@?M^a>9Kwi?IY^oQ5EK0f{s)7VLNwMgyilBF~)LY_uR?RN;e9=>mT_Pm5
z1fkVx@hydql0}MzP!MH7mN}}yrE4KUZ7xj5`xb1RI*A_>KMFx+5jCS#l4B{;!w`bF
zQaLglroBYblnHGV3lc91L6F6Dpq-K${-4IN+G%|)#zGCJ(Q4w*dU)e~FwNb|9c7A?
zjddmQX;ILM9XYE34oTV0vGfb?`mO~{EILraoNPKWr+PBxpk!hWd4{4iWyADfvv21(
zyl(4-e5sU&MoE*TqHdZ{fwm-F5{;r!6wN-i9Hs<?4(|K*sqY>Zz7%T}5{yWc)T3yn
z-v!mBh(zg96oWz`tGdQ(;N1#x{4f(wWTiTc+{TH26T77(3cx|GE&muEhNnPJ@)S<h
z9FJ37kLExX6%Im#WzBUo6C$>UcVEciVXsmNjV10=vSdy5up>hbi!$OQ$$%X6T!+J|
zq??AJOPZ#$0;MQq?ejuA^+mKtv+dDv(8JMq;gHT$LWd{!Sec}Q_f6T(*V_-9PrBXd
z!86~V-oDb=pE@^qbK%VP<xb<m=3iSA$-uv#%=|I5J>S_K`+ImAJllI`U~XV*boT9Q
zd3ChA@!syx_AL>9wL!qM(;xkKe)I0_fEg=x#}-~0{pstccTVhlF|_+;N4(#9tNQWI
z;2sOS-yaKGA^Wgpe|GNm_fPE2fA`yinTuaeCVzgqKVJVwyFPa7jm@C5KQY=pc}isN
Xep?-x8NT;x_M<2l=j<OYEo?joe^GjU

diff --git a/assets/img/back@2x.png b/assets/img/back@2x.png
deleted file mode 100644
index 6995ade9bba496995927f354901a3749bafd2c07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmaJ>ZD`zN9FGb^>PoljgqyR*tSi%A-jmA<J!f~hYlFM4yPkUPQ*+6aUhL(?B)7YE
zFs+ELVzpM-*q3#P-lsXcp@M9*3<|R_{jed9DNMmP3Mwd~?nQjk-qn353rU{m`RD)p
z|9}6tOb!n8wYF?+K@g->?N@SeZHG_Cy&K^B(TxLfxWvMAAslkeu&Vh0={4LUKvi2C
z0Xd)<V=pX$9t64Pu$3=_h3p<#cWpw8bcmYmK{SH&?5cU1J_<s#2u3U?iT!qV0Yfb#
zi9O3_sjQa*C98kj2Seind3}6Tmkeyz6KGFOh6Zd9YG}<aJAqtFVk>rKxR1mnhOVfD
zqe*O)R3STvrd%JOJdwb4nq^QyB4}P>L@tgp6rCU`j-(}=W@UJD6xz5j=*>4wIj3YA
zzThc|mBP@INwQk45>=LP{Sk<jB$8rChQXl*9*jAmR>PfOd((mf0^PT~&~hC#vZxi^
zN|?kT)721cFPmL6>;#QO!IY6T%_C`oB5ga0YehQ<bKrj(>uLx2F%OVA5V#dzhxIVG
zH^DG>cXkvhLN@YV--1Qa%8IL3Y~X~dlEmN_!mtck5&@-4G{6~AXK>DB04~uYz%^4~
z*&-u|rc`X&Sr4C35~<!yCM^jWo~F|YQIuFoq3PX}kQUOE*u<(%5NeJNn!YXQyMa~i
zh?P@5&_dVGyKcGJ1%o9wbc2%Xp{Z0<b)MkSomow{oJjmwRI1g;72sP3fRXWC8(qn@
zY^}pXFj>i@O%~^P-NZS=ggM|S7MCOqFubAjqNHIBym4C&S9=voU@TsflFaa&33Nun
z0mW!IO$!n(nTC!7j!uYzkf3=!fsv3R8MV)C?bH;(9*wqZ!vPO#;{_ZzQ$8G?S3gF-
zgoAfoReJNat0#{vw4EQ^bfInXeDO?ds{F>ui-$JeI(qXF^YrWc%2QL5OV}^P;pxx*
zu>JPq-CzAk{1gBD&&%`kXAkc9Y1<DckovbRUkuOm<?d$xitT$wjm5vIE<V?}Wv;!m
zZBuE-({r0UtJEH!o7sA$W#*xu7k>X&T^=U;i4!-D-+1a0(%0KQ@yYCLmo@PYs-EKC
zKiH|hHoJUb;@S-NZpVk$-g@{&^3vfA=k7oB%DLdZ%~PLt-7EyHZ)YCxD%Vec|9sa6
zJ0I)}e(kQ@w`J+^_|YTOnZK{pzjpUe*YV=jkLvnjICt#L{g=OU$G08pn6CF7Sl+uh
b^wM3(#ar{SC%cC#(f>zH4=AU055N2$*<G!J

diff --git a/assets/img/back@3x.png b/assets/img/back@3x.png
index 1e48e07e27730146262f496811ee4afef767361b..955174ec18129d384e3c1668ac3f933f7c0dc44c 100644
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$vq?ljRCr$P*|ALnK@f%E_ZlD}BO#&+mw+IH0w6$gKu9ZO6aW#35~zTfhyn<p
zfI%l=$wG(i)9%i^VbAg2`Tp;AFW4nI|FQFa%mDKYNF-op#{jMX900f=`C9t;X_kPQ
zodLLC3;rOv-vz)({Hptq<a-H%{0!I-e@k*%5<grk4X`2pf#i8<yflDEyexoMyd;2U
zyc~dcyc9r0ybM58yaYgGd^kXKd?<iId>DXAd<cM2ygPteyeoiWyc>XOybFMGd~*Qx
z_@)3E;+p|viEjdsDZV;Dw)m<58RM$~nAs_S$B|vyYP+{Jc7Vt3QDs})%w7O2e*J-b
ze9al~1mL7+fZ@>cx!WZ$gm?WBT)p{>2vt6U>r+1)LUn*_%b^KCCWK}HSrD26WI$*R
zppM`Ipp4)Kpo-uMporiOpoS0vpo9<xpn?zzpnwn#5RD)K5Q!iI5QQKG5P={E;Ef;&
z;E5m$;DsO!um$0c<YnoJkvzZ_gd>t~B?u`1{y_L5xmOZj?P#p@A$Gm~=MeS=z$bv~
v(zl-uU{|Oq<I*gFDN$3#&Hz)i{^Qth`fV9d#WA(>00000NkvXXu0mjfVZ76M

literal 1443
zcmaJ>eNYr-7~e`hA~hf}5v^^B36Z_M-MhWJT{+>nz0=DM5GbfoVQ=qUSm1V#y}dZl
zaRQwb8;6uJn+&6~sTnKLX(E(K2F;9^(Qt^0raY;%Xh!}pq{(UQJ>bkg9Cvp2ecxw)
zzvuhe_L8D?i;|WnAqcX_wVo@5YX*Gq#CZ6wno0f*F6o-1QY%wLt%+9wV)H5<fVzBq
z4JZY?x4Cf$<RQpIyQT6<t<wD*D=0o4AI0cGK0jn5NM3%(&kOZHLp`8IlC9WO{{V(c
zUMp5XyY+6r9n?zeTU1ciQdBOq)C-Ik%U_G;g;=P-2Q(fH`5NQ^8?s`vdRe%SiU|yz
zg=qCwY|g1lcL{1&RDjYt6E2Vj3N<r2l4dB2F&Cxuq>0cQ36jA{0}F4X9-Y51XifEs
zY$@lQw*^mDtX9+fEI~9iHR+lRIz_F4T!ta^6hToqMBssDS>r>v9LS7m;6Ol7CBG&q
zG8)y$dz7GN#h|BiA^7}m_Z`J@U_MbWWkiVg6QoX0_<Yg0X3+ty6#VbTJ<);kW<MZG
zK|l$r0<4Fa86(5o-QQ3Y2)$v8RS6b_Z{QRm=mWCm;;b0_qVq~#mazc6z>ol^ECPia
zMGD{yX#qGdnhgdIWwwZnC#L6Ke6!O=kw%-7F*|9JbeJp_#=vkSS*SNV%nrRJ#&yX7
zjh6)wvn@f}^IXS$xvX6Uyr!t-iqa74f|6QAQv$V$AGO<~Ri||{n(gKVNsfwFMN2go
zIR{kfW#DzHiVvO5H7niA57EGgq-em6v>@U}uLyHs)EjVy;Q>W^1=_;!*gW5RR}SZT
z6-r<%{+LTFMH@vRPz(<A6pxdnnZX&+E8xILnk;6siKJ;0MnD&dX#3pNPB9Ve(dhQh
zaKOWz@d7fODHRUS2XC0RBgg|MT%4^uH2%e#<c6~aOU@r@J6D*tac5fu3-37glY!L^
zUYJPuhUl&;Xq@csKD4JZEn(MU`NHDOE4oIp-jWZyuiZYd;Jv43bVI{8A{FDC_E+_t
z-a4ZmCchkRP4g#gFGyI?b|x{H^jT70T&Ml~pO>g7jRj=5CqF0qXxpJ>Bi*i{x=8Ah
z+-q+?yWs57zfCvCkjGwhta(+bsos{Hk<M*h9M04)-O}kSOxYGe#~-~ged+7pS9Pr9
z`Zs>}Ov*^#J8O3L{&M|FPEK1rgq)Q6J6@|zGNz9_{(a>7xpr~TnmO5ebU5(`b~w_S
z5^SCNXW)D=_my?dzv6RTVP-Ot8uD-#tLZ;htXz9Me#^2H>sOw)KDsfJuxMyaX87H%
z;zJW>i0#SG_c{lugISHc!o^PRN`6<633n{b3_rYifA-Go)j#fe-BcOhlRC^Ch{HGB
zUf73Z?VGUO$}ijNoNj*qux&JOq-Ct4>f&fc-Sl$q^HZfg8Q-q<Outn1FMhS^=ZmA4
z^Xzqln?CvU)UVD*z`oOtn@^pj8{@`o#MH;_$LSq=4;FEkT~FM4;l$R8fd>~N&DHVN
TtK)K3^tb796miE2tK0qqKD`1v

diff --git a/assets/img/expand@3x.png b/assets/img/expand@3x.png
index 900ded5f2f698c1f35324a4d29091829d2c59c38..426d8eab54399c1d7057757a36da88cb12c67072 100644
GIT binary patch
literal 1406
zcmaJ>eM}o=7%%b>WWx}}g%KByW0HMvy^nt0(L$jG=|Z6^n00ED<N97Xp}lfFXhAnd
z#g8Q_Y&a8_Y-17qgDg6TgE=Fc!Qht2hb$%=frK%m3F%P7_}KpPJ)pQh$ll!D``&ZU
z?|FXD*PV1$ypo!dnW9puQtf3n7u+?<oty-p%thh=+;+<)Zn;Y2<q#_YRgp)m1&H0p
zdVveDo|eX2z@$>ee<W19Ww)c8;Y6RBRdm#0UjU+2DpO%Nz;g9KMrwgq@SD-Uf4Gh!
zg2#*=(K!f5zzXVwvQ`OHwN_Mft@Rx3K?@5IQ<#AUd_ZQAu&==%WWr{2-7W*qiWo<c
zbrreZjBb!}JDiABlmMbr>oJbhP>6w6lRBC*YV#0^AoVz*#Yq|?H4MD81hTnM=uPtQ
zjLTNK=?lJ@(K=ZUFgP9xh14O9T9mvHOVc<(;S_~I4J_E=m)S7p59Y)y*g%kzgn%rF
zenhdz){0HC8HG$YLhuC~jxEFf;AWy=%J487z)3ZM`+Q1V>)Jut1^%b8t#+`wB>-?2
z2#QS-2kXJ-#K16jPj{p!LN-jLB*3Du4K|T$@&UhWx0zA+MePwh3~dAiN0R`fj2wk&
zc?w`OX#^O{8#J0)%3$Q_+L)bf@uUqdosBk>>PfOhZ#2>x+D4MagrUSxLKtIMyFVzi
zeh$QZ3ySXzto5l_#wr0;7Nu%YY>0J%vrd%7V4WC1tX8G!I<*ej=U_R(uZZ_6rP_$x
z1|*>wcuFPFhpgwC5w_uB;59T)@)}I5<9JN#;b9K6ga)H&7En45r!&$lx{3EZk;9E%
zg%TJ`AV!IybXp#86paCbVlk35&=}2oI1Fe>z0qLMlRBLq#UVvpX`d(BDJFtFsvNh5
z1HNpH7x2TGlHl;jV}BV{s<@Bswxa6rbacA^P<&BZ(%fuXUi#Em|Gb>OckbZY^TQ{O
zoiEMr9~!Leo?3`TUA+TDO_|$U^V$7hXUE^HXg+=?>w}KHq3AEOjrl{3*&X?P6O)Dc
zeeZaY^VttunH$6EA6LJn$uHZH*ZZ0lb2N)<i=XtlqVIJ^bM~Bhb!F+&{nyrdt~HmP
zd}GGlGdg!Lt|pQh-}YzwNaSqBqn$6v$?-eh9<fBO5rLkJq?F#DZk+foBiWfUYASnt
z>Vj$iQ2(>@qlc1~N}9SapF294_<Kv|gK5i==SZyQed}1<<W%;Dl~@6~^Wxd>Pp_|c
zS9`yh>D+a>>Ov;}D69MS;oOPAmE*<B&#dmdN-pp2JvMi@VB#@0KG<!UX|reT8o<MQ
zcFd1o9gcXfWVzb^xVt9i8N!FV?B#ED9WBr563P$UH035HwEq^VAu`j_bCV(?Hp`1I
zeI1{UkeQQrZXzwq_dZ`J|99!kLrdFyswKR9@7zMdmD`uROhU)Ntxr!C&X}DKI@_IN
b*Ap{TE2sJ1inNZOl|Q1rq{8-1aZThuecbo(

literal 1845
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

diff --git a/assets/img/shrink@3x.png b/assets/img/rotation@3x.png
similarity index 100%
rename from assets/img/shrink@3x.png
rename to assets/img/rotation@3x.png

From 58e4a621ea522b014eb754c64fc37c4c56019722 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 16 Jan 2023 15:03:57 +0800
Subject: [PATCH 10/17] =?UTF-8?q?:=20=E8=A7=86=E9=A2=91=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=90=8E=E7=BB=AD=E7=9A=84?=
 =?UTF-8?q?=20InteractionManager.runAfterInteractions=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035162 --user=刘泽潭 【灰度】【app】【员工多选】员工多选字段, 按部门选同事, 手动选择几个人后, 确定, 回到了上页, 但未带入所选员工, 再次点击确定, 未带出员工(仅android如此, iOS是选完员工后直接回到了新建页面, 未回到上页) https://www.tapd.cn/23787791/s/1631584
---
 VideoPlayer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index b0afebc..8bb17b4 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -89,7 +89,7 @@ export default class VideoPlayer extends Component {
      * Our app listeners and associated methods
      */
     this.events = {
-      onError: this.props.onError || this._onError.bind(this),
+      onError: this._onError.bind(this),
       onBack: this.props.onBack || this._onBack.bind(this),
       onEnd: this.props.onEnd || this._onEnd.bind(this),
       onScreenTouch: this._onScreenTouch.bind(this),
@@ -291,6 +291,9 @@ export default class VideoPlayer extends Component {
     state.loading = false;
 
     this.setState(state);
+    if (typeof this.props.onError === 'function') {
+      this.props.onError(err);
+    }
   }
 
   /**

From f46e5fd3e5de807b5764cff7cb13b9e282bee950 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Mon, 16 Jan 2023 15:03:57 +0800
Subject: [PATCH 11/17] =?UTF-8?q?:=20=E8=A7=86=E9=A2=91=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C=E9=81=BF=E5=85=8D=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=90=8E=E7=BB=AD=E7=9A=84?=
 =?UTF-8?q?=20InteractionManager.runAfterInteractions=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035162 --user=刘泽潭 【灰度】【app】【员工多选】员工多选字段, 按部门选同事, 手动选择几个人后, 确定, 回到了上页, 但未带入所选员工, 再次点击确定, 未带出员工(仅android如此, iOS是选完员工后直接回到了新建页面, 未回到上页) https://www.tapd.cn/23787791/s/1631584
---
 VideoPlayer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 9163cd3..0ab5da2 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -88,7 +88,7 @@ export default class VideoPlayer extends Component {
      * Our app listeners and associated methods
      */
     this.events = {
-      onError: this.props.onError || this._onError.bind(this),
+      onError: this._onError.bind(this),
       onBack: this.props.onBack || this._onBack.bind(this),
       onEnd: this.props.onEnd || this._onEnd.bind(this),
       onScreenTouch: this._onScreenTouch.bind(this),
@@ -288,6 +288,9 @@ export default class VideoPlayer extends Component {
     state.loading = false;
 
     this.setState(state);
+    if (typeof this.props.onError === 'function') {
+      this.props.onError(err);
+    }
   }
 
   /**

From c9bdf585075a8846d6ca6f10104e0a2144b03581 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Wed, 1 Feb 2023 10:18:34 +0800
Subject: [PATCH 12/17] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E7=9A=84loading=E7=BB=84=E4=BB=B6=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035162 --user=刘泽潭 【灰度】【app】【员工多选】员工多选字段, 按部门选同事, 手动选择几个人后, 确定, 回到了上页, 但未带入所选员工, 再次点击确定, 未带出员工(仅android如此, iOS是选完员工后直接回到了新建页面, 未回到上页) https://www.tapd.cn/23787791/s/1631584
替换视频播放组件内部的loading组件，
因为由Animated执行动画，如果一直在loading的话，后续页面的InteractionManager.runAfterInteractions一直无法执行
---
 VideoPlayer.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 0ab5da2..5061452 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import Video from 'react-native-video';
 import {
+  ActivityIndicator,
   TouchableWithoutFeedback,
   TouchableHighlight,
   ImageBackground,
@@ -191,7 +192,7 @@ export default class VideoPlayer extends Component {
   _onLoadStart() {
     let state = this.state;
     state.loading = true;
-    this.loadAnimation();
+    // this.loadAnimation();
     this.setState(state);
 
     if (typeof this.props.onLoadStart === 'function') {
@@ -1282,7 +1283,8 @@ export default class VideoPlayer extends Component {
     if (this.state.loading) {
       return (
         <View style={styles.loader.container}>
-          <Animated.Image
+          <ActivityIndicator color={'white'} />
+          {/* <Animated.Image
             source={require('./assets/img/loader-icon.png')}
             style={[
               styles.loader.icon,
@@ -1297,7 +1299,7 @@ export default class VideoPlayer extends Component {
                 ],
               },
             ]}
-          />
+          /> */}
         </View>
       );
     }

From a7a20f81e209f9dde53a8b25aed3e8335d9c9da1 Mon Sep 17 00:00:00 2001
From: lzt <liuzetan1988@126.com>
Date: Wed, 1 Feb 2023 10:18:34 +0800
Subject: [PATCH 13/17] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=92=AD=E6=94=BE=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E7=9A=84loading=E7=BB=84=E4=BB=B6=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035162 --user=刘泽潭 【灰度】【app】【员工多选】员工多选字段, 按部门选同事, 手动选择几个人后, 确定, 回到了上页, 但未带入所选员工, 再次点击确定, 未带出员工(仅android如此, iOS是选完员工后直接回到了新建页面, 未回到上页) https://www.tapd.cn/23787791/s/1631584
替换视频播放组件内部的loading组件，
因为由Animated执行动画，如果一直在loading的话，后续页面的InteractionManager.runAfterInteractions一直无法执行
---
 VideoPlayer.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 8bb17b4..d99488b 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import Video from 'react-native-video';
 import {
+  ActivityIndicator,
   TouchableWithoutFeedback,
   TouchableHighlight,
   ImageBackground,
@@ -194,7 +195,7 @@ export default class VideoPlayer extends Component {
   _onLoadStart() {
     let state = this.state;
     state.loading = true;
-    this.loadAnimation();
+    // this.loadAnimation();
     this.setState(state);
 
     if (typeof this.props.onLoadStart === 'function') {
@@ -1303,7 +1304,8 @@ export default class VideoPlayer extends Component {
     if (this.state.loading) {
       return (
         <View style={styles.loader.container}>
-          <Animated.Image
+          <ActivityIndicator color={'white'} />
+          {/* <Animated.Image
             source={require('./assets/img/loader-icon.png')}
             style={[
               styles.loader.icon,
@@ -1318,7 +1320,7 @@ export default class VideoPlayer extends Component {
                 ],
               },
             ]}
-          />
+          /> */}
         </View>
       );
     }

From 7e742a9dbac81df1c0b9b616df910d6169fcbc26 Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Fri, 3 Feb 2023 16:07:49 +0800
Subject: [PATCH 14/17] =?UTF-8?q?feat:=20=20=E6=B7=BB=E5=8A=A0onRate?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index d99488b..cb6dac2 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1249,7 +1249,10 @@ export default class VideoPlayer extends Component {
         collapsable={false} >
 
         {rateArr.map((v) => {
-          return (<TouchableWithoutFeedback onPress={() => this.setRate(v)}>
+          return (<TouchableWithoutFeedback onPress={() => {
+             this.setRate(v);
+             typeof this.props.onRate === 'function' && this.props.onRate(v);
+          }}>
             <Text style={{ color: rate === v ? '#ff0000' : '#ffffff', margin: 4 }}>{`${v}倍`}</Text>
           </TouchableWithoutFeedback>)
         })}

From 130528849df7fb292bf1818c8db7210367f408cf Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Wed, 8 Feb 2023 11:11:09 +0800
Subject: [PATCH 15/17] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E6=97=8B=E8=BD=AC=E5=90=8E=EF=BC=8C=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index cb6dac2..3a90edd 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -1166,9 +1166,10 @@ export default class VideoPlayer extends Component {
         {...this.player.seekPanResponder.panHandlers}>
         <View
           style={styles.seekbar.track}
-          onLayout={(event) =>
-            (this.player.seekerWidth = event.nativeEvent.layout.width)
-          }
+          onLayout={(event) => {
+            this.player.seekerWidth = event.nativeEvent.layout.width;
+            this.state.currentTime && this._onProgress({currentTime: this.state.currentTime});
+          }}
           pointerEvents={'none'}>
           <View
             style={[

From 1d29931f7fb9f22391c7e3ec7d6977b0ff1de06e Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Thu, 22 Aug 2024 16:50:51 +0800
Subject: [PATCH 16/17] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8BonVolume=E5=9B=9E=E8=B0=83=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 3a90edd..1808de1 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -914,8 +914,6 @@ export default class VideoPlayer extends Component {
         this.setVolumePosition(position);
         const volume = this.calculateVolumeFromVolumePosition();
         state.volume = volume;
-        typeof this.props.onVolume === 'function' &&
-          this.props.onVolume(volume);
 
         if (state.volume <= 0) {
           state.muted = true;
@@ -934,6 +932,8 @@ export default class VideoPlayer extends Component {
         state.volumeOffset = state.volumePosition;
         this.setControlTimeout();
         this.setState(state);
+        const volume = this.calculateVolumeFromVolumePosition();
+        typeof this.props.onVolume === 'function' && this.props.onVolume(volume);
       },
     });
   }

From cdcae04f7afb8442f2497ccf5b3b4a2a0cdfe029 Mon Sep 17 00:00:00 2001
From: Ma Shuai <mashuai_hy@163.com>
Date: Fri, 20 Dec 2024 15:46:36 +0800
Subject: [PATCH 17/17] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8BerrorCheck=E6=A0=A1=E9=AA=8C=E7=9A=84=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoPlayer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/VideoPlayer.js b/VideoPlayer.js
index 1808de1..fee9aaf 100644
--- a/VideoPlayer.js
+++ b/VideoPlayer.js
@@ -287,6 +287,9 @@ export default class VideoPlayer extends Component {
    * @param {object} err  Err obj returned from <Video> component
    */
   _onError(err) {
+    if (this.props.errorCheck?.(err)) {
+      return;
+    }
     let state = this.state;
     state.error = true;
     state.loading = false;