收藏中英文分离修改

yanglingyu
1 parent 6f7fd7ac
Showing 13 changed files with 63 additions and 53 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/ArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/SCIOSpecialViewController.m
CNLiveScioLive/Pages/Home/新闻详情/View/CNLiveNewsDetailsView.m
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
CNLiveScioLive/Pages/Newsound/OldController/VoiceViewController.m
CNLiveScioLive/Pages/Tools/DBAction/DBAction.h
CNLiveScioLive/Pages/Tools/DBAction/DBAction.m
@@ -39,8 +39,7 @@
     [[BaiduMobStat defaultStat] startWithAppId:uBaiduMobStat];
-    //收藏
-    [[DBAction sharedDBAction] createTable];
+    
     //分享
     [MobClick startWithAppkey:uMengKey reportPolicy:BATCH channelId:nil];
@@ -51,6 +50,9 @@
     //语言
     [self setApplicationLanguage];
+    //收藏
+    [[DBAction sharedDBAction] createTable:@"en"];
+    [[DBAction sharedDBAction] createTable:@"zh"];
     //版本更新
     [self checkAppUpdate];
@@ -101,9 +103,11 @@
         //获取系统语言
         if (IS_CHINESE) {
             self.lan =@"zh-Hans";
+            [User_Defaults setObject:@"zh-Hans" forKey:Language_Local];
             [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"完成";
         }else{
             self.lan =@"en";
+            [User_Defaults setObject:@"en" forKey:Language_Local];
             [IQKeyboardManager sharedManager].toolbarDoneBarButtonItemText = @"Done";
         }
     }
@@ -216,9 +216,9 @@
             {
                 NSDictionary *dic = [weakSelf.model toDictionary];
                 TableData *notice = [[TableData alloc] initWithJSONDictionary:dic];
-                BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+                BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                 if (!isIn) {
-                    BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+                    BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                     if (isInsert) {
                         [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CollectSuccess")];
                         [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
@@ -226,7 +226,7 @@
                     }
                 } else {
-                    BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+                    BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                     if (isDelete) {
                         [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CancelCollect")];
                         [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -227,9 +227,9 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
             {
                 NSDictionary *dic = [weakSelf.model toDictionary];
                 TableData *notice = [[TableData alloc] initWithJSONDictionary:dic];
-                BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+                BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                 if (!isIn) {
-                    BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+                    BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                     if (isInsert) {
                         [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CollectSuccess")];
                         [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
@@ -237,7 +237,7 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
                     }
                 } else {
-                    BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+                    BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
                     if (isDelete) {
                         [AlertViewTool showHUDAddedToView:weakSelf.view text:CustomStr(@"CancelCollect")];
                         [weakSelf.detailsView.btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -203,7 +203,7 @@
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -270,17 +270,17 @@
         }
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-        BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+        BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         if (!isIn) {
-            BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+            BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isInsert) {
                 [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"CollectSuccess")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             }
         } else {
-            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isDelete) {
                 [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"CancelCollect")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -104,7 +104,7 @@
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -142,7 +142,7 @@
         [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-        BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+        BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         NSMutableDictionary *author = [NSMutableDictionary dictionaryWithContentsOfFile:FavouriteAuthors_PATH];
         if (!author) {
@@ -150,7 +150,7 @@
         }
         if (!isIn) {
-            BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+            BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             [author setObject:self.authorName forKey:notice.pageUrl];
             [author writeToFile:FavouriteAuthors_PATH atomically:YES];
             if (isInsert) {
@@ -158,7 +158,7 @@
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             }
         } else {
-            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             [author removeObjectForKey:notice.pageUrl];
             [author writeToFile:FavouriteAuthors_PATH atomically:YES];
             if (isDelete) {
@@ -77,7 +77,7 @@
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -107,15 +107,15 @@
     UIButton *btn = (UIButton *)sender;
     if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-        BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+        BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         if (!isIn) {
-            BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+            BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isInsert) {
                 [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"CollectSuccess")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             }
         } else {
-            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isDelete) {
                 [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"CancelCollect")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -49,7 +49,7 @@
         if(i == 1){
             self.btn = btn;
             TableData *notice = [[TableData alloc] initWithJSONDictionary:self.dic];
-            BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+            BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isIn) {
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             } else {
@@ -156,7 +156,7 @@
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     isFavoriteButton.tag = 20000;
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary[@"programs"][0]];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -200,15 +200,15 @@
         }
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary[@"programs"][0]];
-        BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+        BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         if (!isIn) {
-            BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+            BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isInsert) {
                 [AlertViewTool showHUDViewText:CustomStr(@"CollectSuccess")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             }
         } else {
-            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isDelete) {
                 [AlertViewTool showHUDViewText:CustomStr(@"CancelCollect")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -113,7 +113,7 @@
     UIButton *isFavoriteButton = [UIButton buttonWithType:UIButtonTypeCustom];
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [isFavoriteButton setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -151,15 +151,15 @@
         [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-        BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+        BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         if (!isIn) {
-            BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+            BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isInsert) {
                 [AlertViewTool showHUDViewText:CustomStr(@"CollectSuccess")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
             }
         } else {
-            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+            BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
             if (isDelete) {
                 [AlertViewTool showHUDViewText:CustomStr(@"CancelCollect")];
                 [btn setImage:[UIImage imageNamed:@"cnlive_isfavorite"] forState:UIControlStateNormal];
@@ -26,7 +26,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 #pragma mark - Data
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    self.data  = [[DBAction sharedDBAction] queryTable];
+    self.data  = [[DBAction sharedDBAction] queryTable:[User_Defaults objectForKey:Language_Local]];
     self.errorLabel.hidden = self.data.count != 0;
     [self.tableView reloadData];
@@ -403,7 +403,7 @@ static const NSInteger margin = 34;
     // 判断收藏按钮状态
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [favoriteBtn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -849,7 +849,7 @@ static const NSInteger margin = 34;
     }
     // 判断收藏按钮状态
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     if (isIn) {
         [favoriteBtn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
     } else {
@@ -1070,14 +1070,14 @@ static const NSInteger margin = 34;
 - (void)favoriteBtnClicked:(id)sender {
     TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
-    BOOL isIn = [[DBAction sharedDBAction] isInTable:notice];
+    BOOL isIn = [[DBAction sharedDBAction] isInTable:[User_Defaults objectForKey:Language_Local] notice:notice];
     NSMutableDictionary *author = [NSMutableDictionary dictionaryWithContentsOfFile:FavouriteAuthors_PATH];
     if (!author) {
         author = [NSMutableDictionary dictionary];
     }
     if (!isIn) {
-        BOOL isInsert = [[DBAction sharedDBAction] insertTable:notice];
+        BOOL isInsert = [[DBAction sharedDBAction] insertTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         [author setObject:_dictionary[@"author"] forKey:notice.pageUrl];
         [author writeToFile:FavouriteAuthors_PATH atomically:YES];
         if (isInsert) {
@@ -1085,7 +1085,7 @@ static const NSInteger margin = 34;
             [favoriteBtn setImage:[UIImage imageNamed:@"cnlive_isfavorited"] forState:UIControlStateNormal];
         }
     } else {
-        BOOL isDelete = [[DBAction sharedDBAction] deleteTable:notice];
+        BOOL isDelete = [[DBAction sharedDBAction] deleteTable:[User_Defaults objectForKey:Language_Local] notice:notice];
         [author removeObjectForKey:notice.pageUrl];
         [author writeToFile:FavouriteAuthors_PATH atomically:YES];
         if (isDelete) {
@@ -18,9 +18,9 @@
 - (NSMutableArray *)queryNoticeTable;
-- (void)createTable;
-- (BOOL)isInTable:(TableData*)notice;
-- (BOOL)insertTable: (TableData*)notice;
-- (BOOL)deleteTable: (TableData*)notice;
-- (NSMutableArray *)queryTable;
+- (void)createTable:(NSString *)tableName;
+- (BOOL)isInTable:(NSString *)tableName notice:(TableData*)notice;
+- (BOOL)insertTable:(NSString *)tableName notice:(TableData*)notice;
+- (BOOL)deleteTable:(NSString *)tableName notice:(TableData*)notice;
+- (NSMutableArray *)queryTable:(NSString *)tableName;
 @end
@@ -124,16 +124,18 @@ static DBAction *instance = nil;
     return list;
 }
-- (void)createTable{
+- (void)createTable:(NSString *)tableName{
     if ([db open]) {
-        NSString * sql = @"CREATE TABLE DATATABLE (cmsColumnName varchar, cmsColumnId varchar, cmsContentId int, createDate varchar, desc varchar, gxbArticleId int, gxbVideoId int, img varchar, pageUrl varchar, picType varchar, playType varchar, publishDate varchar, subTitle varchar, title varchar, type varchar, uploadVideoUrl varchar, videoUrl varchar, vipFlag int, uuid varchar)";
+        tableName = [tableName substringToIndex:2];
+        NSString * sql = [NSString stringWithFormat:@"CREATE TABLE %@DATATABLE (cmsColumnName varchar, cmsColumnId varchar, cmsContentId int, createDate varchar, desc varchar, gxbArticleId int, gxbVideoId int, img varchar, pageUrl varchar, picType varchar, playType varchar, publishDate varchar, subTitle varchar, title varchar, type varchar, uploadVideoUrl varchar, videoUrl varchar, vipFlag int, uuid varchar)",tableName.uppercaseString];
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             NSLog(@"建表失败");
-            NSString *sql1 = [NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ VARCHAR",@"DATATABLE",@"playType"];
+            
+            NSString *sql1 = [NSString stringWithFormat:@"ALTER TABLE %@DATATABLE ADD %@ VARCHAR",tableName,@"playType"];
             BOOL result1 = [db executeUpdate:sql1];
-            NSString *sql2 = [NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ VARCHAR",@"DATATABLE",@"uuid"];
+            NSString *sql2 = [NSString stringWithFormat:@"ALTER TABLE %@DATATABLE ADD %@ VARCHAR",tableName,@"uuid"];
             BOOL result2 = [db executeUpdate:sql2];
         } else {
@@ -145,9 +147,10 @@ static DBAction *instance = nil;
     }
 }
-- (BOOL)isInTable:(TableData*)notice{
+- (BOOL)isInTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
-        NSString * check = [NSString stringWithFormat:@"SELECT * FROM DATATABLE where cmsContentId = %d",notice.cmsContentId];
+        tableName = [tableName substringToIndex:2];
+        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         FMResultSet * re = [db executeQuery:check];
         while ([re next])  {
             return YES;
@@ -157,13 +160,14 @@ static DBAction *instance = nil;
     return NO;
 }
-- (BOOL)insertTable:(TableData*)notice{
+- (BOOL)insertTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
-        NSString * check = [NSString stringWithFormat:@"SELECT * FROM DATATABLE where cmsContentId = %d",notice.cmsContentId];
+        tableName = [tableName substringToIndex:2];
+        NSString * check = [NSString stringWithFormat:@"SELECT * FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         FMResultSet * re = [db executeQuery:check];
         if (![re next]) {
             NSString *desc = [notice.desc stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
-            NSString * sql = [NSString stringWithFormat:@"INSERT INTO DATATABLE (cmsColumnName, cmsColumnId, cmsContentId, createDate, desc, gxbArticleId, gxbVideoId, img, pageUrl, picType, playType, publishDate, subTitle, title, type, uploadVideoUrl, videoUrl, vipFlag, uuid) values('%@','%@','%d', '%@','%@','%d','%d', '%@','%@','%@','%@','%@','%@','%@','%@','%@','%@','%d', '%@')", notice.cmsColumnName, notice.cmsColumnId, notice.cmsContentId, notice.createDate, desc, notice.gxbArticleId,  notice.gxbVideoId, notice.img, notice.pageUrl, notice.picType, notice.playType, notice.publishDate, notice.subTitle, notice.title, notice.type, notice.uploadVideoUrl, notice.videoUrl, notice.vipFlag, notice.uuid?notice.uuid:@""];
+            NSString * sql = [NSString stringWithFormat:@"INSERT INTO %@DATATABLE (cmsColumnName, cmsColumnId, cmsContentId, createDate, desc, gxbArticleId, gxbVideoId, img, pageUrl, picType, playType, publishDate, subTitle, title, type, uploadVideoUrl, videoUrl, vipFlag, uuid) values('%@','%@','%d', '%@','%@','%d','%d', '%@','%@','%@','%@','%@','%@','%@','%@','%@','%@','%d', '%@')",tableName.uppercaseString, notice.cmsColumnName, notice.cmsColumnId, notice.cmsContentId, notice.createDate, desc, notice.gxbArticleId,  notice.gxbVideoId, notice.img, notice.pageUrl, notice.picType, notice.playType, notice.publishDate, notice.subTitle, notice.title, notice.type, notice.uploadVideoUrl, notice.videoUrl, notice.vipFlag, notice.uuid?notice.uuid:@""];
             BOOL res = [db executeUpdate:sql];
             if (!res) {
                 return NO;
@@ -176,9 +180,10 @@ static DBAction *instance = nil;
     return NO;
 }
-- (BOOL)deleteTable:(TableData*)notice{
+- (BOOL)deleteTable:(NSString *)tableName notice:(TableData*)notice{
     if ([db open]) {
-        NSString * sql = [NSString stringWithFormat:@"DELETE FROM DATATABLE where cmsContentId = %d",notice.cmsContentId];
+        tableName = [tableName substringToIndex:2];
+        NSString * sql = [NSString stringWithFormat:@"DELETE FROM %@DATATABLE where cmsContentId = %d",tableName.uppercaseString,notice.cmsContentId];
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             return NO;
@@ -190,10 +195,11 @@ static DBAction *instance = nil;
     return NO;
 }
-- (NSMutableArray *)queryTable{
+- (NSMutableArray *)queryTable:(NSString *)tableName{
     NSMutableArray *list = [[NSMutableArray alloc] init];
     if ([db open]) {
-        NSString * sql = @"SELECT * FROM DATATABLE";
+        tableName = [tableName substringToIndex:2];
+        NSString *sql = [NSString  stringWithFormat:@"SELECT * FROM %@DATATABLE",tableName.uppercaseString];
         FMResultSet * rs = [db executeQuery:sql];
         while ([rs next]) {
             TableData * notice = [[TableData alloc] init];