Merge pull request #12 from SurpassRabbit/develop

1. 优化瀑布流计算图片高度的方法

Author: CodeXYu

app/mobx/News/WelfareMobx.js

@@ -62,11 +62,19 @@ class WelfareMobx {
 
       const results = data.results;
 
+      const defaultHeights = [277, 216, 211, 206, 287, 214];
+
       results.map((item: RTWeal) => {
         const imageWidth = System.SCREEN_WIDTH / 2 - 15;
-        let imageHeight = imageWidth * 1.15;
-        imageHeight = parseInt(Math.random() * 100 + imageHeight);
-        item.height = imageHeight;
+        // let imageHeight = imageWidth * 1.15;
+        // imageHeight = parseInt(Math.random() * 100 + imageHeight);
+        // item.height = imageHeight;
+
+        const id = item._id;
+
+        const hexId = parseInt(id.substring(id.length - 2), 16);
+        item.height = defaultHeights[hexId % 6];
+
         item.width = imageWidth;
 
         item.largeUrl = item.url;

app/pages/News/Welfare/index.js

@@ -35,7 +35,7 @@ class Welfare extends React.Component<Props> {
     this.welfareMobx = new WelfareMobx();
   }
 
-  async componentDidMount() {
+  async componentDidMount(): void {
     await this.welfareMobx.fetchWelfareData(1);
   }
 

app/pages/News/Welfare/index_new.js

@@ -0,0 +1,24 @@
+/**
+ * @flow
+ * Created by Rabbit on 2019-02-25.
+ */
+import React from 'react';
+import { View, Text, Image, StyleSheet } from 'react-native';
+
+type Props = {};
+type State = {};
+export default class index_new extends React.Component<Props, State> {
+  render() {
+    return (
+      <View style={styles.container}>
+
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1
+  }
+});