no message

iOS-Xiaowen
1 parent 2e94052a
Showing 10 changed files with 59 additions and 33 deletions
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Pages/Base/CNLiveWebViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
CNLiveScioLive/Pages/My/设置/Controller/CNLiveAboutUsViewController.m
CNLiveScioLive/Pages/Tools/DBAction/DBAction.m
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.h
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/JGMusicManager.m
auto_upload.py
@@ -29,7 +29,7 @@
     [[UITabBar appearance] setTranslucent:NO];
 #pragma mark - 打包注意
-    [AvoidCrash makeAllEffective];
+//    [AvoidCrash makeAllEffective];
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.backgroundColor = [UIColor whiteColor];
@@ -215,7 +215,7 @@
     for (cookie in [storage cookies]){
         [storage deleteCookie:cookie];
     }
-    //清除UIWebView的缓存
+    //清除WebView的缓存
     [[NSURLCache sharedURLCache] removeAllCachedResponses];
     NSURLCache * cache = [NSURLCache sharedURLCache];
     [cache removeAllCachedResponses];
@@ -32,7 +32,7 @@
     }
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
-- (id)initWithDictionary:(NSDictionary*)dictionary{
+- (id)initWithDictionary:(NSDictionary *)dictionary{
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
         url = _dictionary[@"videoUrl"];
@@ -142,9 +142,9 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 //        [self.navigationController pushViewController:vc animated:YES];
 //
 //    } else if ([homeModel.type isEqualToString:@"subject"]) {
-//        //        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
-//        //        vc.title = @"国新专题";
-//        //        vc.hidesBottomBarWhenPushed = YES;
+//        SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
+//        vc.title = @"国新专题";
+//        vc.hidesBottomBarWhenPushed = YES;
 //
 //    } else if ([homeModel.type isEqualToString:@"LK"]) {
 //        ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
@@ -152,6 +152,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 //        vc.hidesBottomBarWhenPushed = YES;
 //        [self.navigationController pushViewController:vc animated:YES];
 //    }
+    
 }
 /*
  #pragma mark - Navigation
@@ -222,7 +222,7 @@
     for (cookie in [storage cookies]){
         [storage deleteCookie:cookie];
     }
-    //清除UIWebView的缓存
+    //清除WebView的缓存
     [[NSURLCache sharedURLCache] removeAllCachedResponses];
     NSURLCache * cache = [NSURLCache sharedURLCache];
     [cache removeAllCachedResponses];
@@ -126,7 +126,7 @@ static DBAction *instance = nil;
 - (void)createTable{
     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, publishDate varchar, subTitle varchar, title varchar, type varchar, uploadVideoUrl varchar, videoUrl varchar, vipFlag int)";
+        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)";
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             NSLog(@"建表失败");
@@ -157,7 +157,7 @@ static DBAction *instance = nil;
         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, publishDate, subTitle, title, type, uploadVideoUrl, videoUrl, vipFlag) 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.publishDate, notice.subTitle, notice.title, notice.type, notice.uploadVideoUrl, notice.videoUrl, notice.vipFlag];
+            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];
             BOOL res = [db executeUpdate:sql];
             if (!res) {
                 return NO;
@@ -201,6 +201,8 @@ static DBAction *instance = nil;
             notice.img           = [rs stringForColumn:@"img"];
             notice.pageUrl       = [rs stringForColumn:@"pageUrl"];
             notice.picType       = [rs stringForColumn:@"picType"];
+            notice.playType      = [rs stringForColumn:@"playType"];
+            notice.uuid      = [rs stringForColumn:@"uuid"];
             notice.publishDate   = [rs stringForColumn:@"publishDate"];
             notice.subTitle      = [rs stringForColumn:@"subTitle"];
             notice.title         = [rs stringForColumn:@"title"];
@@ -8,32 +8,34 @@
 #import <Foundation/Foundation.h>
 @interface NoticeData : NSObject<NSCopying>
-@property(nonatomic, strong) NSString *time;
-@property(nonatomic, strong) NSString *title;
-@property(nonatomic, strong) NSString *content;
+@property(nonatomic, copy) NSString *time;
+@property(nonatomic, copy) NSString *title;
+@property(nonatomic, copy) NSString *content;
 - (id)initWithJSONDictionary: (NSDictionary*)jsonDic;
 @end
 @interface TableData : NSObject
-@property(nonatomic, strong) NSString *cmsColumnName;
-@property(nonatomic, strong) NSString *cmsColumnId;
+@property(nonatomic, copy) NSString *cmsColumnName;
+@property(nonatomic, copy) NSString *cmsColumnId;
 @property(nonatomic, assign) int cmsContentId;
-@property(nonatomic, strong) NSString *createDate;
-@property(nonatomic, strong) NSString *desc;
+@property(nonatomic, copy) NSString *createDate;
+@property(nonatomic, copy) NSString *desc;
 @property(nonatomic, assign) int gxbArticleId;
 @property(nonatomic, assign) int gxbVideoId;
-@property(nonatomic, strong) NSString *img;
-@property(nonatomic, strong) NSString *pageUrl;
-@property(nonatomic, strong) NSString *picType;
-@property(nonatomic, strong) NSString *publishDate;
-@property(nonatomic, strong) NSString *subTitle;
-@property(nonatomic, strong) NSString *title;
-@property(nonatomic, strong) NSString *type;
-@property(nonatomic, strong) NSString *uploadVideoUrl;
-@property(nonatomic, strong) NSString *videoUrl;
+@property(nonatomic, copy) NSString *img;
+@property(nonatomic, copy) NSString *pageUrl;
+@property(nonatomic, copy) NSString *picType;
+@property(nonatomic, copy) NSString *playType;
+@property(nonatomic, copy) NSString *publishDate;
+@property(nonatomic, copy) NSString *subTitle;
+@property(nonatomic, copy) NSString *title;
+@property(nonatomic, copy) NSString *type;
+@property(nonatomic, copy) NSString *uuid;
+@property(nonatomic, copy) NSString *uploadVideoUrl;
+@property(nonatomic, copy) NSString *videoUrl;
 @property(nonatomic, assign) int vipFlag;
-@property(nonatomic, strong) NSString *author;
+@property(nonatomic, copy) NSString *author;
 @property(nonatomic, strong) NSDictionary *dictionary;
 - (id)initWithJSONDictionary: (NSDictionary*)jsonDic;
 - (NSDictionary *)ToDictionary;
@@ -112,6 +112,19 @@
     }else{
         self.picType = [jsonDic objectForKey:@"picType"];
     }
+    
+    if ([jsonDic objectForKey:@"playType"] == [NSNull null]) {
+        self.playType = @"";
+    }else{
+        self.playType = [jsonDic objectForKey:@"playType"];
+    }
+    
+    if ([jsonDic objectForKey:@"playType"] == [NSNull null]) {
+        self.playType = @"";
+    }else{
+        self.playType = [jsonDic objectForKey:@"playType"];
+    }
+    
     if ([jsonDic objectForKey:@"publishDate"] == [NSNull null]) {
         self.publishDate = @"";
     }else{
@@ -147,6 +160,13 @@
     }else{
         self.vipFlag = [[jsonDic objectForKey:@"vipFlag"] intValue];
     }
+    
+    if ([jsonDic objectForKey:@"uuid"] == [NSNull null]) {
+        self.uuid = @"";
+    }else{
+        self.uuid = [jsonDic objectForKey:@"uuid"];
+    }
+    
 //    if ([jsonDic objectForKey:@"author"] == [NSNull null]) {
 //        self.author = @"";
 //    }else{
@@ -160,15 +180,18 @@
     [dic setObject:self.cmsColumnName forKey:@"cmsColumnName"];
     [dic setObject:self.cmsColumnId forKey:@"cmsColumnId"];
-    [dic setObject:[NSNumber numberWithInt:self.cmsContentId]  forKey:@"cmsContentId"];
+    [dic setObject:[NSNumber numberWithInt:self.cmsContentId] forKey:@"cmsContentId"];
     [dic setObject:self.createDate forKey:@"createDate"];
     [dic setObject:self.desc forKey:@"desc"];
-    [dic setObject:[NSNumber numberWithInt:self.gxbArticleId]  forKey:@"gxbArticleId"];
+    [dic setObject:[NSNumber numberWithInt:self.gxbArticleId] forKey:@"gxbArticleId"];
     [dic setObject:[NSNumber numberWithInt:self.gxbVideoId]  forKey:@"gxbVideoId"];
     [dic setObject:self.img forKey:@"img"];
     [dic setObject:self.pageUrl forKey:@"pageUrl"];
     [dic setObject:self.picType forKey:@"picType"];
-    [dic setObject:self.publishDate forKey:@"publishDate"];
+    [dic setObject:self.playType?self.playType:@"" forKey:@"playType"];
+    [dic setObject:self.uuid?self.uuid:@"" forKey:@"uuid"];
+
+//    [dic setObject:self.publishDate forKey:@"publishDate"];
     [dic setObject:self.publishDate forKey:@"publishDate"];
     [dic setObject:self.subTitle forKey:@"subTitle"];
     [dic setObject:self.title forKey:@"title"];
@@ -129,8 +129,6 @@
     // 播放
     @try {
-           //问题代码
-           
         [commandCenter.playCommand addTarget:self action:@selector(playAction:)];//playAction:)
     // 暂停
         [commandCenter.pauseCommand addTarget:self action:@selector(pauseAction:)];
@@ -202,8 +202,8 @@ def command_line():
 if __name__ == '__main__':
     # 1、先用命令行方式,获取number
-    # python3 upload.py -s app-store 或者 python3 upload.py -store app-store
-    # python3 upload.py -s pgyer 或者 python3 upload.py -store pgyer
+    # python3 auto_upload.py 或者 python3 auto_upload.py -s app-store 或者 python3 auto_upload.py --store app-store
+    # python3 auto_upload.py -s pgyer 或者 python3 auto_upload.py --store pgyer
     number = command_line()
     if (number != 1 and number != 2):