Merge branch 'master' of http://gogs.efunbox.cn/Rorschach/efunbox-mobile-8

pages/components/CusVideo.js

@@ -44,6 +44,7 @@ export default class CusVideo extends React.Component {
     duration: 0.0,
     currentTime: 0.0,
     paused: true,
+    onBuffer: true,
     wheel: false,
     isFull: false,
     needback: this.props.needback,
@@ -142,15 +143,11 @@ export default class CusVideo extends React.Component {
   }
 
   componentWillMount() {
-    if (this.state.pause) {
-    }
-
     this.videotouch = PanResponder.create({
       onStartShouldSetPanResponder: (evt, gestureState) => true,
       onStartShouldSetPanResponderCapture: (evt, gestureState) => true,
       onMoveShouldSetPanResponder: (evt, gestureState) => true,
       onMoveShouldSetPanResponderCapture: (evt, gestureState) => true,
-
       onPanResponderGrant: (evt, gestureState) => {
         this.pressStatus = true;
         this.config.changeY = evt.nativeEvent.pageY;
@@ -189,16 +186,6 @@ export default class CusVideo extends React.Component {
         return false;
       }
     });
-    if (this.state.show_controller) {
-      this.time_hideController = setTimeout(() => {
-        this.setState({
-          show_controller: false
-          // needback: false
-        });
-        this.bottomcontroller.setBottom(-50);
-        this.topcontroller.setTop(-50);
-      }, 5000);
-    }
   }
 
   loadStart() {
@@ -208,9 +195,16 @@ export default class CusVideo extends React.Component {
   onBuffer({ isBuffering }: { isBuffering: boolean }) {
     //true为正在加载，false为没有加载，此处给loading提示
     this.setState({
+      onBuffer: isBuffering,
       show_loading: isBuffering
     });
   }
+  isPlaying() {
+    if (this.state.onBuffer == false && this.state.paused == false) {
+      return true;
+    }
+    return false;
+  }
   onLoad = data => {
     //获取的是秒数
     this.setState({ duration: data.duration });
@@ -227,10 +221,16 @@ export default class CusVideo extends React.Component {
   };
 
   onError() {
-    this.props.onError();
+    if (this.props.onEnd == undefined) {
+    } else {
+      this.props.onError();
+    }
   }
   onEnd() {
-    this.props.onEnd();
+    if (this.props.onEnd == undefined) {
+    } else {
+      this.props.onEnd();
+    }
   }
   play() {
     //controller的play点击无法换图...
@@ -253,6 +253,16 @@ export default class CusVideo extends React.Component {
       player_status_icon: require("../images/video/pause.png")
     });
     this.player_icon_index = 0;
+    if (this.state.show_controller) {
+      this.time_hideController = setTimeout(() => {
+        this.setState({
+          show_controller: false
+          // needback: false
+        });
+        this.bottomcontroller.setBottom(-50);
+        this.topcontroller.setTop(-50);
+      }, 5000);
+    }
   }
 
   seekTo(progress) {

pages/components/SchedulePage.js

@@ -19,6 +19,7 @@ import {
   findNodeHandle,
   UIManager,
   StatusBar,
+  BackHandler,
   Button,
   DeviceEventEmitter
 } from "react-native";
@@ -120,7 +121,11 @@ export default class SchedulePage extends BasePage {
               }}
             />
           </View>
-          <View style={{ height: this.state.seat_height }} />
+          <View
+            style={{
+              height: this.state.seat_height
+            }}
+          />
           <View
             style={{
               height: this.state.flatlist_height,
@@ -229,8 +234,6 @@ export default class SchedulePage extends BasePage {
           show={this.state.video_show}
           uri={this.state.video_uri}
           ref={view => (this.video = view)}
-          needback={false}
-          videoback={() => alert("videoback")}
           videofullScreenPlayer={this.fullScreenPlayer.bind(this)}
           onError={this.onError.bind(this)}
           onEnd={this.onEnd.bind(this)}
@@ -256,8 +259,30 @@ export default class SchedulePage extends BasePage {
       />
     );
   }
+
+  componentWillMount() {
+    BackHandler.addEventListener(
+      "hardwareBackPress",
+      this.onBackAndroid.bind(this)
+    );
+  }
+  componentWillUnmount() {
+    BackHandler.removeEventListener(
+      "hardwareBackPress",
+      this.onBackAndroid.bind(this)
+    );
+  }
+  onBackAndroid() {
+    if (this.state.isFull) {
+      return true;
+    } else {
+    }
+  }
   onError() {
     alert("播放器异常");
+    this.setState({
+      video_show: false
+    });
   }
   onEnd() {
     alert("播放结束");
@@ -267,10 +292,7 @@ export default class SchedulePage extends BasePage {
     if (!this.state.isFull) {
       Orientation.lockToLandscape();
       this.setState({
-        // title_height: "0%",
         video_frame_height: "100%",
-        // seat_height: "0%",
-        // flatlist_height: "0%",
         statusbar_hidden: true,
         isFull: true,
         x: 0,
@@ -281,10 +303,7 @@ export default class SchedulePage extends BasePage {
     } else {
       Orientation.lockToPortrait();
       this.setState({
-        // title_height: "6%",
         video_frame_height: "32%",
-        // seat_height: "2%",
-        // flatlist_height: "60%",
         x: this.state.videoImage_x,
         y: this.state.videoImage_y,
         video_width: this.state.videoImage_width,