diff --git a/.travis.yml b/.travis.yml index 29f457aaa..53456cd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,28 +5,15 @@ env: global: - LANG=en_US.UTF-8 - LC_ALL=en_US.UTF-8 - - APPNAME="Example" - - 'DEVELOPER_NAME="iPhone Distribution: Beijing Yishu Technology Co., Ltd. (SXBU677CPT)"' - - PROFILE_NAME="sdk_demo" - - secure: EZE8xmWQcBcNMFVjP2wH/ipYgs86PJ4MdaiqUzabWjQu5NAhzh3yHWcaLXxXgB0zVCt3E4xxKCaBse+ccEG/5URU5tm3CPHhFwwuhPtCLHaYiUWkilzdGud8svQvlopY9QS3I/M7WVA96dla2MUFzhbN16QZFAANsoDJoT9e6YWR4mNOCkgVCeYYS1FtogVIGNFL5NNKLVN2F3WXMtINZZsIKF309DnaSAOLfEWgTgxX2QmP0S+gxG10Ewm/doM5J39nrwvNoxhITElrfNFMVjCMAQZmEBwJN/OchOQrdEuznJ5jzyNOXhGpwUGN3h9weTsuPHwbemj/GOEsK0rVvfAol002Lwl3Wq18IPJ6Yda8bYles9qqgexbNKvHQnuVJ3lnid/kSPQTqm6CrnWAqmvVz46utDVTtBsKrrJWI8I8X7+nUtIaX9XciEcMz26AoBCGbDYH2EYt3zZ/OjvbZGBY0iX0wM3y2ltI0pUBcUHW4UEzAH9QGLzGctf+7PsoedqMZSVmdttGM9ypoONScfK9xU1BiF+7A/oOce+pKCVG+YjjODcp3oOej64g/kWM/8A6jToDjfFUMH2nvfFo9Fy7gx/2kouJAYcFBHnbXOv9aLjcHvofwI49mjT1j9NXMXFbrSzVIr7S087j88eVBqnq+eASHIYtpCcfNJpw2hA= - - secure: RXcb5hMJbBQQdKCd+Nk7Nm371VAOyElI6KksI7Sogz3wC8o0QSICrRW8CKwaDX34nEnRHB79IA1bvx1zOZ3ZsBU07n24GYn8oJRrS5WWWYtR6xVmqH1iV9G9iewGo6PwNifiGpElhQziaM1X3hAuEE6UOiE9kJmDjc0ANyEiT0+KpiWmsBOXZ96gheLG2b0hGxrI77Zk2NA76XHkoytXx5Dq4K+jpMlMhP5C22xsX/qqhMTQqS+zFTf/SLD2JrMI6fUs2uv9J7hQxD3zsJCRFxQVtyK7Ste3CQTIihmESAN3hkxvHO3QHWEW2WpnJzPjdtVm5YDkRxnmQBCtNDk9peLPacwJFmef3NQ947pfrN+bEOxI+EgQuZEjDaly8mJerzEFN0vVPDCJ45KKjpNUEx1RntE2V99uT5+8IvpnWTucRf/+ik8GApW+B9rVrPx2t0oVcCmC1y3K0xJ4vTBK/1SHxF4FOB6NR64sE3VhVnC78SG89t4ydy0KUFdLJquIUd/8+xcIEj+1phfOZWi2ZK/1bRv5Sy0xWtOwLt1RyKK53Qx5ERwC3UY/z0urUXw8IgXXXOOnQY6P3gdtEuxE8Z855dNPqMWWd/CFppyaMZJVRoamXyJKQso/z5ZtgWDFykL8EYUQV9/1YgyNMMBPRCtm/FwwPC/psBvfvJPDG2U= + before_install: -- openssl version -- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in certificates.tar.enc -d -a -out - certificates.tar -- mkdir ./certificates -- tar xvf certificates.tar -C ./certificates -- chmod +x Scripts/add-key.sh -- chmod +x Scripts/remove-key.sh - brew tap growingio/homebrew-oclint - brew install oclint-growing -before_script: -- "./Scripts/add-key.sh" + script: - set -o pipefail - xcodebuild -workspace GrowingAnalytics.xcworkspace -scheme Example -configuration Release -sdk iphonesimulator -arch x86_64 clean build | xcpretty -r json-compilation-database -o compile_commands.json - oclint-json-compilation-database -e Pods -- -rc GIO_METHOD_ALLOW_UPPERCASE="URL,FMG3DB,TXT,UTF,STM,IMP" -rc GIO_CATEGORY_PREFIX=Growing -rc GIO_CLASS_PREFIX=Growing -max-priority-2=0 -after_script: -- "./Scripts/remove-key.sh" + diff --git a/Example/Example/APITests/GIOInputChangeEventViewController.m b/Example/Example/APITests/GIOInputChangeEventViewController.m index c53738745..e5c4ad468 100644 --- a/Example/Example/APITests/GIOInputChangeEventViewController.m +++ b/Example/Example/APITests/GIOInputChangeEventViewController.m @@ -15,7 +15,7 @@ @interface GIOInputChangeEventViewController () @property (weak, nonatomic) IBOutlet UISearchBar *searchbartest; @property (weak, nonatomic) IBOutlet UILabel *ShowDate; -@property (weak, nonatomic) IBOutlet UIDatePicker *DataPickerOper; +@property (weak, nonatomic) IBOutlet UIDatePicker *dataPickerOper; @end @@ -30,8 +30,8 @@ - (void)viewDidLoad { //[self.searchbartest resignFirstResponder]; self.searchbartest.delegate=self; //日期选择 - self.DataPickerOper.datePickerMode=UIDatePickerModeDate; - [self.DataPickerOper addTarget:self action:@selector(dateChange:) forControlEvents:UIControlEventValueChanged]; + self.dataPickerOper.datePickerMode=UIDatePickerModeDate; + [self.dataPickerOper addTarget:self action:@selector(dateChange:) forControlEvents:UIControlEventValueChanged]; } diff --git a/Example/Example/APITests/MeasurementProtocolTableViewController.m b/Example/Example/APITests/MeasurementProtocolTableViewController.m index 1a030ff20..23d2b2e23 100644 --- a/Example/Example/APITests/MeasurementProtocolTableViewController.m +++ b/Example/Example/APITests/MeasurementProtocolTableViewController.m @@ -50,14 +50,14 @@ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { //更新列表头颜色 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { - static NSString *headerId = @"customHeader"; + static NSString *kGrowingheaderId = @"customHeader"; UITableViewHeaderFooterView *vHeader; - vHeader = [tableView dequeueReusableHeaderFooterViewWithIdentifier:headerId]; + vHeader = [tableView dequeueReusableHeaderFooterViewWithIdentifier:kGrowingheaderId]; if (!vHeader) { - vHeader = [GIOConstants globalSectionHeaderForIdentifier:headerId]; + vHeader = [GIOConstants globalSectionHeaderForIdentifier:kGrowingheaderId]; } vHeader.textLabel.text = [self tableView:tableView titleForHeaderInSection:section]; diff --git a/Example/Example/APITests/PVarEventViewController.m b/Example/Example/APITests/PVarEventViewController.m index 907f2d177..250700b63 100644 --- a/Example/Example/APITests/PVarEventViewController.m +++ b/Example/Example/APITests/PVarEventViewController.m @@ -12,7 +12,7 @@ @interface PVarEventViewController () -@property(nonatomic, strong)UIStoryboard *SB; +@property(nonatomic, strong)UIStoryboard *storyboard; @end @@ -26,7 +26,7 @@ - (void)viewDidLoad { self.PVarNumVal.accessibilityLabel=@"PVarNv"; self.PVarStrVal.accessibilityLabel=@"PVarSv"; - self.SB = [UIStoryboard storyboardWithName:@"Main" bundle:nil]; + self.storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil]; } - (void)didReceiveMemoryWarning { @@ -35,7 +35,7 @@ - (void)didReceiveMemoryWarning { } //setPageVariable操作 -- (IBAction)SetPvarVal:(id)sender { +- (IBAction)setPvarVal:(id)sender { NSString *pvar = self.PVarValiable.text; if ([pvar isEqualToString:@"NULL"]) { // [Growing setPageVariable:nil toViewController:self]; @@ -47,7 +47,7 @@ - (IBAction)SetPvarVal:(id)sender { NSLog(@"******setPageVariable:%@******",pvar); } //-setPageVariableWithKey:andStringValue操作 -- (IBAction)SetPvarWithStr:(id)sender { +- (IBAction)setPvarWithStr:(id)sender { NSString *pvarkey = self.PVarKey.text; NSString *pstrval = self.PVarStrVal.text; //为方便测试，不判断数据 @@ -63,7 +63,7 @@ - (IBAction)SetPvarWithStr:(id)sender { } } //-setPageVariableWithKey:andNumberValue操作 -- (IBAction)SetPvarWithNum:(id)sender { +- (IBAction)setPvarWithNum:(id)sender { NSString *pvarkey = self.PVarKey.text; NSString *pnumval = self.PVarNumVal.text; if ([pvarkey isEqualToString:@"NULL"]) { @@ -80,7 +80,7 @@ - (IBAction)SetPvarWithNum:(id)sender { } } //setPageVariable 值为超过100键值对 -- (IBAction)SetPvarOutRange:(id)sender { +- (IBAction)setPvarOutRange:(id)sender { NSDictionary *pval = [GIOConstants getLargeDictionary]; // [Growing setPageVariable:pval toViewController:self]; NSLog(@"setPageVariable largeDic length is:%ld",pval.count); diff --git a/Example/Example/AppDelegate.m b/Example/Example/AppDelegate.m index ce5126474..68104781c 100644 --- a/Example/Example/AppDelegate.m +++ b/Example/Example/AppDelegate.m @@ -14,7 +14,7 @@ #import #import -static NSString * const kProjectIdForGrowingIO = @"0a1b4118dd954ec3bcc69da5138bdb96"; +static NSString * const kGrowingProjectId = @"0a1b4118dd954ec3bcc69da5138bdb96"; @interface AppDelegate () @@ -28,7 +28,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [Bugly startWithAppId:@"93004a21ca"]; // Config GrowingIO - GrowingConfiguration *configuration = [[GrowingConfiguration alloc] initWithProjectId:kProjectIdForGrowingIO + GrowingConfiguration *configuration = [[GrowingConfiguration alloc] initWithProjectId:kGrowingProjectId launchOptions:launchOptions]; [configuration setLogEnabled:YES]; configuration.samplingRate = 1.0; diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard index 8690e61cd..24829fe69 100644 --- a/Example/Example/Base.lproj/Main.storyboard +++ b/Example/Example/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -482,7 +482,7 @@ - + @@ -1126,8 +1126,8 @@ - + @@ -1374,11 +1374,11 @@ - +