Procházet zdrojové kódy

Optimize common editor to discard dirty data logic -- 优化common editor 抛弃脏数据逻辑(resolve: #14537)

Ray Zhang před 4 roky
rodič
revize
4d2344f97c

+ 21 - 37
common/customUI/commoneditor/CommonEditorViewController.m

@@ -299,7 +299,7 @@
     [reF endRefreshing];
     
     reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
-    [self refresh:nil];
+    [self refresh:nil discardDirty:true];
 }
 
 
@@ -1364,10 +1364,10 @@
     }
     return to;
 }
--(void) refresh:(NSString*) trigger
-{
-    [self refresh:trigger discardDirty:false];
-}
+//-(void) refresh:(NSString*) trigger
+//{
+//    [self refresh:trigger discardDirty:false];
+//}
 -(void) refresh:(NSString*) trigger discardDirty:(bool) discardDirty
 {
     
@@ -2154,10 +2154,8 @@
                 }
                 
             }
-            if(!discardDirty)
-                [self refresh:refresh_trigger] ;
-            else
-                [self refresh:refresh_trigger discardDirty:true];
+           
+                [self refresh:refresh_trigger discardDirty:discardDirty];
             return ;
         }
         
@@ -2345,10 +2343,8 @@
                 }
                 
             }
-            if(!discardDirty)
-            [self refresh:refresh_trigger] ;
-            else
-                [self refresh:refresh_trigger discardDirty:false];
+
+                [self refresh:refresh_trigger discardDirty:discardDirty];
             return ;
         }
         
@@ -2585,10 +2581,8 @@
                 }
                 
             }
-            if(!discardDirty)
-                [self refresh:refresh_trigger] ;
-            else
-                [self refresh:refresh_trigger discardDirty:true];
+ 
+                [self refresh:refresh_trigger discardDirty:discardDirty];
             
         }
         else if(partial_refresh)
@@ -2740,10 +2734,8 @@
                 }
                 
             }
-            if(!discardDirty)
-                [self refresh:refresh_trigger] ;
-            else
-                [self refresh:refresh_trigger discardDirty:true];
+
+                [self refresh:refresh_trigger discardDirty:discardDirty];
             
         }
         else if(partial_refresh)
@@ -5383,10 +5375,8 @@
     
     if(refresh==1)
     {
-        if(!discardDirty)
-            [self refresh:refresh_trigger] ;
-        else
-            [self refresh:refresh_trigger discardDirty:true];
+
+            [self refresh:refresh_trigger discardDirty:discardDirty];
     }
     [self.editorTable reloadData ];
 }
@@ -5490,10 +5480,8 @@
             }
             
         }
-        if(!discardDirty)
-            [self refresh:refresh_trigger] ;
-        else
-            [self refresh:refresh_trigger discardDirty:true];
+
+            [self refresh:refresh_trigger discardDirty:discardDirty];
         return ;
     }
     
@@ -6293,10 +6281,8 @@
     
     if(refresh==1)
     {
-        if(!discardDirty)
-            [self refresh:refresh_trigger] ;
-        else
-            [self refresh:refresh_trigger discardDirty:true];
+
+            [self refresh:refresh_trigger discardDirty:discardDirty];
     }
 }
 
@@ -6377,10 +6363,8 @@
     
     if(refresh==1)
     {
-        if(!discardDirty)
-            [self refresh:refresh_trigger] ;
-        else
-            [self refresh:refresh_trigger discardDirty:true];
+
+            [self refresh:refresh_trigger discardDirty:discardDirty];
     }
     DebugLog(@"switch unlock");
    // [self.switchlock unlock];