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

pages/components/CourseTitle.js

@@ -102,7 +102,7 @@ export default class CourseTitle extends Component<Props> {
     switch (type) {
       case 1:
         //左侧返回图片1
-        back = require("../images/userInfo/back_white.png");
+        back = require("../images/schedulePage/back_black.png");
         break;
       case 2:
         //左侧返回图片2
@@ -122,32 +122,25 @@ export default class CourseTitle extends Component<Props> {
   }
   selectRightIcon() {
     let type = this.props.righttype;
+    let right = "";
     switch (type) {
       case 1:
         //课程表标题，右侧是分享
-        return (
-          <Image
-            style={{
-              width: 20,
-              height: 20,
-              backgroundColor: "blue"
-            }}
-          />
-        );
+        right = require("../images/common/share.png");
         break;
       case 2:
         //个人中心，右侧是设置
-        return (
-          <Image
-            style={{
-              width: 20,
-              height: 20,
-              backgroundColor: "red"
-            }}
-          />
-        );
         break;
     }
+    return (
+      <Image
+        source={right}
+        style={{
+          width: 20,
+          height: 20
+        }}
+      />
+    );
   }
 }
 /**

pages/components/CusVideo.js

@@ -47,7 +47,29 @@ export default class CusVideo extends React.Component {
     isFull: false,
     needback: this.props.needback,
     show_controller: true,
-    show_loading: true
+    show_loading: true,
+    loading_arr: [
+      require("../images/video/loading1.png"),
+      require("../images/video/loading2.png"),
+      require("../images/video/loading3.png"),
+      require("../images/video/loading4.png"),
+      require("../images/video/loading5.png"),
+      require("../images/video/loading6.png"),
+      require("../images/video/loading7.png"),
+      require("../images/video/loading8.png"),
+      require("../images/video/loading9.png"),
+      require("../images/video/loading10.png"),
+      require("../images/video/loading11.png"),
+      require("../images/video/loading12.png"),
+      require("../images/video/loading13.png"),
+      require("../images/video/loading14.png"),
+      require("../images/video/loading15.png"),
+      require("../images/video/loading16.png"),
+      require("../images/video/loading17.png"),
+      require("../images/video/loading18.png"),
+      require("../images/video/loading19.png"),
+      require("../images/video/loading20.png")
+    ]
   };
 
   render() {
@@ -94,7 +116,10 @@ export default class CusVideo extends React.Component {
             justifyContent: "center"
           }}
         >
-          <Loading show={this.state.show_loading} />
+          <Loading
+            loading_arr={this.state.loading_arr}
+            show={this.state.show_loading}
+          />
         </View>
         <TopController
           ref={view => (this.topcontroller = view)}
@@ -361,44 +386,43 @@ class TopController extends Component {
 }
 
 class Loading extends Component {
+  constructor(props) {
+    super(props);
+    this.loading_index = 0;
+  }
   state = {
-    image_arr: [
-      require("../images/video/loading1.png"),
-      require("../images/video/loading2.png"),
-      require("../images/video/loading3.png"),
-      require("../images/video/loading3.png"),
-      require("../images/video/loading4.png"),
-      require("../images/video/loading5.png"),
-      require("../images/video/loading6.png"),
-      require("../images/video/loading7.png"),
-      require("../images/video/loading8.png"),
-      require("../images/video/loading9.png"),
-      require("../images/video/loading10.png"),
-      require("../images/video/loading11.png"),
-      require("../images/video/loading12.png"),
-      require("../images/video/loading13.png"),
-      require("../images/video/loading14.png"),
-      require("../images/video/loading15.png"),
-      require("../images/video/loading16.png"),
-      require("../images/video/loading17.png"),
-      require("../images/video/loading18.png"),
-      require("../images/video/loading19.png"),
-      require("../images/video/loading20.png")
-    ],
-    loading_index: 0
+    loading_img: this.props.loading_arr[0]
   };
   render() {
     if (this.props.show) {
       return (
         <Image
-          source={this.state.image_arr[this.state.loading_index]}
-          style={{ width: "20%", height: "10%", backgroundColor: "blue" }}
+          source={this.state.loading_img}
+          style={{ width: 100, height: 20 }}
         />
       );
     } else {
       return null;
     }
   }
+  componentWillMount() {
+    this.changeIndex();
+  }
+
+  changeIndex() {
+    console.log("this.loading_index :" + this.loading_index);
+    setTimeout(() => {
+      if (this.loading_index > this.props.loading_arr.length - 2) {
+        this.loading_index = 0;
+      } else {
+        this.loading_index = this.loading_index + 1;
+      }
+      this.setState({
+        loading_img: this.props.loading_arr[this.loading_index]
+      });
+      this.changeIndex();
+    }, 1);
+  }
 }
 
 class BottomController extends Component {

pages/components/ScheduleFlatItem.js

@@ -78,12 +78,12 @@ export default class ScheduleFlatItem extends Component<Props> {
                 width: "100%",
                 height: "80%",
                 alignItems: "center",
-                justifyContent: "center",
-                backgroundColor: "blue"
+                justifyContent: "center"
               }}
             >
               <Image
-                style={{ width: 20, height: 20, backgroundColor: "blue" }}
+                style={{ width: 20, height: 20 }}
+                source={require("../images/schedulePage/schedule_item_right.png")}
               />
             </View>
             <View style={{ flex: 0.1 }} />

pages/components/SchedulePage.js

@@ -93,9 +93,9 @@ export default class SchedulePage extends BasePage {
               title="第12周 爱上幼儿园"
               lefttype={1}
               righttype={1}
-              textcolor={"red"}
-              // backPress={() => this.goBack()}
-              backPress={() => alert("左侧按钮")}
+              textcolor={"#231F20"}
+              backPress={() => this.goBack()}
+              // backPress={() => alert("左侧按钮")}
               rightPress={() => alert("右侧按钮")}
             />
           </View>