Преглед изворни кода

修复npd mobile scanner 设置开关引起的闪退

Ray Zhang пре 6 година
родитељ
комит
cda6cec18c

+ 1 - 11
RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -3141,18 +3141,12 @@ void UncaughtExceptionHandler(NSException *exception) {
         
 #ifdef RA_NOTIFICATION
         if((_eventsFeedback!=nil)&&([_eventsFeedback respondsToSelector:@selector(onStatusChanged:)])){
-            dispatch_async(dispatch_get_main_queue(), ^{
             [_eventsFeedback onStatusChanged:@"Waiting for scanner..."];
-                });
         }
 #else
         
         ActiveViewController* avc=(ActiveViewController*)self.active_controller;
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [avc onStatusChanged:@"Waiting for scanner..."];
-        });
-        
+        [avc onStatusChanged:@"Waiting for scanner..."];
 #endif
         
         
@@ -3164,16 +3158,12 @@ void UncaughtExceptionHandler(NSException *exception) {
         
 #ifdef RA_NOTIFICATION
         if((_eventsFeedback!=nil)&&([_eventsFeedback respondsToSelector:@selector(onStatusChanged:)])){
-            dispatch_async(dispatch_get_main_queue(), ^{
             [_eventsFeedback onStatusChanged:[NSString stringWithFormat:@"Error initializing ScanAPI:%ld",result]];
-                });
         }
 #else
         
         ActiveViewController* avc=(ActiveViewController*)self.active_controller;
-        dispatch_async(dispatch_get_main_queue(), ^{
         [avc onStatusChanged:[NSString stringWithFormat:@"Error initializing ScanAPI:%ld",result]];
-             });
 #endif
         
 

+ 4 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/ScannerSettingViewController.m

@@ -805,6 +805,7 @@
 }
 -(void) onStatusChanged:(NSString*) status
 {
+    dispatch_async(dispatch_get_main_queue(), ^{
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     switch (appDelegate.api_Status) {
@@ -825,7 +826,9 @@
         default:
             break;
     }
-    _Status.text = status;
+    self.Status.text = status;
+        
+        });
 }
 -(void) onLogUpdate
 {