fix a bug of collection

Author: wangdicoder

js/actions/modifySettings.js

@@ -42,7 +42,7 @@ export function changeAutoFetch(value, flag=true, emitter=false) {
         dao.saveAutoFetchHomeData(value);
     }
 
-    if(emitter) // for only sending notification once
+    if(emitter) // only send notification once
         RCTDeviceEventEmitter.emit('fetch', value);
 
     if(value){

js/components/ListViewForCollection.js

@@ -13,6 +13,7 @@ import WebViewPage from '../containers/WebViewPage';
 import { SwipeListView } from 'react-native-swipe-list-view';
 import {store} from '../store/index';
 import {unStarData} from '../actions/handleCollectionData';
+import RCTDeviceEventEmitter from 'RCTDeviceEventEmitter';
 
 class ListViewForCollection extends Component{
     static propTypes = {
@@ -112,7 +113,7 @@ class ListViewForCollection extends Component{
 
     _itemRemoveOnPress(rowData){
         store.dispatch(unStarData(rowData));
-        this.forceUpdate(); //must refresh dom
+        RCTDeviceEventEmitter.emit('refresh'); //must refresh dom
     }
 
     _handleCreateTime(time){

js/components/ListViewForGirls.js

@@ -60,7 +60,7 @@ class ListViewForGirls extends Component{
                                        source={{uri: this.state.imageUrl}}/>
                             </View>
                             :
-                            <ActivityIndicator size="large"/>
+                            <ActivityIndicator size="large" color={this.props.tabIconColor}/>
                         }
                     </View>
                 </Modal>

js/containers/CollectionTab/index.js

@@ -9,6 +9,7 @@ import {View, Text, ScrollView} from 'react-native';
 import theme from '../../constants/theme';
 import NavigationBar from '../../components/NavigationBar';
 import ListViewForCollection from '../../components/ListViewForCollection';
+import RCTDeviceEventEmitter from 'RCTDeviceEventEmitter';
 
 class CollectionFragment extends Component{
     constructor(props){
@@ -34,6 +35,18 @@ class CollectionFragment extends Component{
             </View>
         );
     }
+
+    componentDidMount(){
+        RCTDeviceEventEmitter.addListener('refresh', this._refreshWholeDOM.bind(this));
+    }
+
+    componentWillUnmount(){
+        RCTDeviceEventEmitter.removeListener('refresh', this._refreshWholeDOM.bind(this));
+    }
+
+    _refreshWholeDOM(){
+        this.forceUpdate();
+    }
 }
 
 const mapStateToProps = (state) => {

js/containers/DiscoveryTab/GirlsPage.js

@@ -84,12 +84,12 @@ class GirlsPage extends BackPageComponent{
     }
 
     _fethchData(){
-        this.props.actions.fetchData('福利/10/1');
+        this.props.actions.fetchData('福利/20/1');
     }
 
     _listViewOnEndReached(){
         if(!this.props.isRenderFooter) {
-            this.props.actions.fetchMoreData('福利/10/'+this.props.pageNumber);
+            this.props.actions.fetchMoreData('福利/20/'+this.props.pageNumber);
         }
     }
 

js/containers/HomeTab/index.js

@@ -95,6 +95,10 @@ class HomeFragment extends Component{
         this.props.actions.fetchDataIfNeed(getCurrentDate());
     }
 
+    /**
+     * the speed of render is faster than that of getting setting value.
+     * this is for when gets the setting value, home page decides whether to refresh the content.
+     */
     componentDidMount(){
         RCTDeviceEventEmitter.addListener('fetch', this._handleEventEmitter.bind(this));
     }

js/containers/WebViewPage.js

@@ -15,6 +15,7 @@ import {bindActionCreators} from 'redux';
 import * as Actions from '../actions/handleCollectionData';
 import Toast from 'react-native-root-toast';
 import ShareUtil from '../utils/ShareUtil';
+import RCTDeviceEventEmitter from 'RCTDeviceEventEmitter';
 
 class WebViewPage extends BackPageComponent{
     constructor(props){
@@ -204,6 +205,7 @@ class WebViewPage extends BackPageComponent{
             share.share(this.props.rowData.desc, this.props.rowData.url);
         }else if(id === 7){
             this.props.actions.unStarData(this.props.rowData);
+            RCTDeviceEventEmitter.emit('refresh');
         }else if(id === 8){
             this.props.actions.starData(this.props.rowData);
         }else if(id === 9){