1. WebView添加hideLoading

2. 点击放大的图片宽度减少

Author: CodeXYu

app/components/BaseContainer/index.js

@@ -9,12 +9,14 @@ import { View, StyleSheet } from 'react-native';
 import { observer } from 'mobx-react';
 import { NavigationEvents } from 'react-navigation';
 import NetInfo from '@react-native-community/netinfo';
+import type { ConnectionType } from '@react-native-community/netinfo';
 
 import { NavigatorBar, LoadingSpinner, ErrorView } from '../index';
 import { Theme } from 'teaset';
+import { ConfigStore } from '../../store/ConfigStore';
 
 type Props = {
-  store?: Object, // 页面中的mobx状态
+  store?: ConfigStore, // 页面中的mobx状态
   onErrorPress?: Function, // 出错页面的点击事件
   navBar?: any, // 导航条
   children?: any,
@@ -58,6 +60,7 @@ type State = {
 class BaseContainer extends Component<Props, State> {
   netInfoListen: any;
   componentWillUnmount() {
+    this.props.store && this.props.store.hideLoading();
     this.netInfoListen && NetInfo.removeEventListener('connectionChange', this.networkHandle);
   }
 
@@ -72,7 +75,7 @@ class BaseContainer extends Component<Props, State> {
     }
   };
 
-  networkHandle = (netInfo: NetType) => {
+  networkHandle = (netInfo: any) => {
     const { netInfoCallBack } = this.props;
     const network: NetType = this.getNetInfoStatus(netInfo);
 
@@ -82,7 +85,7 @@ class BaseContainer extends Component<Props, State> {
   };
 
   getNetInfoStatus = (netInfo: any) => {
-    const type: string = netInfo.type;
+    const type: ConnectionType = netInfo.type;
     return {
       isConnect: type.toUpperCase() === 'WIFI' || type.toUpperCase() === 'CELLULAR',
       isWifi: type.toUpperCase() === 'WIFI',

app/pages/News/BuDeJie/index.js

@@ -60,6 +60,9 @@ const BuDeJie = observer(function(props: Props) {
     if (item.isLongPicture || !item.is_gif) {
       navigation.navigate('WebView', { uri: item.weixin_url });
     } else {
+
+      const height = isIPhoneX ? SCREEN_HEIGHT - 44 - 49 : SCREEN_HEIGHT;
+
       const overlayView = (
         <Overlay.PopView
           style={{ alignItems: 'center', justifyContent: 'center' }}
@@ -76,7 +79,7 @@ const BuDeJie = observer(function(props: Props) {
               style={{
                 backgroundColor: 'black',
                 width: SCREEN_WIDTH,
-                height: SCREEN_HEIGHT
+                height: height
               }}
             />
           </Button>

app/pages/News/Welfare/index.js

@@ -73,7 +73,7 @@ const Welfare = observer(function(props: Props) {
         >
           <CustomImage
             source={{ uri: item.largeUrl }}
-            resizeMode="cover"
+            // resizeMode="cover"
             style={{
               backgroundColor: 'white',
               width: SCREEN_WIDTH,

app/pages/WebView/index.js

@@ -55,6 +55,8 @@ export default class index extends React.Component<Props, State> {
   }
 
   componentWillUnmount() {
+    const { configStore } = this.context;
+    configStore.hideLoading();
     // this.props.configStore.hideLoading();
     StatusBar.setHidden(false);
   }