Merge branch 'master' of

http://gogs.efunbox.cn/Rorschach/efunbox-mobile-8

pages/components/CusVideo.js

@@ -11,6 +11,7 @@ import {
 } from "react-native";
 import { createStackNavigator, createAppContainer } from "react-navigation";
 import Video from "react-native-video";
+import SeekBar from "../components/SeekBar";
 const instructions = Platform.select({
   ios: "Press Cmd+R to reload,\n" + "Cmd+D or shake for dev menu",
   android:
@@ -28,7 +29,10 @@ export default class CusVideo extends React.Component {
     duration: 0.0,
     currentTime: 0.0,
     paused: false,
-    wheel: false
+    wheel: false,
+    player_status_icon: require("../images/video/start.png"),
+    isFull: false,
+    needback: this.props.needback
   };
 
   render() {
@@ -45,6 +49,7 @@ export default class CusVideo extends React.Component {
           // poster={this.props.poster}
           resizeMode={this.state.resizeMode}
           // posterResizeMode={this.state.resizeMode}
+          onBuffer={this.onBuffer}
           rate={this.state.rate} //播放速率
           paused={this.state.paused} //暂停
           volume={this.state.volume} //调节音量
@@ -61,6 +66,42 @@ export default class CusVideo extends React.Component {
           playInBackground={false} // 当app转到后台运行的时候，播放是否暂停
           playWhenInactive={true} // [iOS] Video continues to play when control or notification center are shown. 仅适用于IOS
         />
+        <View
+          style={{
+            flexDirection: "row",
+            position: "absolute",
+            width: "100%",
+            height: 50,
+            alignItems: "center",
+            justifyContent: "center"
+          }}
+        >
+          <View
+            style={{
+              flex: 1,
+              alignItems: "center"
+            }}
+          >
+            <VideoBack
+              needback={this.state.needback}
+              videoback={this.videoBackClick.bind(this)}
+            />
+          </View>
+          <View style={{ flex: 2 }} />
+          <View
+            style={{
+              flex: 9,
+              overflow: "hidden"
+            }}
+          />
+          <View style={{ flex: 2 }} />
+          <View
+            style={{
+              flex: 1,
+              alignItems: "center"
+            }}
+          />
+        </View>
         <View style={[styles.player_controller]}>
           <View
             style={{
@@ -80,11 +121,11 @@ export default class CusVideo extends React.Component {
             >
               <Image
                 style={[styles.player_pause_icon]}
-                //source={require("../imgs/player_image_state_pause.png")}
+                source={this.state.player_status_icon}
               />
             </TouchableOpacity>
           </View>
-          <View style={{ flex: 3 }}>
+          <View style={{ flex: 2 }}>
             {/* //左侧当前播放时长 */}
             <Text style={[styles.player_time]}>
               {formatTime(this.state.currentTime)}
@@ -92,37 +133,45 @@ export default class CusVideo extends React.Component {
           </View>
           <View
             style={{
-              flex: 7,
-              backgroundColor: "yellow"
+              flex: 9,
+              overflow: "hidden"
             }}
           >
             {/* //中间进度条 */}
-            {/* <SeekBar
-                style={{
-                  flex: 1,
-                  alignItems: "center",
-                  justifyContent: "center",
-                  width: "100%"
-                }}
-                max={this.state.duration}
-                progress={this.state.currentTime}
-              /> */}
+            <SeekBar
+              style={{ flex: 1 }}
+              ref={view => (this.seekbar = view)}
+              //必须带此方法，作为滑动之后抬起的回调
+              touchUpCallBack={this.touch_up_callback.bind(this)}
+            />
           </View>
-          <View style={{ flex: 3 }}>
+          <View style={{ flex: 2 }}>
             {/* //右侧总时长 */}
             <Text style={[styles.player_time]}>
               {formatTime(this.state.duration)}
             </Text>
           </View>
-          <TouchableOpacity
-            style={{ flex: 1 }}
-            onPress={() => this.presentFullscreenPlayer()}
+          <View
+            style={{
+              flex: 1,
+              alignItems: "center"
+            }}
           >
-            <View style={{ flex: 1 }}>
+            <TouchableOpacity
+              style={{
+                justifyContent: "center",
+                width: "100%",
+                height: "100%"
+              }}
+              onPress={() => this.presentFullscreenPlayer()}
+            >
               {/* //放大按钮 */}
-              <Image style={[styles.player_pause_icon]} />
-            </View>
-          </TouchableOpacity>
+              <Image
+                style={[styles.fullscreen_icon]}
+                source={require("../images/video/fullscreen.png")}
+              />
+            </TouchableOpacity>
+          </View>
         </View>
       </View>
     );
@@ -131,14 +180,20 @@ export default class CusVideo extends React.Component {
   loadStart() {
     // alert("loadStart");
   }
+  onBuffer({ isBuffering }: { isBuffering: boolean }) {
+    //true为正在加载，false为没有加载，此处给loading提示
+    console.log("isBuffering:" + isBuffering);
+  }
   onLoad = data => {
     //获取的是秒数
     this.setState({ duration: data.duration });
+    this.seekbar.setMax(data.duration);
   };
   onProgress = data => {
     this.setState({
       currentTime: data.currentTime
     });
+    this.seekbar.setProgress(this.state.currentTime);
   };
 
   onError() {
@@ -155,21 +210,48 @@ export default class CusVideo extends React.Component {
     }
   }
   pause() {
-    this.setState({ paused: true });
+    this.setState({
+      paused: true,
+      player_status_icon: require("../images/video/start.png")
+    });
     this.player_icon_index = 1;
   }
   start() {
-    this.setState({ paused: false });
+    this.setState({
+      paused: false,
+      player_status_icon: require("../images/video/pause.png")
+    });
     this.player_icon_index = 0;
   }
   showToast(params) {
     // ToastExample.message(params);
     ToastExample.show(params, ToastExample.SHORT);
   }
+  seekTo(progress) {
+    this.player.seek(progress);
+  }
   presentFullscreenPlayer() {
-    // alert("点击调用全屏");
+    if (this.state.isFull) {
+      this.setState({
+        isFull: false,
+        needback: this.props.needback
+      });
+    } else {
+      this.setState({
+        isFull: true,
+        needback: true
+      });
+    }
+
     this.props.videofullScreenPlayer();
-    // this.player.presentFullscreenPlayer();
+    this.seekbar.setProgress(this.state.currentTime);
+  }
+  touch_up_callback(progress) {
+    //抬起之后，获取算出来的progress
+    this.setState({
+      currentTime: progress
+    });
+    this.seekTo(progress);
   }
 
   refreshVideo() {
@@ -178,6 +260,17 @@ export default class CusVideo extends React.Component {
       currentTime: 0
     });
   }
+
+  videoBackClick() {
+    // if (this.props.needback != undefined && this.props.needback) {
+    // }
+    if (this.state.isFull) {
+      //全屏状态下，变小屏
+      this.presentFullscreenPlayer();
+    } else {
+      this.props.videoback();
+    }
+  }
 }
 
 const styles = StyleSheet.create({
@@ -187,15 +280,23 @@ const styles = StyleSheet.create({
     width: "100%",
     height: 50,
     alignItems: "center",
+    justifyContent: "center",
     bottom: 0
   },
   player_pause_icon: {
-    width: "100%",
+    width: "80%",
     resizeMode: "center",
-    height: "80%",
+    height: "40%",
     justifyContent: "center",
     alignItems: "center",
-    backgroundColor: "blue"
+    left: 5
+  },
+  fullscreen_icon: {
+    width: "80%",
+    resizeMode: "center",
+    height: "30%",
+    justifyContent: "center",
+    alignItems: "center"
   },
   player_time: {
     fontSize: 18,
@@ -227,3 +328,45 @@ function formatTime(s) {
   s = s.length == 1 ? "0" + s : s;
   return h + ":" + s;
 }
+class VideoBack extends Component {
+  render() {
+    if (this.props.needback) {
+      return (
+        <TouchableOpacity
+          //点击事件放在这个组件里才管用
+          style={{
+            justifyContent: "center",
+            width: "100%",
+            height: "100%"
+          }}
+          onPress={() => this.props.videoback()}
+        >
+          <Image
+            style={[styles.player_pause_icon]}
+            source={require("../images/video/back.png")}
+          />
+        </TouchableOpacity>
+      );
+    } else {
+      return null;
+    }
+  }
+}
+
+/**
+  使用方法
+  <CusVideo
+      uri={this.state.video_uri}
+       ref={view => (this.video = view)}
+       needback={true} //(是否需要小窗口的返回按钮)
+       videoback={this.clickVideoBack.bind(this)}//(小窗口返回按钮的事件)
+       videofullScreenPlayer={this.fullScreenPlayer.bind(this)}//(点击全屏按钮的事件)
+       style={{
+       flex: this.state.video_flex,
+         width: this.state.video_width,
+         height: this.state.video_height
+         }}
+   />
+
+
+ */

pages/components/PersonalInfo.js

@@ -50,24 +50,32 @@ export default class PersonalInfo extends BasePage {
           translucent={false}
         />
 
-        <ImageBackground
-          source={require("../images/userInfo/topbg.png")}
-          style={{ flex: 1 }}
-          imageStyle={{ resizeMode: "contain" }}
+        <View
+          style={{
+            flex: 1,
+            flexDirection: "column"
+          }}
         >
-          <View
+          <ImageBackground
+            source={require("../images/userInfo/top.png")}
             style={{
-              flex: 1,
-              flexDirection: "column"
+              flex: 5,
+              width: "100%",
+              backgroundColor: "#F0F1F5",
+              height: "73%"
             }}
+            imageStyle={{ resizeMode: "contain" }}
           >
             <View
               style={{
-                width: "100%",
-                flex: 2
+                flex: 1,
+                alignItems: "center",
+                justifyContent: "center",
+                flexDirection: "column"
               }}
             >
               <CourseTitle
+                style={{ flex: 1 }}
                 width={this.getWindowWidth()}
                 title="个人信息"
                 backPress={() => this.goBack()}
@@ -75,21 +83,11 @@ export default class PersonalInfo extends BasePage {
                 textcolor={"white"}
                 backPress={() => this.goBack()}
               />
-            </View>
-
-            <View
-              style={{
-                width: "100%",
-                flex: 3,
-                alignItems: "center",
-                justifyContent: "center"
-              }}
-            >
               <View
                 style={{
+                  flex: 1.5,
                   backgroundColor: "white",
                   width: "90%",
-                  height: "90%",
                   alignItems: "center",
                   justifyContent: "center",
                   borderRadius: 20,
@@ -104,109 +102,113 @@ export default class PersonalInfo extends BasePage {
                 />
               </View>
             </View>
-            <View style={{ flex: 0.1 }} />
+          </ImageBackground>
+
+          <View style={{ flex: 0.1, backgroundColor: "#F0F1F5" }} />
+          <View
+            style={{
+              width: "100%",
+              flex: 4.1,
+              alignItems: "center",
+              justifyContent: "center",
+              backgroundColor: "#F0F1F5"
+            }}
+          >
             <View
               style={{
-                width: "100%",
-                flex: 4.1,
+                backgroundColor: "#F3F3F3",
+                width: "90%",
                 alignItems: "center",
-                justifyContent: "center"
+                justifyContent: "center",
+                height: "90%",
+                overflow: "hidden",
+                borderRadius: 20
               }}
             >
-              <View
-                style={{
-                  backgroundColor: "#F3F3F3",
-                  width: "90%",
-                  alignItems: "center",
-                  justifyContent: "center",
-                  height: "90%",
-                  overflow: "hidden",
-                  borderRadius: 20
-                }}
-              >
-                {this.userInfo123()}
-              </View>
+              {this.userInfo123()}
             </View>
-            <View style={{ flex: 0.1 }} />
+          </View>
+          <View style={{ flex: 0.1, backgroundColor: "#F0F1F5" }} />
+          <View
+            style={{
+              width: "100%",
+              alignItems: "center",
+              justifyContent: "center",
+              flex: 4.1,
+              backgroundColor: "#F0F1F5"
+            }}
+          >
             <View
               style={{
-                width: "100%",
-                alignItems: "center",
-                justifyContent: "center",
-                flex: 4.1
+                backgroundColor: "#F3F3F3",
+                width: "90%",
+                height: "90%",
+                overflow: "hidden",
+                borderRadius: 20
               }}
             >
+              {this.userInfo456()}
+            </View>
+          </View>
+          <View
+            style={{
+              width: "100%",
+              flex: 4,
+              backgroundColor: "#F0F1F5",
+              flexDirection: "column"
+            }}
+          >
+            <View style={{ flex: 0.5 }} />
+            <View style={{ flex: 1, flexDirection: "row" }}>
+              <View style={{ flex: 1 }} />
               <View
                 style={{
-                  backgroundColor: "#F3F3F3",
-                  width: "90%",
-                  height: "90%",
-                  overflow: "hidden",
-                  borderRadius: 20
+                  flex: 7,
+                  width: "100%",
+                  height: "100%"
                 }}
               >
-                {this.userInfo456()}
-              </View>
-            </View>
-            <View
-              style={{
-                width: "100%",
-                flex: 4,
-                flexDirection: "column"
-              }}
-            >
-              <View style={{ flex: 0.5 }} />
-              <View style={{ flex: 1, flexDirection: "row" }}>
-                <View style={{ flex: 1 }} />
-                <View
+                <TouchableOpacity
+                  activeOpacity={1}
                   style={{
-                    flex: 7,
+                    flex: 1,
                     width: "100%",
+                    alignItems: "center",
+                    justifyContent: "center",
                     height: "100%"
                   }}
+                  onPress={() => this.logout()}
                 >
-                  <TouchableOpacity
-                    activeOpacity={1}
+                  <ImageBackground
+                    source={require("../images/userInfo/logoutbg1.png")}
                     style={{
                       flex: 1,
                       width: "100%",
+                      resizeMode: "repeat",
                       alignItems: "center",
                       justifyContent: "center",
                       height: "100%"
                     }}
-                    onPress={() => this.logout()}
+                    imageStyle={{ resizeMode: "contain" }}
                   >
-                    <ImageBackground
-                      source={require("../images/userInfo/logoutbg1.png")}
+                    <Text
                       style={{
-                        flex: 1,
+                        fontSize: 30,
+                        color: "white",
                         width: "100%",
-                        resizeMode: "repeat",
-                        alignItems: "center",
-                        justifyContent: "center",
-                        height: "100%"
+                        textAlign: "center"
                       }}
-                      imageStyle={{ resizeMode: "contain" }}
                     >
-                      <Text
-                        style={{
-                          fontSize: 30,
-                          color: "white",
-                          width: "100%",
-                          textAlign: "center"
-                        }}
-                      >
-                        退出登录
-                      </Text>
-                    </ImageBackground>
-                  </TouchableOpacity>
-                  <View style={{ flex: 1 }} />
-                </View>
+                      退出登录
+                    </Text>
+                  </ImageBackground>
+                </TouchableOpacity>
                 <View style={{ flex: 1 }} />
               </View>
+              <View style={{ flex: 1 }} />
             </View>
           </View>
-        </ImageBackground>
+        </View>
       </View>
     );
   }

pages/components/PersonalInfoDialog.js

@@ -38,7 +38,11 @@ export default class PersonalInfoDialog extends Component<Props> {
   };
 
   setModalVisible(visible, type) {
-    this.setState({ modalVisible: visible, updateType: type });
+    this.setState({
+      modalVisible: visible,
+      updateType: type,
+      input_text: ""
+    });
   }
   setInfo(mytitle, holder) {
     this.setState({

pages/components/SchedulePage.js

@@ -115,6 +115,7 @@ export default class SchedulePage extends BasePage {
             <CusVideo
               uri={this.state.video_uri}
               ref={view => (this.video = view)}
+              needback={false}
               videofullScreenPlayer={this.fullScreenPlayer.bind(this)}
               style={{
                 flex: this.state.video_flex,

pages/components/SeekBar.js

@@ -0,0 +1,259 @@
+import React, { Component } from "react";
+import {
+  Platform,
+  StyleSheet,
+  Text,
+  View,
+  Image,
+  Button,
+  PanResponder,
+  findNodeHandle,
+  ImageBackground,
+  UIManager,
+  DeviceEventEmitter
+} from "react-native";
+import BasePage from "../BasePage";
+const instructions = Platform.select({
+  ios: "Press Cmd+R to reload,\n" + "Cmd+D or shake for dev menu",
+  android:
+    "Double tap R on your keyboard to reload,\n" +
+    "Shake or press menu button for dev menu"
+});
+
+type Props = {};
+export default class SeekBar extends BasePage {
+  constructor(props) {
+    super(props);
+    this.pressStatus = false;
+    this.progress = 0;
+  }
+
+  config = {
+    changeX: 0,
+    changeY: 0,
+    xDiff: 0,
+    yDiff: 0
+  };
+  state = {
+    max: 1,
+    view_width: 0,
+    icon_transform: [{ scale: 1 }],
+    left: 0,
+    top: 0,
+    touch_down: false
+  };
+  render() {
+    return (
+      <View
+        style={{
+          height: 80,
+          width: "100%",
+          alignItems: "center",
+          justifyContent: "center"
+        }}
+      >
+        <View
+          style={{
+            height: 20,
+            width: "98%"
+          }}
+          ref={c => {
+            this.progressBar = c;
+          }}
+          onLayout={() => {
+            const handle = findNodeHandle(this.progressBar);
+            setTimeout(() => {
+              UIManager.measure(handle, (x, y, width, height, pageX, pageY) => {
+                // console.warn(x, y, width, height, pageX, pageY);
+                this.setState({
+                  view_width: width
+                });
+                this.setProgress(this.progress);
+              });
+            }, 0);
+          }}
+        >
+          <ImageBackground
+            style={{
+              height: 2,
+              width: "100%",
+              backgroundColor: "#DBDBDB",
+              overflow: "hidden",
+              borderRadius: 10,
+              top: 10
+            }}
+          >
+            <View
+              style={{
+                height: 2,
+                width: this.state.left + 3,
+                backgroundColor: "#FFA91C",
+                overflow: "hidden",
+                borderRadius: 10
+              }}
+            />
+          </ImageBackground>
+
+          <Image
+            {...this._panResponder.panHandlers}
+            style={{
+              height: 14,
+              width: 14,
+              borderRadius: 10,
+              backgroundColor: "#FFA91C",
+              transform: this.state.icon_transform,
+              left: this.state.left,
+              top: 2
+            }}
+          />
+        </View>
+      </View>
+    );
+  }
+  componentWillMount() {
+    this._panResponder = 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;
+        this.config.changeX = evt.nativeEvent.pageX;
+      },
+      onPanResponderStart: (evt, gestureState) => {
+        this.pressStatus = true;
+        console.log("onPanResponderStart");
+        this.setState({
+          icon_transform: [{ scale: 1.5 }],
+          touch_down: true
+        });
+      },
+      onPanResponderMove: (evt, gestureState) => {
+        this.config.yDiff = evt.nativeEvent.pageY - this.config.changeY;
+        this.config.xDiff = evt.nativeEvent.pageX - this.config.changeX;
+        this.state.left = this.state.left + this.config.xDiff;
+        this.state.top = this.state.top + this.config.yDiff;
+        this.config.changeY = evt.nativeEvent.pageY;
+        this.config.changeX = evt.nativeEvent.pageX;
+        if (
+          this.state.left < 0 ||
+          this.state.left > this.state.view_width - 14
+        ) {
+          if (this.state.left < 0) {
+            this.state.left = 0;
+          } else if (this.state.left > this.state.view_width - 14) {
+            this.state.left = this.state.view_width - 14;
+          }
+          this.setState({
+            left: this.state.left,
+            top: this.state.top
+          });
+        } else {
+          this.setState({
+            left: this.state.left,
+            top: this.state.top
+          });
+          console.log("onPanResponderMove:" + this.state.left);
+        }
+      },
+      onPanResponderEnd: (evt, gestureState) => {
+        this.pressStatus = true;
+        console.log("onPanResponderEnd");
+      },
+      onPanResponderTerminationRequest: (evt, gestureState) => true,
+      onPanResponderRelease: (evt, gestureState) => {
+        if (this.pressStatus) {
+          this.props.onPress && this.props.onPress();
+          this.setState({
+            icon_transform: [{ scale: 1 }],
+            touch_down: false
+          });
+        }
+        this.pressStatus = false;
+        var sss = this.state.left / (this.state.view_width - 14);
+        // alert(sss + "%");
+        this.props.touchUpCallBack(this.state.max * sss);
+      },
+      onPanResponderTerminate: (evt, gestureState) => {
+        // 另一个组件已经成为了新的响应者，所以当前手势将被取消。
+      },
+      onShouldBlockNativeResponder: (evt, gestureState) => {
+        // 返回一个布尔值，决定当前组件是否应该阻止原生组件成为JS响应者
+        // 默认返回true。目前暂时只支持android。
+        //基于业务交互场景，如果这里使用js事件处理，会导致容器不能左右滑动。所以设置成false.
+        return false;
+      }
+    });
+  }
+
+  getTouchDown() {
+    return this.state.touch_down;
+  }
+  setMax(setmax) {
+    this.setState({
+      max: setmax
+    });
+  }
+  setProgress(progress) {
+    if (this.state.view_width > 0) {
+      this.progress = progress;
+      if (this.state.touch_down) {
+      } else {
+        var left_percentage;
+        if (this.state.max == 0) {
+          left_percentage = progress / 1;
+        } else {
+          left_percentage = progress / this.state.max;
+        }
+        this.setState({
+          left: (this.state.view_width - 14) * left_percentage,
+          icon_transform: [{ scale: 1 }]
+        });
+      }
+    }
+  }
+}
+
+const styles = StyleSheet.create({});
+
+/**
+         <SeekBar
+            ref={view => (this.seekbar = view)}
+            max={100}
+            //必须带此方法，作为滑动之后抬起的回调
+            touchUpCallBack={this.touch_up_callback.bind(this)}
+            progress={this.state.curprogress}
+          />
+
+  state = {
+    curprogress: 0,
+    max: 100
+  };
+ touch_up_callback(progress) {
+    //抬起之后，获取算出来的progress
+    this.setState({
+      curprogress: progress
+    });
+  }
+
+  setProgressIcon() {
+    //轮询设置值，超过max则停止
+    setTimeout(() => {
+      if (!this.seekbar.getTouchDown()) {
+        this.setState({
+          curprogress: this.state.curprogress + 1
+        });
+      }
+
+      if (this.state.curprogress >= this.state.max) {
+        alert("100了");
+      } else {
+        this.setProgressIcon();
+      }
+      this.seekbar.setProgress(this.state.curprogress);
+    }, 1000);
+  }
+
+ */