diff --git a/XinjiangProject/XinjiangProject/Project/HomeV2/View/BindWatchPopView.m b/XinjiangProject/XinjiangProject/Project/HomeV2/View/BindWatchPopView.m index b3442ab..003c004 100644 --- a/XinjiangProject/XinjiangProject/Project/HomeV2/View/BindWatchPopView.m +++ b/XinjiangProject/XinjiangProject/Project/HomeV2/View/BindWatchPopView.m @@ -217,10 +217,10 @@ #pragma mark - 点击背景关闭 - (void)addGesture { - -// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(close)]; -// tap.cancelsTouchesInView = NO; -// [self addGestureRecognizer:tap]; + + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(close)]; + tap.cancelsTouchesInView = YES; + [self addGestureRecognizer:tap]; } - (void)close { diff --git a/XinjiangProject/XinjiangProject/Project/HomeV2/View/XJHomeWatchDataView.m b/XinjiangProject/XinjiangProject/Project/HomeV2/View/XJHomeWatchDataView.m index 43c6f45..e9ebd34 100644 --- a/XinjiangProject/XinjiangProject/Project/HomeV2/View/XJHomeWatchDataView.m +++ b/XinjiangProject/XinjiangProject/Project/HomeV2/View/XJHomeWatchDataView.m @@ -365,6 +365,13 @@ weekLabel; - (void)moreClick { + if (![HQCommonUtils isLogin]) { + + KPostNotification(KNotificationLoginStateChange, @NO); + + return; + } + if (self.watchModel.hasWatch == true) { if (self.watchMoreBlock) { self.watchMoreBlock(); @@ -494,8 +501,13 @@ weekLabel; _devView.hidden = isFirst; if (isFirst) { + // 切换回第一个 Tab,重新根据数据状态显示 emptyView + BOOL isEmpty = (_dataList.count == 0); + _emptyView.hidden = !isEmpty; [self p_restartAutoScroll]; } else { + // 切换到其他 Tab,隐藏 emptyView + _emptyView.hidden = YES; [self p_stopAutoScroll]; }