huangxiaodong преди 10 месеца
родител
ревизия
4c3e2ce123

+ 10 - 3
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -55,13 +55,20 @@
 #import "RSATool.h"
 #import "lastFileManager.h"
 
+#ifdef DEBUG // 调试状态, 打开LOG功能
+#define HLog(fmt, ...) NSLog((@"%@ %s [Line %d] " fmt),[iTools getNowTimeString3], __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
+
+#else // 发布状态, 关闭LOG功能
+  #define HLog(...) (void)0;
+
+#endif
+
 #define globalBlock(block) dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), block)
 
 /**宏定义*/
 #define mainBlock(block)   dispatch_async(dispatch_get_main_queue(), block)
 #define KWeakSelf   __weak typeof(*&self) weakSelf = self; //block 快速宏定义
 #define RGBACOLOR(r,g,b,a) [UIColor colorWithRed:(r)/255.0f green:(g)/255.0f blue:(b)/255.0f alpha:(a)]
-#define HLog(fmt, ...) NSLog((@"%s [Line %d] " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
 
 #define SCREEN_W      [[UIScreen mainScreen] bounds].size.width
 #define SCREEN_H      [[UIScreen mainScreen] bounds].size.height
@@ -115,8 +122,8 @@ isBangsScreen; \
 #define EachPieceSzie (2*1024*1024) //每片上传文件大小切割
 #define cutVideoPieceSzie (3 * EachPieceSzie) //视频每次切片多少(切完上传再切一次)
 
-//#define MaxNasUploadPieceSzie (200*1024*1024) //frp上传 限制每片最大200M
-#define MaxNasUploadPieceSzie (10*1024*1024) //frp上传 限制每片最大200M
+#define MaxNasUploadPieceSzie (200*1024*1024) //frp上传 限制每片最大200M
+//#define MaxNasUploadPieceSzie (10*1024*1024) //frp上传 限制每片最大200M
 #define keyToForgetPwd @"%==%"
 
 #define FileService            @"http://file.phone.androidscloud.com:8210/document/file/lowLevelMultipartUpload"

+ 9 - 9
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m

@@ -379,8 +379,8 @@
         KWeakSelf
         ComontAlretDeleteTypeViewController *curAlretVC= [[ComontAlretDeleteTypeViewController alloc]
                                                           initWithTitle:titleStr
-                                                          msg:nil
-                                                          imageStr:nil
+                                                          msg:@""
+                                                          imageStr:@""
                                                           cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                           okTitle:NSLocalizedString(@"other_confirm",nil)
                                                           otherTitle:tipStr
@@ -404,7 +404,7 @@
         KWeakSelf
         ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
                                                                                          msg:delTipTip
-                                                                                    imageStr:nil
+                                                                                    imageStr:@""
                                                                                  cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                      okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
                                                                                   didClickOk:^{
@@ -918,7 +918,7 @@
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
                                                                                      msg:NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil)
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
                                                                               didClickOk:^{
@@ -988,7 +988,7 @@
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
                                                                                      msg:NSLocalizedString(@"File_upload_Record_clear_fail_Tip_msg",nil)
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
                                                                               didClickOk:^{
@@ -1146,7 +1146,7 @@
 - (void)downloadTaskFinishedNoti:(NSNotification *)notification
 {
     customDownloadOperation *model = notification.object;
-    NSString *url = model.url;
+    //NSString *url = model.url;
     
     [self getDownloadDataInDatabaseFun:NO];
 }
@@ -1229,7 +1229,7 @@
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
                                                                                      msg:NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil)
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
                                                                               didClickOk:^{
@@ -1258,7 +1258,7 @@
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
                                                                                      msg:NSLocalizedString(@"File_upload_Record_clear_fail_Tip_msg",nil)
-                                                                                imageStr:nil
+                                                                                imageStr:@""
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
                                                                               didClickOk:^{
@@ -1321,7 +1321,7 @@
     //[self showNewIndicatorWithCanBack:YES canTouch:NO];
     
     //NSString*code = [[NSString alloc] initWithFormat:@"delFile?path=%@",paraDict[@"path"]]; //delFile?path=[/storage/emulated/0/Download/IMG_6464.HEIC]
-    KWeakSelf //@"delFile"
+    //KWeakSelf //@"delFile"
     [[netWorkManager shareInstance] cloudPhonePostCallBackCode:@"delFile" Parameters:paraDict success:^(id  _Nonnull responseObject) {
         //[weakSelf removeNewIndicator];
         SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];