diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index a74d003..5d36b68 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/AppDelegate.m b/ProductApp/ProductApp/AppDelegate.m index c5a0638..1d5392d 100644 --- a/ProductApp/ProductApp/AppDelegate.m +++ b/ProductApp/ProductApp/AppDelegate.m @@ -23,7 +23,11 @@ #import "SSENetWorkManager.h" -@interface AppDelegate () +#import +#import +#import + +@interface AppDelegate () @end @@ -48,10 +52,6 @@ [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:HomeToosRef]; [UserInfoModel setAiChatIsDrawing:0]; -// if(DEBUG) -// { -// [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:YingDaoYe]; -// } [self.window makeKeyAndVisible]; @@ -70,6 +70,13 @@ [WXApi registerApp:WeiXinAPPID universalLink:WeiXinUrlLink]; + if([[[NSUserDefaults standardUserDefaults] objectForKey:UserXieYiOk] intValue] == 1) + { + ///同意了协议再注册友盟 + [UMConfigure initWithAppkey:YouMengAppKey channel:@"App Store"]; + [UMCommonLogManager setUpUMCommonLogManager]; + } + ///禁止黑暗模式 #if defined(__IPHONE_13_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0 @@ -108,13 +115,13 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; NSLog(@"preGetToken:%@", preDic); }]; -// //推送 -// // 通过个推平台分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用 -// [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions]; -// -// // 注册远程通知 -// [GeTuiSdk registerRemoteNotification: (UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge)]; -// + //推送 + // 通过个推平台分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用 + [GeTuiSdk startSdkWithAppId:kGtAppId appKey:kGtAppKey appSecret:kGtAppSecret delegate:self launchingOptions:launchOptions]; + + // 注册远程通知 + [GeTuiSdk registerRemoteNotification: (UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge)]; + }); } -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options @@ -126,19 +133,19 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; [[NSNotificationCenter defaultCenter] postNotificationName:ZhiFuBaoPayNotifi object:resultDic]; }]; } -// if([MobClickLink handleLinkURL:url delegate:self]) -// { -// return YES; -// } + if([MobClickLink handleLinkURL:url delegate:self]) + { + return YES; + } return [WXApi handleOpenURL:url delegate:self]; } - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void(^)(NSArray> * __nullable restorableObjects))restorationHandler { -// if([MobClickLink handleUniversalLink:userActivity delegate:self]) -// { -// return YES; -// } + if([MobClickLink handleUniversalLink:userActivity delegate:self]) + { + return YES; + } return [WXApi handleOpenUniversalLink:userActivity delegate:self]; diff --git a/ProductApp/ProductApp/Configure/ConfigireSetting.h b/ProductApp/ProductApp/Configure/ConfigireSetting.h index 2b99ead..8b5c57b 100644 --- a/ProductApp/ProductApp/Configure/ConfigireSetting.h +++ b/ProductApp/ProductApp/Configure/ConfigireSetting.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN #define BaseUrl @"https://aiw.batiao8.com/" ///下载地址 -#define DownLoadUrl @"https://aiw.batiao8.com/" +#define DownLoadUrl @"itms-apps://itunes.apple.com/cn/app/id6737800093?mt=8" ///加密字符 #define MDPassword @"HQ48tw5vmE0BcQbsPlrcK5rXUifO6ANT" @@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN #define XunFeiAppId @"a26724a7" ///友盟 -#define YouMengAppKey @"" +#define YouMengAppKey @"66963cb0cac2a664de6dbee6" //网络请求数据回调block #define SAFE_BLOCK_CALL_NO_P(b) (b == nil ?: b()) diff --git a/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m b/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m index 9e1c044..fc104e5 100644 --- a/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m +++ b/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m @@ -267,6 +267,7 @@ NSString *strpage = [Tools isStringnil:[dic objectForKey:@"page"]]; if([strpage isEqualToString:@"recharge"]) { + if([UserInfoModel shareModel].vip.intValue == 3)return; StartPayViewController *vc = [StartPayViewController new]; vc.ptype = 1; vc.source = @"banner tools_banner"; diff --git a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m index 1992648..8416a8f 100644 --- a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m +++ b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m @@ -120,6 +120,13 @@ { if(self.isquanxian==YES || self.isshiyong==YES)return; [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { + for(UIView *view in self.view.subviews) + { + if([view isKindOfClass:[KaiTongAlterView class]]) + { + [view removeFromSuperview]; + } + } if(value==NO) { KaiTongAlterView *view = [[KaiTongAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; diff --git a/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m b/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m index 0183e43..c74f0e2 100644 --- a/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m +++ b/ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m @@ -269,10 +269,10 @@ -(void)nextAction { - [StartZNPPTHUDAlter show]; + [LoadAlterView show]; ExamplePptModelDataItems *model = self.arrdata[self.bannerView.currentIndex]; [NetWorkManager requestExamplePptDetailData:self ID:model.ID Callback:^(BOOL state, ExamplePptDetailModel *responseObject, NSString * _Nullable describle) { - [StartZNPPTHUDAlter dismis]; + [LoadAlterView dismiss]; if(state) { StartZNPPTDaGangViewController *vc = [StartZNPPTDaGangViewController new]; diff --git a/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m b/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m index 3381230..f01f47c 100644 --- a/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m +++ b/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m @@ -137,6 +137,13 @@ { if(self.isquanxian==YES || self.isshiyong==YES)return; [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { + for(UIView *view in self.view.subviews) + { + if([view isKindOfClass:[KaiTongAlterView class]]) + { + [view removeFromSuperview]; + } + } if(value==NO) { KaiTongAlterView *view = [[KaiTongAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; diff --git a/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m b/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m index d8ab1cc..6dca311 100644 --- a/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m +++ b/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m @@ -147,7 +147,7 @@ #pragma mark - custom delegate - 自定义或者第三方控件的delegate - (NSInteger)numberOfChildViewControllers { - return self.arrdata.count; + return self.arrdata.count+1; } - (UIViewController *)childViewController:(UIViewController *)reuseViewController forIndex:(NSInteger)index { diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m index 830a17e..628d435 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m @@ -79,6 +79,7 @@ NSString *strpage = [Tools isStringnil:[dic objectForKey:@"page"]]; if([strpage isEqualToString:@"recharge"]) { + if([UserInfoModel shareModel].vip.intValue == 3)return; StartPayViewController *vc = [StartPayViewController new]; vc.ptype = 1; vc.source = @"bannner home_banner"; diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m index 89f29d5..4f1d7c1 100644 --- a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m @@ -33,8 +33,8 @@ [tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.equalTo(self.view); }]; - [self.tableView setEmptyDataSetDelegate:self]; - [self.tableView setEmptyDataSetSource:self]; + [tableView setEmptyDataSetDelegate:self]; + [tableView setEmptyDataSetSource:self]; _tableView = tableView; tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ self.ipage=1; @@ -136,7 +136,7 @@ make.top.offset(50); }]; - NSString *str = @"暂无结果"; + NSString *str = @"暂无数据"; UILabel *lbname = [[UILabel alloc] init]; [lbname setText:str]; [lbname setTextColor:RGBCOLOR(51, 51, 51)]; @@ -148,17 +148,6 @@ make.centerX.equalTo(viewback); }]; -// UILabel *lbinfo = [[UILabel alloc] init]; -// [lbinfo setText:@"抱歉没有查询到相关的文章"]; -// [lbinfo setTextColor:RGBCOLOR(109, 109, 109)]; -// [lbinfo setTextAlignment:NSTextAlignmentCenter]; -// [lbinfo setFont:[UIFont systemFontOfSize:16]]; -// [viewback addSubview:lbinfo]; -// [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.equalTo(lbname.mas_bottom).offset(10); -// make.centerX.equalTo(viewback); -// }]; - return viewback; } diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m index 3447968..fbcc4da 100644 --- a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m @@ -122,7 +122,7 @@ make.top.offset(50); }]; - NSString *str = @"暂无结果"; + NSString *str = @"暂无数据"; UILabel *lbname = [[UILabel alloc] init]; [lbname setText:str]; [lbname setTextColor:RGBCOLOR(51, 51, 51)]; @@ -134,17 +134,6 @@ make.centerX.equalTo(viewback); }]; -// UILabel *lbinfo = [[UILabel alloc] init]; -// [lbinfo setText:@"抱歉没有查询到相关的文章"]; -// [lbinfo setTextColor:RGBCOLOR(109, 109, 109)]; -// [lbinfo setTextAlignment:NSTextAlignmentCenter]; -// [lbinfo setFont:[UIFont systemFontOfSize:16]]; -// [viewback addSubview:lbinfo]; -// [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.equalTo(lbname.mas_bottom).offset(10); -// make.centerX.equalTo(viewback); -// }]; - return viewback; } diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m index 2b96df0..43794f8 100644 --- a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m @@ -143,7 +143,7 @@ make.top.offset(50); }]; - NSString *str = @"暂无结果"; + NSString *str = @"暂无数据"; UILabel *lbname = [[UILabel alloc] init]; [lbname setText:str]; [lbname setTextColor:RGBCOLOR(51, 51, 51)]; @@ -155,17 +155,6 @@ make.centerX.equalTo(viewback); }]; -// UILabel *lbinfo = [[UILabel alloc] init]; -// [lbinfo setText:@"抱歉没有查询到相关的文章"]; -// [lbinfo setTextColor:RGBCOLOR(109, 109, 109)]; -// [lbinfo setTextAlignment:NSTextAlignmentCenter]; -// [lbinfo setFont:[UIFont systemFontOfSize:16]]; -// [viewback addSubview:lbinfo]; -// [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.equalTo(lbname.mas_bottom).offset(10); -// make.centerX.equalTo(viewback); -// }]; - return viewback; }