1. Flow类型优化

CodeXYu · CodeXYu · commit d096458fa5b2 · 2019-03-13T11:46:45.000+08:00
2. 去掉冗余代码
diff --git a/.flowconfig b/.flowconfig
@@ -69,4 +69,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.78.0
+^0.86.0
diff --git a/app/mobx/News/BuDeJieMobx.js b/app/mobx/News/BuDeJieMobx.js
@@ -42,7 +42,7 @@ const JOKE_ITEM_WIDTH = SCREEN_WIDTH - px2dp(40);
 const JOKE_FONT_SIZE = FONT_SIZE(17);
 
 class BuDeJieMobx extends ConfigStore {
-  static async handleJokeTextWidth(text) {
+  static async handleJokeTextWidth(text: string) {
     const heights = await MeasureText.heights({
       texts: [text],
       width: JOKE_ITEM_WIDTH,
@@ -52,9 +52,7 @@ class BuDeJieMobx extends ConfigStore {
     return parseFloat(heights.join());
   }
 
-  static async handleLargeListData(parameters) {
-    const { data, type } = parameters;
-
+  static async handleLargeListData(data: Array<RTBDJList>, type: any) {
     const containerHeight =
       SCREEN_HEIGHT -
       DEFAULT_TAB_BAR_HEIGHT -
@@ -63,7 +61,7 @@ class BuDeJieMobx extends ConfigStore {
       DEFAULT_SCROLL_TOP_BAR_HEIGHT -
       DEFAULT_SPACE_HEIGHT;
 
-    const dataSource: Array = [];
+    const dataSource: Array<any> = [];
 
     const largeListData = { items: [] };
     const _containerHeight = containerHeight;
@@ -85,8 +83,7 @@ class BuDeJieMobx extends ConfigStore {
       item.isLongPictureCanOpened = !(height > _containerHeight && height > MAX_SCREEN_IMAGE_HEIGHT && !isGif);
 
       const JokeHeight = await BuDeJieMobx.handleJokeTextWidth(item.text);
-      const ImageHeight = item.imageHeight;
-      // const ImageHeight = 0;
+      const ImageHeight = item?.imageHeight ? item.imageHeight : 0;
       item.itemHeight = USER_INFO_HEIGHT + JokeHeight + ImageHeight + ITEM_HEIGHT_SPACE_HEIGHT;
 
       const {
@@ -106,7 +103,8 @@ class BuDeJieMobx extends ConfigStore {
         theme_name,
         is_gif,
         gifFistFrame,
-        imageHeight
+        imageHeight,
+        itemHeight
       } = item;
 
       const userInfoData = { profile_image, name, passtime, theme_name, type };
@@ -124,7 +122,8 @@ class BuDeJieMobx extends ConfigStore {
         is_gif,
         type,
         gifFistFrame,
-        ...item
+        itemHeight,
+        ...jokeData
       };
 
       item.userInfoData = userInfoData;
@@ -146,12 +145,7 @@ class BuDeJieMobx extends ConfigStore {
   @observable
   maxtime: string = '';
   @observable
-  largeListData: Array = [{ items: [] }];
-
-  constructor(type) {
-    super();
-    console.log('type------', type);
-  }
+  largeListData: Array<any> = [{ items: [] }];
 
   /**
    * imageHeight: 所有Item中，Image的高度
@@ -165,10 +159,7 @@ class BuDeJieMobx extends ConfigStore {
     try {
       const buDeJieData: RTBDJResult = await loadBuDeJieData(type, value);
 
-      const { largeListData, dataSource } = await BuDeJieMobx.handleLargeListData({
-        data: buDeJieData.list,
-        type: type
-      });
+      const { largeListData, dataSource } = await BuDeJieMobx.handleLargeListData(buDeJieData.list, type);
 
       console.log('largeListData', largeListData);
 
@@ -190,12 +181,10 @@ class BuDeJieMobx extends ConfigStore {
       }
 
       console.log('this.largeListData.slice', this.largeListData.slice());
-
     } catch (e) {
       this.showErrorView(e);
     }
   }
-
 }
 
 export { BuDeJieMobx };
diff --git a/app/pages/Login/Register.js b/app/pages/Login/Register.js
@@ -22,7 +22,9 @@ export class Register extends React.Component<Props> {
         <Button
           title={'点我跳转'}
           onPress={() => {
-            this.props.navigation.push('Login');
+            // this.props.navigation.push('Login');
+            // this.props.navigation.navigate('AppRouter');
+            this.props.navigation.navigate('WebView', {data: '123'});
           }}
         />
       </BaseContainer>
diff --git a/app/pages/News/BuDeJie/Components/BaseItem.js b/app/pages/News/BuDeJie/Components/BaseItem.js
@@ -22,7 +22,7 @@ type Props = {
 };
 
 const BaseItem = (props: Props) => {
-  const { userInfoData, toolBarData } = props.itemData;
+  const { userInfoData } = props.itemData;
   const { itemData, itemPress, picturePress, videoPress } = props;
 
   // console.log('itemData', itemData);
diff --git a/app/pages/News/BuDeJie/Components/Items/JokeItem.js b/app/pages/News/BuDeJie/Components/Items/JokeItem.js
@@ -24,11 +24,9 @@ export const JokeItem = (props: Props) => {
 const styles = StyleSheet.create({
   jokeView: {
     marginHorizontal: px2dp(20),
-    // marginTop: 3,
     marginVertical: px2dp(10)
   },
   jokeText: {
-    // lineHeight: px2dp(44),
     fontSize: FONT_SIZE(17)
   }
 });
diff --git a/app/pages/News/BuDeJie/Components/Items/PictureItem.js b/app/pages/News/BuDeJie/Components/Items/PictureItem.js
@@ -22,11 +22,8 @@ const renderPicture = (props: Props) => {
     is_gif,
     gifFistFrame,
     isLongPictureCanOpened,
-    itemHeight
   } = props.pictureData;
 
-  // console.log('pictureData', props.pictureData);
-
   const isLongPictureCanOpenedAndNoGif = isLongPictureCanOpened && is_gif === '0';
 
   if (isLongPicture) {
diff --git a/app/pages/News/BuDeJie/Components/Items/VideoItem.js b/app/pages/News/BuDeJie/Components/Items/VideoItem.js
@@ -4,11 +4,12 @@
  */
 
 import React from 'react';
-import { StyleSheet, Text, View, Image } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 
 import { CustomImage, Button } from '../../../../../components';
 import type { Picture } from '../../../../../servers/News/interfaces';
 import Icon from 'react-native-vector-icons/FontAwesome';
+import { System } from '../../../../../utils';
 
 type Props = {
   pictureData: Picture,
@@ -38,7 +39,9 @@ export const VideoItem = (props: Props) => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    marginHorizontal: px2dp(20),
-    // marginVertical: px2dp(10)
+    marginHorizontal: px2dp(20)
+  },
+  picture: {
+    width: System.SCREEN_WIDTH - px2dp(40)
   }
 });
diff --git a/app/pages/News/BuDeJie/index_new.js b/app/pages/News/BuDeJie/index_new.js
@@ -80,7 +80,7 @@ class BuDeJie extends React.Component<Props, any> {
     const { largeListData } = this.buDeJieMobx;
 
     const item = largeListData[section].items[row];
-    console.log('item-----', item);
+    // console.log('item-----', item);
     return (
       <BaseItem
         itemData={item}
@@ -102,7 +102,7 @@ class BuDeJie extends React.Component<Props, any> {
         data={largeListData}
         ref={ref => (this._list = ref)}
         heightForIndexPath={({ section, row }: { section: number, row: number }) => {
-          const item = largeListData[section].items[row];
+          const item: RTBDJList = largeListData[section].items[row];
           return item.itemHeight;
         }}
         renderIndexPath={this.renderItem}
diff --git a/app/pages/News/News.js b/app/pages/News/News.js
@@ -19,7 +19,6 @@ import { BuDeJieDetail } from './BuDeJieDetail';
 
 import type { NavigationState } from 'react-navigation';
 import type { RTBuDeJieType } from '../../servers/News';
-import MeasureText from 'react-native-measure-text';
 
 type State = {
   typeArr: Array<typeItem>
@@ -31,25 +30,25 @@ type typeItem = {
   navigate: NavigationState
 };
 
-@inject('powerStore')
+@inject('powerStore', 'configStore')
 @observer
 class News extends React.Component<any, State> {
-  async componentDidMount(): void {
-
+  componentDidMount = async () => {
+    console.log('navigation', this.props.navigation);
     this.props.navigation.setParams({
       title: '百思不得姐'
     });
-  }
+  };
 
   constructor(props: any) {
     super(props);
     const { navigate } = this.props.navigation;
     this.state = {
       typeArr: [
+        { title: '笑话', type: 29, navigate: navigate },
         { title: '图片', type: 10, navigate: navigate },
         { title: '全部', type: 1, navigate: navigate },
         { title: '视频', type: 41, navigate: navigate },
-        { title: '笑话', type: 29, navigate: navigate },
         { title: '福利', type: '福利', navigate: navigate }
       ]
     };
@@ -74,6 +73,7 @@ class News extends React.Component<any, State> {
                   tabLabel={item.title}
                   key={i}
                   navigate={item.navigate}
+                  configStore={this.props.configStore}
                   powerStore={this.props.powerStore}
                 />
               );
diff --git a/app/pages/News/Welfare/index.js b/app/pages/News/Welfare/index.js
@@ -8,7 +8,7 @@ import { WaterfallList } from 'react-native-largelist-v3';
 import { NormalFooter } from 'react-native-spring-scrollview/NormalFooter';
 
 import { WelfareMobx } from '../../../mobx/News';
-import { inject, observer } from 'mobx-react';
+import { observer } from 'mobx-react';
 import type { RTWeal } from '../../../servers/News/interfaces';
 import { Button, CustomImage } from '../../../components';
 import { System } from '../../../utils';
@@ -22,17 +22,19 @@ type Props = {
   powerStore: PowerStore,
   configStore: ConfigStore
 };
-@inject('powerStore', 'configStore')
 @observer
 class Welfare extends React.Component<Props> {
-  constructor(props) {
+  welfareMobx: WelfareMobx;
+  customPopView: any;
+
+  constructor(props: any) {
     super(props);
     this.welfareMobx = new WelfareMobx();
   }
 
-  async componentDidMount(): void {
+  componentDidMount = async () => {
     await this.welfareMobx.loadWelfareData('refreshing');
-  }
+  };
 
   actionSheetToSaveImage = (item: RTWeal) => {
     const items = [
diff --git a/app/pages/ShiTu/index.js b/app/pages/ShiTu/index.js
@@ -6,12 +6,7 @@
 import React, { Component } from 'react';
 import {
   StyleSheet,
-  Text,
-  View,
   ImageBackground,
-  StatusBar,
-  NativeModules,
-  DeviceInfo,
   DeviceEventEmitter
 } from 'react-native';
 
@@ -27,7 +22,7 @@ import * as Animatable from 'react-native-animatable';
 const AnimationButton = Animatable.createAnimatableComponent(GradientButton);
 const AnimationImageBackground = Animatable.createAnimatableComponent(ImageBackground);
 
-import { ActionSheet, Theme } from 'teaset';
+import { ActionSheet } from 'teaset';
 import * as ImagePicker from 'react-native-image-picker';
 import { ConfigStore } from '../../store/ConfigStore';
 import type { NavigationScreenProp } from 'react-navigation';
diff --git a/app/pages/WebView/index.js b/app/pages/WebView/index.js
@@ -38,6 +38,7 @@ export default class index extends React.Component<Props, State> {
     const { uri } = this.props.navigation.state.params;
 
     console.log('webView地址', uri);
+    console.log('navigation', this.props.navigation);
 
     this.state = {
       active: false,
diff --git a/app/routers/AuthRouter.js b/app/routers/AuthRouter.js
@@ -8,6 +8,7 @@ import React from 'react';
 import { createStackNavigator } from 'react-navigation';
 
 import { Login } from '../pages/Login';
+import { Register } from '../pages/Login/Register';
 
 export const AuthRouter = createStackNavigator(
   {
@@ -16,6 +17,12 @@ export const AuthRouter = createStackNavigator(
       navigationOptions: () => ({
         header: null
       })
+    },
+    Register: {
+      screen: Register,
+      navigationOptions: () => ({
+        header: null
+      })
     }
   },
   {
diff --git a/app/servers/News/interfaces.js b/app/servers/News/interfaces.js
@@ -133,4 +133,5 @@ export interface Picture extends RTBDJList {
   containerHeight: number;
   weixin_url: string;
   gifFistFrame: string;
+  itemHeight: number;
 }
diff --git a/app/store/PowerStore.js b/app/store/PowerStore.js
@@ -3,7 +3,7 @@
  * Created by Rabbit on 2018/8/7.
  */
 
-import { observable, action, computed, runInAction } from 'mobx';
+import { observable, action, runInAction } from 'mobx';
 import { AsyncStorage } from 'react-native';
 
 const ST_BACKGROUND_IMAGE = 'ST_BACKGROUND_IMAGE';
@@ -16,7 +16,7 @@ class PowerStore {
     this.handleShiTuBackgroundImage();
   }
 
-  @action
+  @action.bound
   handleShiTuBackgroundImage = () => {
     let image_url;
 
diff --git a/flow-typed/index.js b/flow-typed/index.js
@@ -16,6 +16,7 @@ declare var Android: boolean;
 declare var Toast: Function;
 declare var ApiConfig: Function;
 declare var isIPhoneX: any;
+declare var Theme: any;
 
 
 
