Merge remote-tracking branch 'origin/master'

CarGuo · Jun 12, 2018 · 2b5c234 · 2b5c234
2 parents 9dc5eab + 9d85986
commit 2b5c234
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 41 deletions.
diff --git a/app/components/LoginPage.js b/app/components/LoginPage.js
@@ -77,6 +77,7 @@ class LoginPage extends Component {
             this.refs.lottieView.reset();
         }
     }
+
     startAnimation() {
         if (this.thisUnmount) {
             return;
@@ -175,13 +176,15 @@ class LoginPage extends Component {
                 style={[styles.centered, styles.absoluteFull, {backgroundColor: Constant.primaryColor}, {opacity: this.state.opacity}]}>
                 <StatusBar hidden={false} backgroundColor={Constant.primaryColor} translucent
                            barStyle={'light-content'}/>
-                <View style={[styles.absoluteFull,{zIndex: -999, justifyContent:'flex-end'}]}>
-                    <LottieView
-                        ref="lottieView"
-                        style={{width: screenWidth, height:screenHeight / 2}}
-                        source={require('../style/lottie/animation-login.json')}
-                        progress={this.state.progress}
-                    />
+                <View style={[styles.absoluteFull, {zIndex: -999, justifyContent: 'flex-end'}]}>
+                    <View style={{width: screenWidth, height: screenHeight / 2}}>
+                        <LottieView
+                            ref="lottieView"
+                            style={{width: screenWidth, height: screenHeight / 2}}
+                            source={require('../style/lottie/animation-login.json')}
+                            progress={this.state.progress}
+                        />
+                    </View>
                 </View>
                 <View
                     style={[{backgroundColor: Constant.miWhite}, {

diff --git a/app/components/WelcomePage.js b/app/components/WelcomePage.js
@@ -33,7 +33,7 @@ class WelcomePage extends Component {
 
     componentDidMount() {
         //处理白屏
-        if(Platform.OS === 'android') {
+        if (Platform.OS === 'android') {
             SplashScreen.hide();
         }
         //是否登陆，是否用户信息
@@ -71,16 +71,18 @@ class WelcomePage extends Component {
                     <Image source={require("../img/welcome.png")}
                            resizeMode={"contain"}
                            style={{width: screenWidth, height: screenHeight}}/>
-                    <View style={[{justifyContent:'flex-end', alignItems: 'center', }, styles.absoluteFull]}>
-                        <LottieView
-                            ref="lottieView"
-                            style={{
-                                width: 150,
-                                height: 150,
-                            }}
-                            source={require('../style/lottie/animation-w800-h800.json')}
-                            progress={this.state.progress}
-                        />
+                    <View style={[styles.absoluteFull, styles.centered, {justifyContent: "flex-end"}]}>
+                        <View style={[styles.centered, {width: 150, height:150}]}>
+                            <LottieView
+                                ref="lottieView"
+                                style={{
+                                    width: 150,
+                                    height: 150,
+                                }}
+                                source={require('../style/lottie/animation-w800-h800.json')}
+                                progress={this.state.progress}
+                            />
+                        </View>
                     </View>
                 </View>
             </View>