diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 13e4a80..7a2491a 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -5296,7 +5296,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = D5PBFE23SF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -5327,6 +5327,7 @@ ); INFOPLIST_FILE = ProductApp/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极光写作"; + INFOPLIST_KEY_NSCalendarsUsageDescription = "极光写作需要使用日历功能"; INFOPLIST_KEY_NSCameraUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相机"; INFOPLIST_KEY_NSContactsUsageDescription = "极光写作AI助手聊天需要使用通讯录"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "极光写作AI助手聊天需要使用位置信息"; @@ -5366,7 +5367,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = D5PBFE23SF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -5397,6 +5398,7 @@ ); INFOPLIST_FILE = ProductApp/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极光写作"; + INFOPLIST_KEY_NSCalendarsUsageDescription = "极光写作需要使用日历功能"; INFOPLIST_KEY_NSCameraUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相机"; INFOPLIST_KEY_NSContactsUsageDescription = "极光写作AI助手聊天需要使用通讯录"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "极光写作AI助手聊天需要使用位置信息"; diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index 03d6e54..fc607de 100644 Binary files a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512直角 2.png b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512直角 2.png index 0ff629e..e3e9844 100644 Binary files a/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512直角 2.png and b/ProductApp/ProductApp/Assets.xcassets/AppIcon.appiconset/512直角 2.png differ diff --git a/ProductApp/ProductApp/ProductApp.entitlements b/ProductApp/ProductApp/ProductApp.entitlements index 9054d32..094ec0d 100644 --- a/ProductApp/ProductApp/ProductApp.entitlements +++ b/ProductApp/ProductApp/ProductApp.entitlements @@ -13,11 +13,8 @@ com.apple.developer.icloud-services CloudDocuments - CloudKit com.apple.developer.ubiquity-container-identifiers - com.apple.developer.ubiquity-kvstore-identifier - $(TeamIdentifierPrefix)$(CFBundleIdentifier) diff --git a/ProductApp/ProductApp/ProductMain/alter/LoadAlterView.m b/ProductApp/ProductApp/ProductMain/alter/LoadAlterView.m index 8818b20..45029dd 100644 --- a/ProductApp/ProductApp/ProductMain/alter/LoadAlterView.m +++ b/ProductApp/ProductApp/ProductMain/alter/LoadAlterView.m @@ -14,6 +14,10 @@ static LoadAlterView *viewshow; @interface LoadAlterView () @property (nonatomic , strong) PAGView *pagView; + +/// +@property (nonatomic , strong) NSTimer *timer; + @end @implementation LoadAlterView @@ -63,9 +67,26 @@ static LoadAlterView *viewshow; make.centerX.equalTo(viewback); }]; + self.timer = [NSTimer scheduledTimerWithTimeInterval:180 target:self selector:@selector(timedismis) userInfo:nil repeats:NO]; + } return self; } +-(void)timedismis +{ + dispatch_async(dispatch_get_main_queue(), ^{ + if(viewshow){ + if(viewshow.pagView.isPlaying) + { + [viewshow.pagView stop]; + [viewshow.pagView freeCache]; + } + [viewshow removeFromSuperview]; + viewshow = nil; + } + }); +} + +(void)show { @@ -83,6 +104,9 @@ static LoadAlterView *viewshow; dispatch_async(dispatch_get_main_queue(), ^{ if(viewshow) { + [viewshow.timer invalidate]; + viewshow.timer = nil; + if(viewshow.pagView.isPlaying) { [viewshow.pagView stop]; diff --git a/ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m b/ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m index 862cb1d..703311d 100644 --- a/ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m +++ b/ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m @@ -44,7 +44,10 @@ make.top.offset(NavHeight-20); }]; [btback addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - + if(self.viewController.navigationController.viewControllers.count<=1) + { + [btback setHidden:YES]; + } UILabel *lbname = [[UILabel alloc] init]; [lbname setText:@"Hello！"]; @@ -264,6 +267,10 @@ self.backValue(1); } } +-(void)backAction +{ + [self.viewController.navigationController popViewControllerAnimated:YES]; +} -(void)xieyiAction:(UIButton *)sender { sender.selected = !sender.selected; diff --git a/ProductApp/ProductApp/ProductMain/login/view/LoginView.m b/ProductApp/ProductApp/ProductMain/login/view/LoginView.m index e8fcac6..96562ed 100644 --- a/ProductApp/ProductApp/ProductMain/login/view/LoginView.m +++ b/ProductApp/ProductApp/ProductMain/login/view/LoginView.m @@ -59,6 +59,10 @@ }]; [btback addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; + if(self.viewController.navigationController.viewControllers.count<=1) + { + [btback setHidden:YES]; + } UILabel *lbname = [[UILabel alloc] init]; [lbname setText:@"Hello！"]; diff --git a/ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m b/ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m index b1dfe62..384d1d9 100644 --- a/ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m +++ b/ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m @@ -44,7 +44,10 @@ make.top.offset(NavHeight-20); }]; [btback addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; - + if(self.viewController.navigationController.viewControllers.count<=1) + { + [btback setHidden:YES]; + } UILabel *lbname = [[UILabel alloc] init]; [lbname setText:@"Hello！"]; @@ -266,6 +269,10 @@ } } +-(void)backAction +{ + [self.viewController.navigationController popViewControllerAnimated:YES]; +} -(void)xieyiAction:(UIButton *)sender { sender.selected = !sender.selected; diff --git a/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m b/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m index 7a04198..e101901 100644 --- a/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m +++ b/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m @@ -162,7 +162,7 @@ ///真实数据 if(self.arrXZImages.count>0) { - if(self.modelPF==nil || self.modelContentItems==nil) + if(fvalue>=0.98 && (self.modelPF==nil || self.modelContentItems==nil)) { fvalue = 0.98; } diff --git a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m index 52c6722..3971b03 100644 --- a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m @@ -515,7 +515,7 @@ if(state) { self.arrFanWen = responseObject.data.items; - [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:4] withRowAnimation:UITableViewRowAnimationFade]; + [self.tableView reloadData]; } }]; }