Merge remote-tracking branch 'origin/5.4.1' into 5.4.1

@@ -14,6 +14,7 @@ import ReactNative, {
     Platform,
     Platform,
     RefreshControl,
     RefreshControl,
 } from 'react-native';
 } from 'react-native';
+import TimerMixin from 'react-timer-mixin';
 import Immutable, {Map} from 'immutable';
 import Immutable, {Map} from 'immutable';
 import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator';
 import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator';
 import YH_SortView from '../../../common/components/YH_SortView';
 import YH_SortView from '../../../common/components/YH_SortView';
@@ -84,6 +85,11 @@ export default class Home extends Component {
         }
         }
     }
     }
 
 
+    componentWillUnmount() {
+        this.requestAnimationFrame && TimerMixin.cancelAnimationFrame(this.requestAnimationFrame);
+    }
+
+
     trigggePullToRefresh(changeChannel=false) {
     trigggePullToRefresh(changeChannel=false) {
         let data = this._currentChannelData();
         let data = this._currentChannelData();
         if (changeChannel) {
         if (changeChannel) {
@@ -150,8 +156,8 @@ export default class Home extends Component {
                         <DivideImage/>
                         <DivideImage/>
                         <SingleImage
                         <SingleImage
                             data={rowData}
                             data={rowData}
-                            onPressSlideItem={this.props.onPressSlideItem}
-                            onPressTitleMore={this.props.onPressTitleMore}
+                            onPressSlideItem={this.props.onPressChangeChannel}
+                            onPressTitleMore={this.props.onPressChangeChannel}
                         />
                         />
                     </View>
                     </View>
                 );
                 );
@@ -444,15 +450,22 @@ export default class Home extends Component {
 
 
     _onScroll(event) {
     _onScroll(event) {
         if (event.nativeEvent.contentOffset.y < height) {
         if (event.nativeEvent.contentOffset.y < height) {
-            this.setState({showBackTop: false, currentY: event.nativeEvent.contentOffset.y});
+            if (this.state.showBackTop) {
+                this.setState({showBackTop: false, currentY: event.nativeEvent.contentOffset.y});
+            }
         }else {
         }else {
-            this.setState({showBackTop: true, currentY: event.nativeEvent.contentOffset.y});
+            if (!this.state.showBackTop) {
+                this.setState({showBackTop: true, currentY: event.nativeEvent.contentOffset.y});
+            }
         }
         }
     }
     }
 
 
     _backTop() {
     _backTop() {
-        this.setState({showBackTop: false});
-        this.listView && this.listView.scrollTo({x: 0, y: 0, animated: true});
+        // this.setState({showBackTop: false});
+        console.log(this.state.showBackTop);
+        InteractionManager.runAfterInteractions(() =>{
+            this.listView && this.listView.scrollTo({x: 0, y: 0, animated: true});
+        });
     }
     }
 
 
     _renderFooter() {
     _renderFooter() {

@@ -76,6 +76,7 @@ class HomeContainer extends Component {
         this.onPressProductListProduct = this.onPressProductListProduct.bind(this);
         this.onPressProductListProduct = this.onPressProductListProduct.bind(this);
         this.onPressToProductDetail = this.onPressToProductDetail.bind(this);
         this.onPressToProductDetail = this.onPressToProductDetail.bind(this);
         this.onPressReloadData = this.onPressReloadData.bind(this);
         this.onPressReloadData = this.onPressReloadData.bind(this);
+        this.onPressChangeChannel = this.onPressChangeChannel.bind(this);
 
 
         this.subscription = NativeAppEventEmitter.addListener(
         this.subscription = NativeAppEventEmitter.addListener(
             'ChannelDidChangeEvent',
             'ChannelDidChangeEvent',
@@ -280,6 +281,17 @@ class HomeContainer extends Component {
         this.props.actions.fetchFloor();
         this.props.actions.fetchFloor();
     }
     }
 
 
+    onPressChangeChannel() {
+        let {app} = this.props;
+        if (app.channel == 1) {
+            console.log(1111111);
+            ReactNative.NativeModules.YH_CommonHelper.switchChannelByTheme(0);
+        }else if (app.channel == 2) {
+            console.log(2222222);
+            ReactNative.NativeModules.YH_CommonHelper.switchChannelByTheme(1);
+        }
+    }
+
     render() {
     render() {
         let {app, home} = this.props;
         let {app, home} = this.props;
         return (
         return (
@@ -318,6 +330,7 @@ class HomeContainer extends Component {
                     onClickRecommendProduct={this.onClickRecommendProduct}
                     onClickRecommendProduct={this.onClickRecommendProduct}
                     onPressToProductDetail={this.onPressToProductDetail}
                     onPressToProductDetail={this.onPressToProductDetail}
                     onPressReloadData={this.onPressReloadData}
                     onPressReloadData={this.onPressReloadData}
+                    onPressChangeChannel={this.onPressChangeChannel}
                 />
                 />
             </View>
             </View>
         );
         );