no message

Author: CodeXYu

android/app/src/main/AndroidManifest.xml

@@ -2,13 +2,23 @@
   package="com.shitu">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+
 
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
+      android:largeHeap="true"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
@@ -18,6 +28,7 @@
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
+            <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

app/components/CustomToast/index.js

@@ -7,7 +7,7 @@ import React from 'react';
 import { StyleSheet, Text, View, Image, ActivityIndicator } from 'react-native';
 
 type Props = {
-  style: any
+  style?: any
 };
 const CustomToast = (props: Props) => {
   const { style } = props;

app/components/PopoverItems/PopoverActionSheetItem.js

@@ -4,20 +4,30 @@
  */
 
 import React, { Component } from 'react';
-import { StyleSheet, View, Text, TouchableOpacity } from 'react-native';
+import { View, Text, TouchableOpacity } from 'react-native';
 
 import Theme from 'teaset/themes/Theme';
+import PropTypes from 'prop-types';
 
 type Props = {
   type: 'default' | 'cancel',
   title: string,
   topSeparator: 'none' | 'full' | 'indent',
   bottomSeparator: 'none' | 'full' | 'indent',
   disabled: boolean,
-  ...TouchableOpacity
+  ...TouchableOpacity.propTypes
 };
 
 export default class ActionSheetItem extends Component<Props> {
+  static propTypes = {
+    ...TouchableOpacity.propTypes,
+    type: PropTypes.oneOf(['default', 'cancel']),
+    title: PropTypes.oneOfType([PropTypes.element, PropTypes.string, PropTypes.number]),
+    topSeparator: PropTypes.oneOfType([PropTypes.element, PropTypes.oneOf(['none', 'full', 'indent'])]),
+    bottomSeparator: PropTypes.oneOfType([PropTypes.element, PropTypes.oneOf(['none', 'full', 'indent'])]),
+    disabled: PropTypes.bool
+  };
+
   static defaultProps = {
     ...TouchableOpacity.defaultProps,
     type: 'default',
@@ -26,11 +36,9 @@ export default class ActionSheetItem extends Component<Props> {
     disabled: false
   };
 
-  buildProps() {
-    let { style, title, topSeparator, bottomSeparator, activeOpacity, ...others } = this.props;
-
-    const { type, disabled, onPress } = this.props;
-
+  buildStyle() {
+    let { style } = this.props;
+    const { type } = this.props;
     style = [
       {
         backgroundColor: type === 'cancel' ? Theme.asCancelItemColor : Theme.asItemColor,
@@ -43,105 +51,92 @@ export default class ActionSheetItem extends Component<Props> {
         justifyContent: 'center'
       }
     ].concat(style);
+    return style;
+  }
 
-    let textStyle, separatorStyle;
+  renderSeparator(separator) {
+    const { type } = this.props;
+
+    const indentViewStyle = {
+      backgroundColor: 'rgba(0,0,0,0)',
+      paddingLeft: Theme.asItemPaddingLeft
+    };
+    let separatorStyle;
     if (type === 'cancel') {
-      textStyle = {
-        backgroundColor: 'rgba(0, 0, 0, 0)',
-        color: 'red',
-        fontSize: Theme.asCancelItemFontSize,
-        textAlign: Theme.asCancelItemTitleAlign,
-        opacity: disabled ? Theme.asItemDisabledOpacity : 1,
-        overflow: 'hidden'
-      };
       separatorStyle = {
         backgroundColor: Theme.asCancelItemSeparatorColor,
         height: Theme.asCancelItemSeparatorLineWidth
       };
     } else {
-      textStyle = {
-        backgroundColor: 'rgba(0, 0, 0, 0)',
-        color: Theme.asItemTitleColor,
-        fontSize: Theme.asItemFontSize,
-        textAlign: Theme.asItemTitleAlign,
-        opacity: disabled ? Theme.asItemDisabledOpacity : 1,
-        overflow: 'hidden'
-      };
       separatorStyle = {
         backgroundColor: Theme.asItemSeparatorColor,
         height: Theme.asItemSeparatorLineWidth
       };
     }
-
-    if ((title || title === '' || title === 0) && !React.isValidElement(title)) {
-      title = (
-        <Text style={textStyle} numberOfLines={1}>
-          {title}
-        </Text>
-      );
-    }
-
-    const indentViewStyle = {
-      backgroundColor: StyleSheet.flatten(style).backgroundColor,
-      paddingLeft: Theme.asItemPaddingLeft
-    };
-    switch (topSeparator) {
-      case 'none':
-        topSeparator = null;
-        break;
-      case 'full':
-        topSeparator = <View style={separatorStyle} />;
-        break;
-      case 'indent':
-        topSeparator = (
-          <View style={indentViewStyle}>
-            <View style={separatorStyle} />
-          </View>
-        );
-        break;
-    }
-    switch (bottomSeparator) {
-      case 'none':
-        bottomSeparator = null;
-        break;
+    switch (separator) {
       case 'full':
-        bottomSeparator = <View style={separatorStyle} />;
-        break;
+        return <View style={separatorStyle} />;
       case 'indent':
-        bottomSeparator = (
+        return (
           <View style={indentViewStyle}>
             <View style={separatorStyle} />
           </View>
         );
-        break;
+      default:
+        return null;
     }
+  }
 
-    if (disabled) activeOpacity = 1;
+  renderTitle() {
+    const { type, title, disabled } = this.props;
+    if (title === null || title === undefined || React.isValidElement(title)) return title;
 
-    this.props = {
+    let textStyle;
+    if (type === 'cancel') {
+      textStyle = {
+        backgroundColor: 'rgba(0, 0, 0, 0)',
+        color: Theme.asCancelItemTitleColor,
+        fontSize: Theme.asCancelItemFontSize,
+        textAlign: Theme.asCancelItemTitleAlign,
+        opacity: disabled ? Theme.asItemDisabledOpacity : 1,
+        overflow: 'hidden'
+      };
+    } else {
+      textStyle = {
+        backgroundColor: 'rgba(0, 0, 0, 0)',
+        color: Theme.asItemTitleColor,
+        fontSize: Theme.asItemFontSize,
+        textAlign: Theme.asItemTitleAlign,
+        opacity: disabled ? Theme.asItemDisabledOpacity : 1,
+        overflow: 'hidden'
+      };
+    }
+    return (
+      <Text style={textStyle} numberOfLines={1}>
+        {title}
+      </Text>
+    );
+  }
+
+  render() {
+    const {
       style,
+      children,
       type,
       title,
       topSeparator,
       bottomSeparator,
       disabled,
       activeOpacity,
-      onPress,
       ...others
-    };
-  }
-
-  render() {
-    this.buildProps();
-
-    const { style, title, topSeparator, bottomSeparator, ...others } = this.props;
+    } = this.props;
     return (
       <View style={{ backgroundColor: 'rgba(0, 0, 0, 0)' }}>
-        {topSeparator}
-        <TouchableOpacity style={style} {...others}>
-          {title}
+        {this.renderSeparator(topSeparator)}
+        <TouchableOpacity style={this.buildStyle()} activeOpacity={disabled ? 1 : activeOpacity} {...others}>
+          {this.renderTitle()}
         </TouchableOpacity>
-        {bottomSeparator}
+        {this.renderSeparator(bottomSeparator)}
       </View>
     );
   }

app/components/TableList/index.js

@@ -152,7 +152,7 @@ export default class index<ItemT> extends React.Component<Props<ItemT>, State<It
   value: ?number | ?string;
   // _flatList: ?React.ElementRef<any> = null;
 
-  _flatList: null | VirtualizedList | ScrollView;
+  _flatList: any;
 
   constructor(props: Props<ItemT>) {
     super(props);

app/components/Toast/index.js

@@ -21,7 +21,7 @@ type Props = {
   positionValue: number | any,
   fadeInDuration?: number,
   fadeOutDuration?: number,
-  opacity?: number,
+  opacity?: any | ?number,
   defaultCloseDelay?: number
 };
 

app/components/index.js

@@ -19,7 +19,7 @@ import LoadingSpinner from './LoadingSpinner';
 import MyTextInput from './MyTextInput';
 import CustomToast from './CustomToast';
 import ErrorView from './ErrorView';
-// import PopoverActionSheetItem from './PopoverItems/PopoverActionSheetItem';
+import PopoverActionSheetItem from './PopoverItems/PopoverActionSheetItem';
 // import PopoverPickerViewItem from './PopoverItems/PopoverPickerViewItem';
 
 export {
@@ -37,6 +37,6 @@ export {
   MyTextInput,
   CustomToast,
   ErrorView,
-  // PopoverActionSheetItem,
+  PopoverActionSheetItem,
   // PopoverPickerViewItem
 };

app/mobx/News/BuDeJieMobx.js

@@ -22,7 +22,7 @@ const MAX_SCREEN_IMAGE_HEIGHT = 7000;
 /*
  * 顶部UserInfo的高度， px2dp(100)为整体预估高度， px2dp(10)为距离顶部的margin高度
  */
-const USER_INFO_HEIGHT = px2dp(100) + px2dp(10);
+const USER_INFO_HEIGHT = px2dp(100);
 
 /**
  * 文字有marginVertical: px2dp(10)属性
@@ -33,13 +33,16 @@ const JOKE_SPACE_HEIGHT = px2dp(20);
  *  px2dp(20) 为底部间距高度
  */
 const ITEM_HEIGHT_SPACE_HEIGHT = px2dp(10) + JOKE_SPACE_HEIGHT;
+// const ITEM_HEIGHT_SPACE_HEIGHT = JOKE_SPACE_HEIGHT;
 
 const DEFAULT_SPACE_HEIGHT = 10;
 const DEFAULT_TAB_BAR_HEIGHT = 49;
 const DEFAULT_SCROLL_TOP_BAR_HEIGHT = 54;
 
 const JOKE_ITEM_WIDTH = SCREEN_WIDTH - px2dp(40);
-const JOKE_FONT_SIZE = FONT_SIZE(17);
+// const JOKE_ITEM_WIDTH = SCREEN_WIDTH ;
+// const JOKE_FONT_SIZE = FONT_SIZE(17);
+const JOKE_FONT_SIZE = 17;
 
 class BuDeJieMobx extends ConfigStore {
   static async handleJokeTextWidth(text: string) {
@@ -48,7 +51,7 @@ class BuDeJieMobx extends ConfigStore {
       width: JOKE_ITEM_WIDTH,
       fontSize: JOKE_FONT_SIZE,
       fontWeight: 'normal',
-      fontFamily: Android ? 'normal' : 'Heiti SC',
+      fontFamily: Android ? 'normal' : 'Heiti SC'
     });
     console.log('heights', heights);
     return parseFloat(heights.join());
@@ -87,6 +90,9 @@ class BuDeJieMobx extends ConfigStore {
       const JokeHeight = await BuDeJieMobx.handleJokeTextWidth(item.text);
       const ImageHeight = item?.imageHeight ? item.imageHeight : 0;
       item.itemHeight = USER_INFO_HEIGHT + JokeHeight + ImageHeight + ITEM_HEIGHT_SPACE_HEIGHT;
+      // item.itemHeight = JokeHeight + ImageHeight + ITEM_HEIGHT_SPACE_HEIGHT;
+
+      console.log('itemHeight', item.itemHeight);
 
       const {
         text,
@@ -157,27 +163,19 @@ class BuDeJieMobx extends ConfigStore {
    */
   @action.bound
   async fetchBuDeJieData(type: RTBuDeJieType, value: string) {
-    console.log('value', type, value);
     try {
       const buDeJieData: RTBDJResult = await loadBuDeJieData(type, value);
 
-      console.log('data', buDeJieData);
-      
-
       const { largeListData, dataSource } = await BuDeJieMobx.handleLargeListData(buDeJieData.list, type);
 
-      console.log('largeListData', largeListData);
 
       if (value === '') {
-        console.log('第一次加载？value', value);
         runInAction(() => {
           this.dataSource = dataSource;
           this.largeListData = [largeListData];
           this.maxtime = buDeJieData.info.maxid;
         });
       } else {
-        console.log('加载更多？value', value);
-        console.log('largeListData-----', this.largeListData[0].items);
         runInAction(() => {
           this.dataSource = this.dataSource.concat(dataSource);
           this.largeListData = this.largeListData.concat([largeListData]);
@@ -187,7 +185,7 @@ class BuDeJieMobx extends ConfigStore {
 
       console.log('this.largeListData.slice', this.largeListData.slice());
     } catch (e) {
-      this.showErrorView(e);
+      this.showErrorView(e.message);
       console.log('e', e.message);
     }
   }

app/mobx/News/WelfareMobx.js

@@ -45,9 +45,8 @@ class WelfareMobx extends ConfigStore {
 
     try {
       // 下载图片
-      await FetchBlob.config(config)
-        .fetch('GET', url)
-        .then(() => FetchBlob.fs.scanFile([{ path: Dirs.DCIMDir + imageName }]));
+      await FetchBlob.config(config).fetch('GET', url);
+      FetchBlob.fs.scanFile([{ path: Dirs.DCIMDir + imageName, mime: '' }])
       alert('保存成功');
     } catch (e) {
       console.log(e);
@@ -83,7 +82,6 @@ class WelfareMobx extends ConfigStore {
         });
       } else {
         runInAction(() => {
-
           this.page = 1;
           this.dataSource = results;
         });