Skip to content

Commit bd99937

Browse files
Updated to v9.0.2
1 parent 57ad3a1 commit bd99937

File tree

69 files changed

+819
-867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+819
-867
lines changed

ios/Objective-C/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2626
[[UINavigationBar appearance] setScrollEdgeAppearance:appearance];
2727
}
2828

29-
// It is recommended to initialize the License in AppDelegate
29+
// It is recommended to initialize the License in AppDelegate.
3030
// The license string here is a time-limited trial license. Note that network connection is required for this license to work.
3131
// You can also request an extension for your trial license in the customer portal: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=installer&package=ios
3232
[DynamsoftBarcodeReader initLicense:@"DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" verificationDelegate:self];

ios/Objective-C/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/ViewController.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ - (void)setupSession
8282

8383
self.captureSession.sessionPreset = AVCaptureSessionPresetHigh;
8484

85-
// Vedio
86-
AVCaptureDevice *vedioDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
87-
AVCaptureDeviceInput *deviceInput = [AVCaptureDeviceInput deviceInputWithDevice:vedioDevice error:nil];
85+
// Video
86+
AVCaptureDevice *videoDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
87+
AVCaptureDeviceInput *deviceInput = [AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:nil];
8888
if (deviceInput){
8989
if([self.captureSession canAddInput:deviceInput]) {
9090
[self.captureSession addInput:deviceInput];
@@ -110,7 +110,7 @@ - (void)setupSession
110110
}
111111
}
112112

113-
self.videoQueue = dispatch_queue_create("cc.VideoQueue", NULL);
113+
self.videoQueue = dispatch_queue_create("com.dynamsoft.videoQueue", NULL);
114114

115115
dispatch_async(self.videoQueue, ^{
116116
[self.captureSession startRunning];

ios/Objective-C/DecodeWithAVCaptureSession/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ target 'DecodeWithAVCaptureSession' do
66
use_frameworks!
77

88
# Pods for DecodeWithAVCaptureSession
9-
pod 'DynamsoftBarcodeReader','9.0.1'
9+
pod 'DynamsoftBarcodeReader','9.0.2'
1010

1111
end

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/AppDelegate.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5050

5151
- (void)applicationDidEnterBackground:(UIApplication *)application
5252
{
53-
[[NSNotificationCenter defaultCenter] postNotificationName:appDidEnterToBackground_Notication object:nil];
53+
[[NSNotificationCenter defaultCenter] postNotificationName:AppDidEnterToBackgroundNotification object:nil];
5454
}
5555

5656
- (void)applicationWillEnterForeground:(UIApplication *)application
5757
{
58-
[[NSNotificationCenter defaultCenter] postNotificationName:appWillEnterToForeground_Notication object:nil];
58+
[[NSNotificationCenter defaultCenter] postNotificationName:AppWillEnterToForegroundNotification object:nil];
5959
}
6060

6161
//MARK: DBRLicenseVerificationListener

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Base/BaseNavigationController.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ @implementation BaseNavigationController
1616
- (void)viewDidLoad
1717
{
1818
[super viewDidLoad];
19-
20-
2119
}
2220

2321
- (BOOL)prefersStatusBarHidden
@@ -29,7 +27,6 @@ - (UIStatusBarStyle)preferredStatusBarStyle
2927
{
3028
UIViewController* topVC = self.topViewController;
3129
return [topVC preferredStatusBarStyle];
32-
3330
}
3431

3532

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Base/BaseViewController.m

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ @interface BaseViewController ()<UIGestureRecognizerDelegate>
1515

1616
@implementation BaseViewController
1717

18-
- (void)dealloc
19-
{
20-
21-
NSLog(@"%@ dealloc--", [self class]);
22-
}
23-
2418
- (void)viewDidLoad
2519
{
2620
[super viewDidLoad];
@@ -32,7 +26,6 @@ - (void)viewDidLoad
3226
self.navBarHairlineImageView = [self findHairlineImageViewUnder:self.navigationController.navigationBar];
3327
self.navBarHairlineImageView.hidden = YES;
3428

35-
3629
}
3730

3831
- (UIImageView *)findHairlineImageViewUnder:(UIView *)view {
@@ -48,7 +41,6 @@ - (UIImageView *)findHairlineImageViewUnder:(UIView *)view {
4841
return nil;
4942
}
5043

51-
5244
- (UIStatusBarStyle)preferredStatusBarStyle
5345
{
5446
return UIStatusBarStyleLightContent;

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Category/UIView+FrameAdditions.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ NS_ASSUME_NONNULL_BEGIN
1111

1212
@interface UIView (FrameAdditions)
1313

14-
/// hegiht
14+
/// Hegiht
1515
@property (nonatomic,assign) CGFloat height;
16-
/// width
16+
/// Width
1717
@property (nonatomic,assign) CGFloat width;
1818

19-
/// Y
19+
/// Y
2020
@property (nonatomic,assign) CGFloat top;
21-
/// X
21+
/// X
2222
@property (nonatomic,assign) CGFloat left;
2323

24-
/// Y + Height
24+
/// Y + Height
2525
@property (nonatomic,assign) CGFloat bottom;
26-
/// X + width
26+
/// X + Width
2727
@property (nonatomic,assign) CGFloat right;
2828

2929
@end

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Category/UIViewController+HideNavBackTitle.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ - (void)ac_viewDidAppear{
2626

2727
void swizzleMethod(Class class, SEL originalSelector, SEL swizzledSelector)
2828
{
29-
// the method might not exist in the class, but in its superclass
29+
// The method might not exist in the class, but in its superclass.
3030
Method originalMethod = class_getInstanceMethod(class, originalSelector);
3131
Method swizzledMethod = class_getInstanceMethod(class, swizzledSelector);
3232

33-
// class_addMethod will fail if original method already exists
33+
// class_addMethod will fail if original method already exists.
3434
BOOL didAddMethod = class_addMethod(class, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod));
3535

36-
// the method doesn’t exist and we just added one
36+
// The method doesn’t exist and we just added one.
3737
if (didAddMethod) {
3838
class_replaceMethod(class, swizzledSelector, method_getImplementation(originalMethod), method_getTypeEncoding(originalMethod));
3939
}

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Handles/GeneralSettingsHandle.h

Lines changed: 21 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,91 +13,59 @@ NS_ASSUME_NONNULL_BEGIN
1313

1414
@interface GeneralSettingsHandle : NSObject<NSCopying, NSMutableCopying>
1515

16-
//MARK: about BarcodeFormat
17-
/**
18-
the instance of all barcode format
19-
*/
16+
//MARK: About BarcodeFormat
17+
18+
/// The instance of all barcode format.
2019
@property (nonatomic) BarcodeFormat allBarcodeFormat;
2120

22-
/**
23-
the instance of BarcodeFormatONED
24-
*/
21+
/// The instance of BarcodeFormatONED.
2522
@property (nonatomic) BarcodeFormatONED barcodeFormatONED;
2623

27-
/**
28-
the instance of BarcodeFormatGS1DATABAR
29-
*/
24+
/// The instance of BarcodeFormatGS1DATABAR.
3025
@property (nonatomic) BarcodeFormatGS1DATABAR barcodeFormatGS1DATABAR;
3126

32-
/**
33-
the instance of BarcodeFormat2POSTALCODE
34-
*/
27+
/// The instance of BarcodeFormat2POSTALCODE.
3528
@property (nonatomic) BarcodeFormat2POSTALCODE barcodeFormat2POSTALCODE;
3629

37-
//MARK: about Camera Settings
30+
//MARK: About CameraSettings
3831

39-
/**
40-
the instance of CameraSettings
41-
*/
32+
/// The instance of CameraSettings.
4233
@property (nonatomic) CameraSettings cameraSettings;
4334

44-
/**
45-
the instance of CameraSettings
46-
*/
35+
/// The instance of CameraSettings.
4736
@property (nonatomic) ScanRegion scanRegion;
4837

49-
/**
50-
the instance of DCEResolution
51-
*/
38+
/// The instance of DCEResolution.
5239
@property (nonatomic) DCEResolution dceResolution;
5340

54-
//MARK: about View Settings
41+
//MARK: About ViewSettings.
5542

56-
/**
57-
the instance of DCEViewSettings
58-
*/
43+
/// The instance of DCEViewSettings.
5944
@property (nonatomic) DCEViewSettings dceViewSettings;
6045

61-
//MARK: about DCE and DBR
62-
/**
63-
the instance of DynamsoftBarcodeReader
64-
*/
65-
@property (nonatomic, strong) DynamsoftBarcodeReader *barcodeReader;
46+
//MARK: About DCE and DBR
6647

48+
/// The instance of DynamsoftBarcodeReader.
49+
@property (nonatomic, strong) DynamsoftBarcodeReader *barcodeReader;
6750

68-
/**
69-
the instance of DynamsoftCameraEnhancer
70-
*/
51+
/// The instance of DynamsoftCameraEnhancer.
7152
@property (nonatomic, strong) DynamsoftCameraEnhancer *cameraEnhancer;
7253

73-
74-
/**
75-
the instance of DCECameraView
76-
*/
54+
/// The instance of DCECameraView.
7755
@property (nonatomic, strong) DCECameraView *cameraView;
7856

79-
80-
/**
81-
the instance of iPublicRuntimeSettings
82-
*/
57+
/// The instance of iPublicRuntimeSettings.
8358
@property (nonatomic, strong) iPublicRuntimeSettings *ipublicRuntimeSettings;
8459

85-
86-
/**
87-
Whether to enable continuous decoding
88-
*/
60+
/// Whether to enable continuous decoding.
8961
@property (nonatomic, assign) BOOL continuousScan;
9062

9163
+ (GeneralSettingsHandle *)setting;
9264

93-
/**
94-
set default data
95-
*/
65+
/// Set default data.
9666
- (void)setDefaultData;
9767

98-
/**
99-
update ipublicRuntimeSettings
100-
*/
68+
/// Update ipublicRuntimeSettings.
10169
- (BOOL)updateIpublicRuntimeSettings;
10270

10371
@end

ios/Objective-C/GeneralSettingsObjC/GeneralSettingsObjC/Handles/GeneralSettingsHandle.m

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ - (id)mutableCopyWithZone:(NSZone *)zone
3434
return [GeneralSettingsHandle setting];
3535
}
3636

37-
//MARK: setting default data
37+
//MARK: Setting default data
3838
- (void)setDefaultData
3939
{
4040
// continuous scan
4141
self.continuousScan = YES;
4242

43-
// Barcode Format data initialization
44-
// Set BarcodeFormat
43+
// Barcode Format data initialization.
44+
// Set BarcodeFormat.
4545
// Specify the barcode formats to match your requirements.
4646
// The less barcode formats, the higher processing speed.
4747
_allBarcodeFormat.format_OneD = @"OneD";
@@ -59,7 +59,7 @@ - (void)setDefaultData
5959
_allBarcodeFormat.format_DotCode = @"Dot Code";
6060
_allBarcodeFormat.format_PHARMACODE = @"Pharma Code";
6161

62-
// Set BarcodeFormatONED
62+
// Set BarcodeFormatONED.
6363
_barcodeFormatONED.format_Code39 = @"Code 39";
6464
_barcodeFormatONED.format_Code128 = @"Code 128";
6565
_barcodeFormatONED.format_Code39Extended = @"Code 39 EXtended";
@@ -74,7 +74,7 @@ - (void)setDefaultData
7474
_barcodeFormatONED.format_Industrial25 = @"Industrial 25";
7575
_barcodeFormatONED.format_MSICode = @"MSI Code";
7676

77-
// Set barcodeFormatGS1DATABAR
77+
// Set barcodeFormatGS1DATABAR.
7878
_barcodeFormatGS1DATABAR.format_GS1DatabarOmnidirectional = @"GS1 Databar Omnidirectional";
7979
_barcodeFormatGS1DATABAR.format_GS1DatabarTrunncated = @"GS1 Databar Truncated";
8080
_barcodeFormatGS1DATABAR.format_GS1DatabarStacked = @"GS1 Databar Stacked";
@@ -83,16 +83,16 @@ - (void)setDefaultData
8383
_barcodeFormatGS1DATABAR.format_GS1DatabarExpanedStacked = @"GS1 Databar Expaned Stacked";
8484
_barcodeFormatGS1DATABAR.format_GS1DatabarLimited = @"GS1 Databar Limited";
8585

86-
// Set barcodeFormat2POSTALCODE
86+
// Set barcodeFormat2POSTALCODE.
8787
_barcodeFormat2POSTALCODE.format2_USPSIntelligentMail = @"USPS Intelligent Mail";
8888
_barcodeFormat2POSTALCODE.format2_Postnet = @"Postnet";
8989
_barcodeFormat2POSTALCODE.format2_Planet = @"Planet";
9090
_barcodeFormat2POSTALCODE.format2_AustralianPost = @"Australian Post";
9191
_barcodeFormat2POSTALCODE.format2_RM4SCC = @"Royal Mail";
9292

93-
// Camera Settings data initialization
93+
// Camera Settings data initialization.
9494

95-
// Camera Settings
95+
// Camera Settings.
9696
// Enhanced focus feature of Dynamsoft Camera Enhancer will enhance the focus ability of low-end device.
9797
// Frame filter feature of Dynamsoft Camera Enhancer will filter out the blurry video frame.
9898
// Sensor filter feature of Dynamsoft Camera Enhancer will filter out the frames captured when the device is shaking.
@@ -112,7 +112,7 @@ - (void)setDefaultData
112112
_cameraSettings.dceFastModeIsOpen = NO;
113113
_cameraSettings.dceScanRegionIsOpen = NO;
114114

115-
// Set scanRegion
115+
// Set scanRegion.
116116
// Specify a scanRegion will help you improve the processing speed.
117117
_scanRegion.scanRegionTop = @"Scan Region Top";
118118
_scanRegion.scanRegionBottom = @"Scan Region Bottom";
@@ -123,11 +123,11 @@ - (void)setDefaultData
123123
_scanRegion.scanRegionLeftValue = 0;
124124
_scanRegion.scanRegionRightValue = 100;
125125

126-
// DCE resolutin default value
126+
// DCE resolutin default value.
127127
_dceResolution.selectedResolutionValue = EnumRESOLUTION_HIGH;
128128

129129

130-
// View Settings data initialization
130+
// View Settings data initialization.
131131
_dceViewSettings.displayOverlay = @"Display Overlay";
132132
_dceViewSettings.displayTorchButton = @"Display Torch Button";
133133
_dceViewSettings.displayOverlayIsOpen = YES;
@@ -136,7 +136,7 @@ - (void)setDefaultData
136136
}
137137

138138
/**
139-
update ipublicRuntimeSettings
139+
Update ipublicRuntimeSettings.
140140
*/
141141
- (BOOL)updateIpublicRuntimeSettings
142142
{

0 commit comments

Comments
 (0)