소스 검색

1.代码暂存

huangxiaodong 2 년 전
부모
커밋
0c2fb7b755

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL  isSuspendType;
 @property (nonatomic, assign) BOOL  isUploadIngType;
 @property (nonatomic, assign) NSInteger  curUploadModelNumbers;
-
+@property (nonatomic, assign) NSInteger  reUploadIngSelectIndex;
 #pragma mark 读取数据库数据
 - (void)getDataInDatabaseFun:(BOOL)isReGet complete:(custom_complete_Arr)complete;
 

+ 25 - 3
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -224,14 +224,21 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 
 - (void)beginUploadFileFun
 {
-    if(_isUploadIngType){
+    if(_isUploadIngType && _reUploadIngSelectIndex <= 0){
         return;
     }
     
     _isSuspendType = NO;
     _isUploadIngType = YES;
     
-    _curUploadFileDataModel = _fileModelDataArr.firstObject;
+    if(_reUploadIngSelectIndex > 0 && _reUploadIngSelectIndex < _fileModelDataArr.count){
+        _curUploadFileDataModel = _fileModelDataArr[_reUploadIngSelectIndex];
+    }
+    else
+    {
+        _curUploadFileDataModel = _fileModelDataArr.firstObject;
+    }
+    
     
     if(!_curUploadFileDataModel){
         return;
@@ -450,15 +457,30 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         _fileModelDataArr = [NSMutableArray new];
     }
     
+    _reUploadIngSelectIndex = 0;
+    
     for (uploadFileDataModel*addModel in Arr) {
         
         BOOL needAddModel = YES;
         
-        for (uploadFileDataModel*preModel in _fileModelDataArr) {
+        //for (uploadFileDataModel*preModel in _fileModelDataArr)
+        for (int i=0;i< _fileModelDataArr.count;i++)
+        {
+            uploadFileDataModel*preModel = _fileModelDataArr[i];
+            
             if(addModel.bg_id.integerValue == preModel.bg_id.integerValue
                || [addModel.localIdentifier isEqualToString:preModel.localIdentifier])
             {
                 needAddModel = NO;
+                
+                if(_reUploadIngSelectIndex == 0){
+                    _reUploadIngSelectIndex = i;
+                    
+                    if(i==0){
+                        _reUploadIngSelectIndex = -1;
+                    }
+                }
+                
                 break;
             }
         }

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -71,7 +71,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    [self->glkshowImageView display];
+    //[self->glkshowImageView display];
 }
 
 - (void)showIMage