disable youtube video download click

gckjdev · Jan 30, 2012 · 1c86b13 · 1c86b13
1 parent 059f1b7
commit 1c86b13
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/DownloadCommon/Controller/DownloadWebViewController.m b/DownloadCommon/Controller/DownloadWebViewController.m
@@ -216,6 +216,13 @@ - (void)longpressTouch:(UIWebView*)webView info:(HTMLLinkInfo*)linkInfo
 //                                               webSite:webSite 
 //                                           webSiteName:[self.webView getTitle]
 //                                               origUrl:currentURL];
+
+        if ([linkInfo.href rangeOfString:@"youtube.com"].location != NSNotFound){
+            // don't show youtube 
+            PPDebug(@"Download link is from youtube, skip popup download action sheet. href=%@", linkInfo.href);
+            return;
+        }
+
         self.urlFileType = FILE_TYPE_UNKNOWN;
         [self askDownload:linkInfo.href];
     }

diff --git a/GroupBuyCommon/Controller/CommonProductListController.m b/GroupBuyCommon/Controller/CommonProductListController.m
@@ -191,6 +191,8 @@ - (void)viewDidLoad
 
 - (void)viewDidAppear:(BOOL)animated
 {
+
+
     if (bannerView == nil){
         bannerView = [AdViewUtils allocAdMobView:self];  
         if (bannerView != nil){
@@ -201,13 +203,12 @@ - (void)viewDidAppear:(BOOL)animated
     }
 
     self.dataList = [self requestProductListFromDB]; 
-    [self showNoProductLabel];
-
     if (self.dataList == nil || [dataList count] == 0){
         [self showActivityWithText:@"获取团购数据中..."];
         [self requestProductListFromServer:YES];                
     }
     else{
+        self.noProductLabel.hidden = YES;
         [self.dataTableView reloadData];
     }
 

diff --git a/GroupBuyCommon/Controller/GuideController.m b/GroupBuyCommon/Controller/GuideController.m
@@ -248,7 +248,7 @@ -(void) addCategoryButton
 
     //set website title
     UILabel *websiteTitleLabel = [[UILabel alloc] init];
-    websiteTitleLabel.text = @"团购网站";
+    websiteTitleLabel.text = @"站点导航";
     websiteTitleLabel.font = [UIFont boldSystemFontOfSize:15];
     websiteTitleLabel.textColor = [UIColor colorWithRed:111/255.0 green:104/255.0 blue:94/255.0 alpha:1.0];
     newX = 10;

diff --git a/GroupBuyCommon/Controller/ShoppingListController.m b/GroupBuyCommon/Controller/ShoppingListController.m
@@ -19,7 +19,7 @@
 #import "ProductPriceDataLoader.h"
 #import "groupbuyAppDelegate.h"
 #import "NetworkRequestResultCode.h"
-
+#import "StringUtil.h"
 
 @implementation ShoppingListController
 
@@ -51,7 +51,10 @@ - (void)viewDidLoad {
     [self setBackgroundImageName:@"background.png"];
 
     self.helpLabel.hidden = YES;
-    self.helpLabel.text = @"暂无团购通知，请点击右上角的按钮添加你想要的信息。";
+    NSString* text = @"暂无团购通知，请点击右上角的按钮添加";
+    text = [text stringByAppendingString:kHappyFace];
+    self.helpLabel.text = text;
+
 
     //@"团购通知可以帮助您找到您想要购买的商品是否有对应团购。操作如下：\n\n\
     1）添加一个或者多个近期想要购买的商品的信息；\n\n\
@@ -73,7 +76,7 @@ - (void)viewDidAppear:(BOOL)animated{
     [self.dataTableView reloadData];
 
     if ([self.dataList count] == 0){
-        [self popupMessage:@"您还没有添加任何你感兴趣的团购目标，点击右上角的按钮添加一个你想要团购的物品信息吧！" title:@""];
+//        [self popupMessage:@"您还没有添加任何你感兴趣的团购目标，点击右上角的按钮添加一个你想要团购的物品信息吧！" title:@""];
 
         self.helpLabel.hidden = NO;
     }

diff --git a/GroupBuyCommon/Controller/ShoppingListController.xib b/GroupBuyCommon/Controller/ShoppingListController.xib
@@ -63,7 +63,7 @@
 					<object class="IBUILabel" id="212130479">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{15, 5}, {285, 358}}</string>
+						<string key="NSFrame">{{20, 15}, {275, 40}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView"/>