diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index b737259..1ddd10c 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/BaseControl/Category/NavGationView/NaviGationView.m b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m index 7cf875b..39eef37 100755 --- a/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m +++ b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m @@ -18,6 +18,12 @@ self.titleLabel.text = title; [self.titleLabel setFont:[UIFont fontWithName:@"Helvetica-Bold" size:18]]; self.titleLabel.textColor = color; + + if([UserInfoModel shareModel].token.length>3) + { + [UserInfoModel shijianShangBao:0 key:@"client.jump.to" value:title extra:@""]; + } + } //backButton - (void)setBackTitle:(NSString *)title titleColor:(UIColor *)color{ diff --git a/ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m b/ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m index b1ac83c..6dbb0f4 100755 --- a/ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m +++ b/ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m @@ -163,20 +163,25 @@ static int tabnavHeight; -(BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController{ NSString *strtt = @""; NSString *strtitle = tabBarController.tabBar.selectedItem.title; -// strtt = @"home"; -// if([strtitle isEqualToString:@"搜索"]) -// { -// strtt = @"search"; -// } -// else if([strtitle isEqualToString:@"企查"]) -// { -// strtt = @"more"; -// } -// else if([strtitle isEqualToString:@"我的"]) -// { -// strtt = @"mine"; -// } -// [UserInfoModel shijianShangBao:0 key:@"client.home.bottom.tab.check" value:strtt extra:@""]; + strtt = @"assistant"; + if([strtitle isEqualToString:@"范文"]) + { + strtt = @"composition"; + } + else if([strtitle isEqualToString:@"工具"]) + { + strtt = @"tools"; + } + else if([strtitle isEqualToString:@"我的"]) + { + strtt = @"mine"; + } + else if([strtitle isEqualToString:@"首页"]) + { + strtt = @"home"; + } + [UserInfoModel shijianShangBao:0 key:@"client.home.bottom.tab.check" value:strtt extra:@""]; + return YES; } - (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item { diff --git a/ProductApp/ProductApp/Other/PGJSearchView.m b/ProductApp/ProductApp/Other/PGJSearchView.m index 9ae899f..6617b80 100644 --- a/ProductApp/ProductApp/Other/PGJSearchView.m +++ b/ProductApp/ProductApp/Other/PGJSearchView.m @@ -7,6 +7,9 @@ #import "PGJSearchView.h" +@interface PGJSearchView () + +@end @implementation PGJSearchView - (instancetype)initWithFrame:(CGRect)frame { @@ -57,6 +60,7 @@ make.right.equalTo(searchview).offset(-10); }]; [search setClearButtonMode:UITextFieldViewModeWhileEditing|UITextFieldViewModeUnlessEditing]; + [search setDelegate:self]; _searchField = search; UIButton *searchbtn = [[UIButton alloc] init]; @@ -82,5 +86,9 @@ self.searchBackAction(_searchField.text); } } - +- (BOOL)textFieldShouldClear:(UITextField *)textField +{ + [UserInfoModel shijianShangBao:0 key:@"client.clear.search.word.text" value:@"" extra:@""]; + return YES; +} @end diff --git a/ProductApp/ProductApp/ProductMain/工具/GongJuListViewController.m b/ProductApp/ProductApp/ProductMain/工具/GongJuListViewController.m index 7dc4608..d81be7d 100644 --- a/ProductApp/ProductApp/ProductMain/工具/GongJuListViewController.m +++ b/ProductApp/ProductApp/ProductMain/工具/GongJuListViewController.m @@ -124,12 +124,17 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { ToolsListModelDataItems *model = self.arrdata[indexPath.row]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.write_tools" value:@"home" extra:[model.config yy_modelToJSONString]]; + if(model.ID.intValue>=1 && model.ID.intValue<=9) { if(model.ID.intValue==9) { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"tools" extra:@""]; } else if(model.ID.intValue==6||model.ID.intValue==7||model.ID.intValue==8||model.ID.intValue==3) { diff --git a/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m b/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m index d23da19..175ca6e 100644 --- a/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m +++ b/ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m @@ -286,6 +286,8 @@ { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"tools" extra:@""]; } else if([strpage isEqualToString:@"write_assistant"]) { diff --git a/ProductApp/ProductApp/ProductMain/工具/搜索/搜索列表/GongJuSearchListViewController.m b/ProductApp/ProductApp/ProductMain/工具/搜索/搜索列表/GongJuSearchListViewController.m index 58989a3..c6b64f5 100644 --- a/ProductApp/ProductApp/ProductMain/工具/搜索/搜索列表/GongJuSearchListViewController.m +++ b/ProductApp/ProductApp/ProductMain/工具/搜索/搜索列表/GongJuSearchListViewController.m @@ -201,12 +201,17 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { ToolsListModelDataItems *model = self.arrdata[indexPath.row]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.write_tools" value:@"search" extra:[model.config yy_modelToJSONString]]; + if(model.ID.intValue>=1 && model.ID.intValue<=9) { if(model.ID.intValue==9) { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"tools_search" extra:@""]; } else if(model.ID.intValue==6||model.ID.intValue==7||model.ID.intValue==8||model.ID.intValue==3) { diff --git a/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m b/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m index e109d40..7a04198 100644 --- a/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m +++ b/ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m @@ -416,6 +416,7 @@ vc.modelPF = self.modelPF; vc.modelContentItems = self.modelContentItems; [self.viewController.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.start.correct" value:@"开始课堂写作" extra:@""]; } break; case 1: @@ -429,6 +430,8 @@ vc.modelPF = self.modelPF; vc.modelContentItems = self.modelContentItems; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.start.correct" value:@"开始作文批改" extra:@""]; } break; case 2: diff --git a/ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m b/ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m index 5e7f299..359c69a 100644 --- a/ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m +++ b/ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m @@ -215,7 +215,7 @@ ExamplePicModelDataItems *model = self.arrdataYD[self.btselect.tag]; BaseViewController *vcbase = (BaseViewController *)self.viewController; - [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"拍照写作-%@",model.title] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]]; + [UserInfoModel shijianShangBao:0 key:@"client.guide.photo.write.start.write" value:model.title extra:[self.arrdataYD[self.btselect.tag] yy_modelToJSONString]]; [UIView animateWithDuration:1 delay:0.0 options:UIViewAnimationOptionCurveEaseOut animations:^{ diff --git a/ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m b/ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m index efd3a39..69a0829 100644 --- a/ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m +++ b/ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m @@ -512,6 +512,8 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.save.history" value:strscene extra:@""]; + XieZuoSaveAlterView *view = [[XieZuoSaveAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [self.viewController.view addSubview:view]; [view setBackValue:^{ diff --git a/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m b/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m index 2adce20..51b1860 100644 --- a/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m +++ b/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m @@ -452,7 +452,9 @@ return; } BaseViewController *vcbase = (BaseViewController *)self.viewController; - [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"课堂写作-%@-按照写作标准批改作文",self.modelDetailYDY.title] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]]; + + [UserInfoModel shijianShangBao:0 key:@"client.guide.classroom.write.start.correct" value:self.modelDetail.standard extra:[self.modelDetailYDY yy_modelToJSONString]]; + StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; view.isshiyong = YES; diff --git a/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKeTangXieZuoView.m b/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKeTangXieZuoView.m index ce34b56..966e614 100644 --- a/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKeTangXieZuoView.m +++ b/ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKeTangXieZuoView.m @@ -290,7 +290,7 @@ if(self.modelDetailYDY) { BaseViewController *vcbase = (BaseViewController *)self.viewController; - [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"课堂写作-%@",self.modelDetailYDY.title] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]]; + [UserInfoModel shijianShangBao:0 key:@"client.guide.classroom.write.start.write" value:self.modelDetail.standard extra:[self.modelDetail yy_modelToJSONString]]; } StartKTXZWenZhangViewController *vc = [StartKTXZWenZhangViewController new]; diff --git a/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/ZhangHuGuanLiViewController.m b/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/ZhangHuGuanLiViewController.m index da7f55c..51756ce 100644 --- a/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/ZhangHuGuanLiViewController.m +++ b/ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/ZhangHuGuanLiViewController.m @@ -54,6 +54,9 @@ [self drawFooterView]; [self getdata]; + + [UserInfoModel shijianShangBao:0 key:@"client.click.account.management" value:@"" extra:@""]; + } -(void)drawFooterView { diff --git a/ProductApp/ProductApp/ProductMain/范文/FanWenListViewController.m b/ProductApp/ProductApp/ProductMain/范文/FanWenListViewController.m index 2534ea8..c433cd9 100644 --- a/ProductApp/ProductApp/ProductMain/范文/FanWenListViewController.m +++ b/ProductApp/ProductApp/ProductMain/范文/FanWenListViewController.m @@ -114,6 +114,7 @@ FanWenDetailViewController *vc = [FanWenDetailViewController new]; vc.modelDetail = self.arrdata[indexPath.row]; [self.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.excellent_composition.info" value:@"范文" extra:@""]; } #pragma mark - DZNEmptyDataSetSource - (UIView *)customViewForEmptyDataSet:(UIScrollView *)scrollView diff --git a/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m b/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m index 072c5d6..ce29b0c 100644 --- a/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m +++ b/ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m @@ -162,10 +162,12 @@ { ExampleTextTypeModelDataItems *model = self.arrdata[index-1]; childVC.strid = model.ID; + [UserInfoModel shijianShangBao:0 key:@"client.excellent.composition.type.check" value:@"Tab类型" extra:model.name]; } else { childVC.strid = @""; + [UserInfoModel shijianShangBao:0 key:@"client.excellent.composition.type.check" value:@"Tab类型" extra:@"全部"]; } return childVC; diff --git a/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchHestoryView.m b/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchHestoryView.m index 75bec74..4e36b73 100644 --- a/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchHestoryView.m +++ b/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchHestoryView.m @@ -209,7 +209,7 @@ [[NSUserDefaults standardUserDefaults] setObject:@[] forKey:FanWenSearchKeywordsHestory]; [self drawKeyWordsView]; - + [UserInfoModel shijianShangBao:0 key:@"client.clear.search.history" value:@"" extra:@""]; } -(void)itemAction:(UIButton *)sender diff --git a/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchView.m b/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchView.m index 2e838d0..04196e3 100644 --- a/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchView.m +++ b/ProductApp/ProductApp/ProductMain/范文/搜索/view/FanWenSearchView.m @@ -83,5 +83,10 @@ FanWenSearchListViewController *vc = [FanWenSearchListViewController new]; vc.strkey = value; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.search_search_search" value:value extra:@""]; + + [UserInfoModel shijianShangBao:0 key:@"client.excellent.composition.search" value:value extra:@""]; + } @end diff --git a/ProductApp/ProductApp/ProductMain/范文/范文搜索列表/FanWenSearchListViewController.m b/ProductApp/ProductApp/ProductMain/范文/范文搜索列表/FanWenSearchListViewController.m index 4822019..6e6b4c9 100644 --- a/ProductApp/ProductApp/ProductMain/范文/范文搜索列表/FanWenSearchListViewController.m +++ b/ProductApp/ProductApp/ProductMain/范文/范文搜索列表/FanWenSearchListViewController.m @@ -56,6 +56,10 @@ [Tools normalShadow:viewsearch shadowColor:RGBACOLOR(0, 0, 0, 0.1) shadowOpacity:1 cornerRadius:6 shadowRadius:10]; [viewsearch setSearchBackAction:^(NSString * _Nonnull search) { self.strkey = search; + [UserInfoModel shijianShangBao:0 key:@"client.search_search_search" value:search extra:@""]; + + [UserInfoModel shijianShangBao:0 key:@"client.excellent.composition.search" value:search extra:@""]; + self.ipage=1; [self getdata]; }]; @@ -152,6 +156,9 @@ FanWenDetailViewController *vc = [FanWenDetailViewController new]; vc.modelDetail = self.arrdata[indexPath.row]; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.excellent_composition.info" value:@"范文搜索" extra:@""]; + } #pragma mark - DZNEmptyDataSetSource - (UIView *)customViewForEmptyDataSet:(UIScrollView *)scrollView diff --git a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m index 1767936..52c6722 100644 --- a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m @@ -439,12 +439,17 @@ FanWenDetailViewController *vc = [FanWenDetailViewController new]; vc.modelDetail = model; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.excellent_composition.info" value:@"首页" extra:@""]; + } } ///高分作文查看更多 -(void)morezwAction { [[NSNotificationCenter defaultCenter] postNotificationName:@"carnumberChangeNotifi" object:@"1"]; + + [UserInfoModel shijianShangBao:0 key:@"client.view.more.excellent_composition" value:@"首页" extra:@""]; } ///用户信息 -(void)getUserData diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m index 628d435..4a6d1db 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m @@ -97,6 +97,8 @@ { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"home" extra:@""]; } else if([strpage isEqualToString:@"write_assistant"]) { diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m index 57fb9c4..7c7c103 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m @@ -93,6 +93,9 @@ -(void)moreAction { [[NSNotificationCenter defaultCenter] postNotificationName:@"carnumberChangeNotifi" object:@"3"]; + + [UserInfoModel shijianShangBao:0 key:@"client.view.more.write_tools" value:@"首页" extra:@""]; + } -(void)setArrdata:(NSArray *)arrdata { @@ -151,12 +154,18 @@ -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { ToolsListModelDataItems *model = self.arrdata[indexPath.row]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.write_tools" value:@"home" extra:[model.config yy_modelToJSONString]]; + if(model.ID.intValue>=1 && model.ID.intValue<=9) { if(model.ID.intValue==9) { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"home_tools" extra:@""]; + } else if(model.ID.intValue==6||model.ID.intValue==7||model.ID.intValue==8||model.ID.intValue==3) { diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m index a94da3e..9100146 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m @@ -154,12 +154,16 @@ CamreViewController *vc = [CamreViewController new]; vc.type = 2; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"photos_write" extra:@""]; + } break; case 1: { KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"home" extra:@""]; } break; case 2: @@ -167,6 +171,8 @@ CamreViewController *vc = [CamreViewController new]; vc.type = 1; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""]; } break; default: diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m index a343a58..17cbe20 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m @@ -118,6 +118,7 @@ } ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""]; } @end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m index 4b843ce..b3f9df5 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m @@ -151,12 +151,17 @@ // [self.viewController.navigationController pushViewController:vc animated:YES]; KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.classroom.write" value:@"home" extra:@""]; + } break; case 1: { ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""]; } break; case 2: @@ -164,6 +169,9 @@ CamreViewController *vc = [CamreViewController new]; vc.type = 2; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"photos_write" extra:@""]; + } break; default: diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m index 9e2aae3..10376c9 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m @@ -114,6 +114,8 @@ CamreViewController *vc = [CamreViewController new]; vc.type = 1; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""]; } @end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m index e795633..8c16e86 100644 --- a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m @@ -97,6 +97,7 @@ { ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.ai.write" value:@"home" extra:@""]; } diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m index 353b749..c8fdaff 100644 --- a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m @@ -179,6 +179,7 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.delete.history" value:@"写作记录" extra:[self.model yy_modelToJSONString]]; if(self.backValue) { self.backValue(self.model); diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m index 1689b38..15afd91 100644 --- a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m @@ -186,6 +186,8 @@ [LoadAlterView dismiss]; if(state) { + + [UserInfoModel shijianShangBao:0 key:@"client.delete.history" value:@"批改记录" extra:[self.model yy_modelToJSONString]]; if(self.backValue) { self.backValue(self.model); @@ -203,6 +205,7 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.delete.history" value:@"写作记录" extra:[self.model yy_modelToJSONString]]; if(self.backValue) { self.backValue(self.model); @@ -230,6 +233,8 @@ StartZWPIDetailViewController *vc = [StartZWPIDetailViewController new]; vc.modelHestory = responseObject.data; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.view.classroom.info" value:@"查看课堂批改详情" extra:@""]; } else { diff --git a/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m b/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m index 0e32108..f89a866 100644 --- a/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m +++ b/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m @@ -313,6 +313,8 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.save.history" value:self.scene extra:@""]; + NSMutableArray *arrcontent = [NSMutableArray new]; for(SSEDrawListTextModel *model in self.arrdata) { @@ -375,6 +377,8 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.save.history" value:self.scene extra:@""]; + XieZuoSaveAlterView *view = [[XieZuoSaveAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [self.viewController.view addSubview:view]; [view setBackValue:^{ diff --git a/ProductApp/ProductApp/ProductMain/首页/智能写作/段落/续写润色/view/DuanLuoXieZuoQWView.m b/ProductApp/ProductApp/ProductMain/首页/智能写作/段落/续写润色/view/DuanLuoXieZuoQWView.m index e91625b..61862f8 100644 --- a/ProductApp/ProductApp/ProductMain/首页/智能写作/段落/续写润色/view/DuanLuoXieZuoQWView.m +++ b/ProductApp/ProductApp/ProductMain/首页/智能写作/段落/续写润色/view/DuanLuoXieZuoQWView.m @@ -258,6 +258,8 @@ [LoadAlterView dismiss]; if(state) { + [UserInfoModel shijianShangBao:0 key:@"client.save.history" value:@"write_with_content" extra:@""]; + XieZuoSaveAlterView *view = [[XieZuoSaveAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [self.viewController.view addSubview:view]; [view setBackValue:^{ diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m index 9f6a9dc..58601c3 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m @@ -323,6 +323,9 @@ } /// [self shutterCamera]; + + [UserInfoModel shijianShangBao:0 key:@"client.take.picture" value:@"correct" extra:@""]; + } break; case 1: @@ -385,6 +388,9 @@ else { [self.viewImages setHidden:!self.viewImages.hidden]; + + [UserInfoModel shijianShangBao:0 key:@"client.preview.picture" value:[NSString stringWithFormat:@"%@",[NSNumber numberWithBool:self.viewImages.hidden]] extra:@""]; + } } break; @@ -397,6 +403,9 @@ { NSLog(@"ssss"); [self.arrData removeAllObjects]; + + [UserInfoModel shijianShangBao:0 key:@"client.select.picture" value:@"correct" extra:@""]; + for(HXPhotoModel *photoModel in photoList) { [photoModel requestPreviewImageWithSize:PHImageManagerMaximumSize startRequestICloud:^(PHImageRequestID iCloudRequestId, HXPhotoModel *model) { diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m index cd3f717..1fea5c9 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreImagesView.m @@ -76,6 +76,8 @@ NSIndexPath *AindexPath = [self.collect indexPathForItemAtPoint:[longGesture locationInView:self.collect]]; [self.collect beginInteractiveMovementForItemAtIndexPath:AindexPath]; index = AindexPath.section; + + [UserInfoModel shijianShangBao:0 key:@"client.drag.picture" value:[NSString stringWithFormat:@"%ld",AindexPath.row+1] extra:@""]; } break; case UIGestureRecognizerStateChanged:{ diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m index 928f4b4..18edb6f 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m @@ -113,12 +113,16 @@ } -(void)backAction { + [UserInfoModel shijianShangBao:0 key:@"client.close.example" value:self.strpzname extra:@""]; [self removeFromSuperview]; } -(void)setStrpzname:(NSString *)strpzname { _strpzname = strpzname; self.lbname.text = strpzname; + + [UserInfoModel shijianShangBao:0 key:@"client.show.example.picture" value:strpzname extra:@""]; + } -(void)setArrdata:(NSArray *)arrdata { @@ -136,10 +140,12 @@ if(self.type==3) { view.type = 0; + [UserInfoModel shijianShangBao:0 key:@"client.start.correct.example" value:@"photos_write" extra:@""]; } else { view.type = 1; + [UserInfoModel shijianShangBao:0 key:@"client.start.correct.example" value:@"correct" extra:@""]; } view.modelDetailZWPG = self.arrdata[self.bannerView.currentIndex]; [self.viewController.view addSubview:view]; diff --git a/ProductApp/ProductApp/ProductMain/首页/课堂写作/KeTangXieZuoViewController.m b/ProductApp/ProductApp/ProductMain/首页/课堂写作/KeTangXieZuoViewController.m index bda68fd..04c1ede 100644 --- a/ProductApp/ProductApp/ProductMain/首页/课堂写作/KeTangXieZuoViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/课堂写作/KeTangXieZuoViewController.m @@ -88,6 +88,9 @@ vc.strID = [Tools isStringnilkong:[model objectForKey:@"id"]]; vc.strseason = [Tools isStringnilkong:[model objectForKey:@"season"]]; [self.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.classroom.write.select.stage" value:[model objectForKey:@"name"] extra:[model yy_modelToJSONString]]; + } @end diff --git a/ProductApp/ProductApp/ProductMain/首页/课堂写作/详情/view/KeTangXieZuoXiangQingView.m b/ProductApp/ProductApp/ProductMain/首页/课堂写作/详情/view/KeTangXieZuoXiangQingView.m index 8193541..4c96979 100644 --- a/ProductApp/ProductApp/ProductMain/首页/课堂写作/详情/view/KeTangXieZuoXiangQingView.m +++ b/ProductApp/ProductApp/ProductMain/首页/课堂写作/详情/view/KeTangXieZuoXiangQingView.m @@ -470,6 +470,8 @@ vc.type = 3; vc.textbook_id = self.modelDetail.ID; [self.viewController.navigationController pushViewController:vc animated:YES]; + + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"课堂批改作文批改" extra:self.modelDetail.content]; } @end