iOS Team / ScioLive · Commits

Commit cd21565725527001566e6363c15aa0c13c429249

Authored by iOS-Xiaowen
1 parent 2e94052a

no message

Inline Side-by-side
Showing 10 changed files with 59 additions and 33 deletions
CNLiveScioLive/AppDelegate.m
  View file @cd21565
... ... @@ -29,7 +29,7 @@
29 29 [[UITabBar appearance] setTranslucent:NO];
30 30  
31 31 #pragma mark - 打包注意
32   - [AvoidCrash makeAllEffective];
  32 +// [AvoidCrash makeAllEffective];
33 33 self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
34 34 self.window.backgroundColor = [UIColor whiteColor];
35 35  
... ...
CNLiveScioLive/Pages/Base/CNLiveWebViewController.m
  View file @cd21565
... ... @@ -215,7 +215,7 @@
215 215 for (cookie in [storage cookies]){
216 216 [storage deleteCookie:cookie];
217 217 }
218   - //清除UIWebView的缓存
  218 + //清除WebView的缓存
219 219 [[NSURLCache sharedURLCache] removeAllCachedResponses];
220 220 NSURLCache * cache = [NSURLCache sharedURLCache];
221 221 [cache removeAllCachedResponses];
... ...
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @cd21565
... ... @@ -32,7 +32,7 @@
32 32 }
33 33 [self.navigationController popToRootViewControllerAnimated:YES];
34 34 }
35   -- (id)initWithDictionary:(NSDictionary*)dictionary{
  35 +- (id)initWithDictionary:(NSDictionary *)dictionary{
36 36 if (self = [super init]) {
37 37 _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
38 38 url = _dictionary[@"videoUrl"];
... ...
CNLiveScioLive/Pages/My/我的收藏/Controller/CNLiveMyCollectionViewController.m
  View file @cd21565
... ... @@ -142,9 +142,9 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell
142 142 // [self.navigationController pushViewController:vc animated:YES];
143 143 //
144 144 // } else if ([homeModel.type isEqualToString:@"subject"]) {
145   -// // SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
146   -// // vc.title = @"国新专题";
147   -// // vc.hidesBottomBarWhenPushed = YES;
  145 +// SCIOSpecialViewController *vc = [[SCIOSpecialViewController alloc] initWithDictionary:_dic];
  146 +// vc.title = @"国新专题";
  147 +// vc.hidesBottomBarWhenPushed = YES;
148 148 //
149 149 // } else if ([homeModel.type isEqualToString:@"LK"]) {
150 150 // ArticleDetailViewController *vc = [[ArticleDetailViewController alloc] init];
... ... @@ -152,6 +152,7 @@ static NSString *myAnnouncementsTableViewCell = @"CNMyAnnouncementsTableViewCell
152 152 // vc.hidesBottomBarWhenPushed = YES;
153 153 // [self.navigationController pushViewController:vc animated:YES];
154 154 // }
  155 +
155 156 }
156 157 /*
157 158 #pragma mark - Navigation
... ...
CNLiveScioLive/Pages/My/设置/Controller/CNLiveAboutUsViewController.m
  View file @cd21565
... ... @@ -222,7 +222,7 @@
222 222 for (cookie in [storage cookies]){
223 223 [storage deleteCookie:cookie];
224 224 }
225   - //清除UIWebView的缓存
  225 + //清除WebView的缓存
226 226 [[NSURLCache sharedURLCache] removeAllCachedResponses];
227 227 NSURLCache * cache = [NSURLCache sharedURLCache];
228 228 [cache removeAllCachedResponses];
... ...
CNLiveScioLive/Pages/Tools/DBAction/DBAction.m
  View file @cd21565
... ... @@ -126,7 +126,7 @@ static DBAction *instance = nil;
126 126  
127 127 - (void)createTable{
128 128 if ([db open]) {
129   - 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)";
  129 + 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)";
130 130 BOOL res = [db executeUpdate:sql];
131 131 if (!res) {
132 132 NSLog(@"建表失败");
... ... @@ -157,7 +157,7 @@ static DBAction *instance = nil;
157 157 FMResultSet * re = [db executeQuery:check];
158 158 if (![re next]) {
159 159 NSString *desc = [notice.desc stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
160   - 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];
  160 + 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];
161 161 BOOL res = [db executeUpdate:sql];
162 162 if (!res) {
163 163 return NO;
... ... @@ -201,6 +201,8 @@ static DBAction *instance = nil;
201 201 notice.img = [rs stringForColumn:@"img"];
202 202 notice.pageUrl = [rs stringForColumn:@"pageUrl"];
203 203 notice.picType = [rs stringForColumn:@"picType"];
  204 + notice.playType = [rs stringForColumn:@"playType"];
  205 + notice.uuid = [rs stringForColumn:@"uuid"];
204 206 notice.publishDate = [rs stringForColumn:@"publishDate"];
205 207 notice.subTitle = [rs stringForColumn:@"subTitle"];
206 208 notice.title = [rs stringForColumn:@"title"];
... ...
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.h
  View file @cd21565
... ... @@ -8,32 +8,34 @@
8 8  
9 9 #import <Foundation/Foundation.h>
10 10 @interface NoticeData : NSObject<NSCopying>
11   -@property(nonatomic, strong) NSString *time;
12   -@property(nonatomic, strong) NSString *title;
13   -@property(nonatomic, strong) NSString *content;
  11 +@property(nonatomic, copy) NSString *time;
  12 +@property(nonatomic, copy) NSString *title;
  13 +@property(nonatomic, copy) NSString *content;
14 14 - (id)initWithJSONDictionary: (NSDictionary*)jsonDic;
15 15 @end
16 16  
17 17  
18 18 @interface TableData : NSObject
19   -@property(nonatomic, strong) NSString *cmsColumnName;
20   -@property(nonatomic, strong) NSString *cmsColumnId;
  19 +@property(nonatomic, copy) NSString *cmsColumnName;
  20 +@property(nonatomic, copy) NSString *cmsColumnId;
21 21 @property(nonatomic, assign) int cmsContentId;
22   -@property(nonatomic, strong) NSString *createDate;
23   -@property(nonatomic, strong) NSString *desc;
  22 +@property(nonatomic, copy) NSString *createDate;
  23 +@property(nonatomic, copy) NSString *desc;
24 24 @property(nonatomic, assign) int gxbArticleId;
25 25 @property(nonatomic, assign) int gxbVideoId;
26   -@property(nonatomic, strong) NSString *img;
27   -@property(nonatomic, strong) NSString *pageUrl;
28   -@property(nonatomic, strong) NSString *picType;
29   -@property(nonatomic, strong) NSString *publishDate;
30   -@property(nonatomic, strong) NSString *subTitle;
31   -@property(nonatomic, strong) NSString *title;
32   -@property(nonatomic, strong) NSString *type;
33   -@property(nonatomic, strong) NSString *uploadVideoUrl;
34   -@property(nonatomic, strong) NSString *videoUrl;
  26 +@property(nonatomic, copy) NSString *img;
  27 +@property(nonatomic, copy) NSString *pageUrl;
  28 +@property(nonatomic, copy) NSString *picType;
  29 +@property(nonatomic, copy) NSString *playType;
  30 +@property(nonatomic, copy) NSString *publishDate;
  31 +@property(nonatomic, copy) NSString *subTitle;
  32 +@property(nonatomic, copy) NSString *title;
  33 +@property(nonatomic, copy) NSString *type;
  34 +@property(nonatomic, copy) NSString *uuid;
  35 +@property(nonatomic, copy) NSString *uploadVideoUrl;
  36 +@property(nonatomic, copy) NSString *videoUrl;
35 37 @property(nonatomic, assign) int vipFlag;
36   -@property(nonatomic, strong) NSString *author;
  38 +@property(nonatomic, copy) NSString *author;
37 39 @property(nonatomic, strong) NSDictionary *dictionary;
38 40 - (id)initWithJSONDictionary: (NSDictionary*)jsonDic;
39 41 - (NSDictionary *)ToDictionary;
... ...
CNLiveScioLive/Pages/Tools/DBAction/NoticeData.m
  View file @cd21565
... ... @@ -112,6 +112,19 @@
112 112 }else{
113 113 self.picType = [jsonDic objectForKey:@"picType"];
114 114 }
  115 +
  116 + if ([jsonDic objectForKey:@"playType"] == [NSNull null]) {
  117 + self.playType = @"";
  118 + }else{
  119 + self.playType = [jsonDic objectForKey:@"playType"];
  120 + }
  121 +
  122 + if ([jsonDic objectForKey:@"playType"] == [NSNull null]) {
  123 + self.playType = @"";
  124 + }else{
  125 + self.playType = [jsonDic objectForKey:@"playType"];
  126 + }
  127 +
115 128 if ([jsonDic objectForKey:@"publishDate"] == [NSNull null]) {
116 129 self.publishDate = @"";
117 130 }else{
... ... @@ -147,6 +160,13 @@
147 160 }else{
148 161 self.vipFlag = [[jsonDic objectForKey:@"vipFlag"] intValue];
149 162 }
  163 +
  164 + if ([jsonDic objectForKey:@"uuid"] == [NSNull null]) {
  165 + self.uuid = @"";
  166 + }else{
  167 + self.uuid = [jsonDic objectForKey:@"uuid"];
  168 + }
  169 +
150 170 // if ([jsonDic objectForKey:@"author"] == [NSNull null]) {
151 171 // self.author = @"";
152 172 // }else{
... ... @@ -160,15 +180,18 @@
160 180  
161 181 [dic setObject:self.cmsColumnName forKey:@"cmsColumnName"];
162 182 [dic setObject:self.cmsColumnId forKey:@"cmsColumnId"];
163   - [dic setObject:[NSNumber numberWithInt:self.cmsContentId] forKey:@"cmsContentId"];
  183 + [dic setObject:[NSNumber numberWithInt:self.cmsContentId] forKey:@"cmsContentId"];
164 184 [dic setObject:self.createDate forKey:@"createDate"];
165 185 [dic setObject:self.desc forKey:@"desc"];
166   - [dic setObject:[NSNumber numberWithInt:self.gxbArticleId] forKey:@"gxbArticleId"];
  186 + [dic setObject:[NSNumber numberWithInt:self.gxbArticleId] forKey:@"gxbArticleId"];
167 187 [dic setObject:[NSNumber numberWithInt:self.gxbVideoId] forKey:@"gxbVideoId"];
168 188 [dic setObject:self.img forKey:@"img"];
169 189 [dic setObject:self.pageUrl forKey:@"pageUrl"];
170 190 [dic setObject:self.picType forKey:@"picType"];
171   - [dic setObject:self.publishDate forKey:@"publishDate"];
  191 + [dic setObject:self.playType?self.playType:@"" forKey:@"playType"];
  192 + [dic setObject:self.uuid?self.uuid:@"" forKey:@"uuid"];
  193 +
  194 +// [dic setObject:self.publishDate forKey:@"publishDate"];
172 195 [dic setObject:self.publishDate forKey:@"publishDate"];
173 196 [dic setObject:self.subTitle forKey:@"subTitle"];
174 197 [dic setObject:self.title forKey:@"title"];
... ...
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/JGMusicManager.m
  View file @cd21565
... ... @@ -129,8 +129,6 @@
129 129 // 播放
130 130 @try {
131 131  
132   - //问题代码
133   -
134 132 [commandCenter.playCommand addTarget:self action:@selector(playAction:)];//playAction:)
135 133 // 暂停
136 134 [commandCenter.pauseCommand addTarget:self action:@selector(pauseAction:)];
... ...
auto_upload.py
  View file @cd21565
... ... @@ -202,8 +202,8 @@ def command_line():
202 202 if __name__ == '__main__':
203 203  
204 204 # 1、先用命令行方式,获取number
205   - # python3 upload.py -s app-store 或者 python3 upload.py -store app-store
206   - # python3 upload.py -s pgyer 或者 python3 upload.py -store pgyer
  205 + # python3 auto_upload.py 或者 python3 auto_upload.py -s app-store 或者 python3 auto_upload.py --store app-store
  206 + # python3 auto_upload.py -s pgyer 或者 python3 auto_upload.py --store pgyer
207 207 number = command_line()
208 208 if (number != 1 and number != 2):
209 209  
... ...