修改 数据传输方式 review by chenlin

@@ -50,6 +50,15 @@ import {
 	setActivityId,
 	setActivityId,
 } from './reducers/app/appActions';
 } from './reducers/app/appActions';
 
 
+import {
+	updateDataSource
+} from './reducers/screenSub/screenSubActions';
+
+import {
+	updateCategoryDataSource
+} from './reducers/screenCategory/screenCategoryActions';
+
+
 function getInitialState() {
 function getInitialState() {
 	const _initState = {
 	const _initState = {
 		app: (new appInitialState()),
 		app: (new appInitialState()),
@@ -71,8 +80,7 @@ export default function native(platform) {
 		render() {
 		render() {
 		  	const store = configureStore(getInitialState());
 		  	const store = configureStore(getInitialState());
 			store.dispatch(setPlatform(platform));
 			store.dispatch(setPlatform(platform));
-			let {host, serviceHost, channel, type, brand_id, shop_id, dictParams, saleType, activityId} = this.props;
-
+			let {host, serviceHost, channel, type, brand_id, shop_id, dictParams, saleType, activityId, filterSubMap} = this.props;
 			store.dispatch(setHost(host));
 			store.dispatch(setHost(host));
 			store.dispatch(setServiceHost(serviceHost));
 			store.dispatch(setServiceHost(serviceHost));
 			store.dispatch(setChannel(channel));
 			store.dispatch(setChannel(channel));
@@ -90,12 +98,14 @@ export default function native(platform) {
 					</Provider>
 					</Provider>
 				);
 				);
 			} else if(type == 'YH_ProductFilterCategoryView' ){
 			} else if(type == 'YH_ProductFilterCategoryView' ){
+				store.dispatch(updateCategoryDataSource(filterSubMap));
 				return (
 				return (
 					<Provider store={store}>
 					<Provider store={store}>
 						<ScreenCategoryContainer />
 						<ScreenCategoryContainer />
 					</Provider>
 					</Provider>
 				);
 				);
 			} else if (type == 'YH_ProductFilterSubView' ){
 			} else if (type == 'YH_ProductFilterSubView' ){
+				store.dispatch(updateDataSource(filterSubMap));
 				return (
 				return (
 					<Provider store={store}>
 					<Provider store={store}>
 						<ScreenSubContainer />
 						<ScreenSubContainer />

 'use strict';
 'use strict';
 
 
 import React, {Component} from 'react';
 import React, {Component} from 'react';
-import {
+import ReactNative,{
     StyleSheet,
     StyleSheet,
     Dimensions,
     Dimensions,
     Platform,
     Platform,
     View,
     View,
     Text,
     Text,
     ListView,
     ListView,
+    NativeAppEventEmitter,
 } from 'react-native';
 } from 'react-native';
 
 
 import {Map} from 'immutable';
 import {Map} from 'immutable';
@@ -121,6 +122,11 @@ export default class ProductListForShop extends Component {
                     dataSource={this.dataSource.cloneWithRowsAndSections(dataSource)}
                     dataSource={this.dataSource.cloneWithRowsAndSections(dataSource)}
                     renderRow={this.renderRow}
                     renderRow={this.renderRow}
                     renderSectionHeader={this.renderSectionHeader}
                     renderSectionHeader={this.renderSectionHeader}
+                    onScroll={(event) => {
+                        console.log('onScrollonScrollonScroll')
+                        console.log(event.nativeEvent.contentOffset.y)
+                        ReactNative.NativeModules.YH_ProductListRNViewHelper.hideNavigationBar(true);
+                    }}
                     renderFooter={()=>{
                     renderFooter={()=>{
                         if (endReached) {
                         if (endReached) {
                             return <View style={styles.placeholder} />;
                             return <View style={styles.placeholder} />;

@@ -49,13 +49,6 @@ class ScreenCategoryContainer extends Component {
         super(props);
         super(props);
         this.selectItem = this.selectItem.bind(this);
         this.selectItem = this.selectItem.bind(this);
         this.selectSubItem = this.selectSubItem.bind(this);
         this.selectSubItem = this.selectSubItem.bind(this);
-        this.updateFilterCategory = this.updateFilterCategory.bind(this);
-        this.subscription = NativeAppEventEmitter.addListener(
-            'updateFilterCategoryView',
-            (dic) => {
-                this.updateFilterCategory(dic);
-            }
-        );
     }
     }
 
 
     componentWillUnmount() {
     componentWillUnmount() {
@@ -72,12 +65,6 @@ class ScreenCategoryContainer extends Component {
         ReactNative.NativeModules.YH_FilterHelper.didSelectCategoryItemFilter({data,key});
         ReactNative.NativeModules.YH_FilterHelper.didSelectCategoryItemFilter({data,key});
     }
     }
 
 
-    updateFilterCategory(dic){
-        if (dic) {
-             this.props.actions.updateDataSource(dic);
-        }
-    }
-
     render() {
     render() {
         let {app, screenCategory} = this.props;
         let {app, screenCategory} = this.props;
         return (
         return (

@@ -48,25 +48,12 @@ class ScreenSubContainer extends Component {
     constructor(props) {
     constructor(props) {
         super(props);
         super(props);
         this.selectItem = this.selectItem.bind(this);
         this.selectItem = this.selectItem.bind(this);
-        this.updateFilterSub = this.updateFilterSub.bind(this);
-        this.subscription = NativeAppEventEmitter.addListener(
-            'updateFilterSub',
-            (dic) => {
-                this.updateFilterSub(dic);
-            }
-        );
     }
     }
 
 
     componentWillUnmount() {
     componentWillUnmount() {
         this.subscription && this.subscription.remove();
         this.subscription && this.subscription.remove();
     }
     }
 
 
-    updateFilterSub(dic){
-        if (dic) {
-            this.props.actions.updateDataSource(dic);
-        }
-    }
-
     selectItem(data,key){
     selectItem(data,key){
         this.props.actions.selectItem(data,key);
         this.props.actions.selectItem(data,key);
         ReactNative.NativeModules.YH_FilterHelper.didSelectFilterSubItem({data,key});
         ReactNative.NativeModules.YH_FilterHelper.didSelectFilterSubItem({data,key});

@@ -9,7 +9,7 @@ const {
 } = require('../../constants/actionTypes').default;
 } = require('../../constants/actionTypes').default;
 
 
 
 
-export function updateDataSource(data) {
+export function updateCategoryDataSource(data) {
 	return {
 	return {
         type: SET_DATASOURCE_CATEGORY,
         type: SET_DATASOURCE_CATEGORY,
 		payload: data
 		payload: data

@@ -9,6 +9,9 @@ const {
 
 
 
 
 export function updateDataSource(data) {
 export function updateDataSource(data) {
+	if (!data) {
+		return;
+	}
 	let key = data?data.key:'';
 	let key = data?data.key:'';
 	let json = data;
 	let json = data;
 	if (key == 'brand') {
 	if (key == 'brand') {