diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate
index 1ddd10c..03d6e54 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.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index cdee3b0..fb0dca5 100644
--- a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -36,37 +36,5 @@
landmarkType = "7">
-
-
-
-
-
-
-
-
diff --git a/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m
index 39eef37..ebc2525 100755
--- a/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m
+++ b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.m
@@ -19,7 +19,7 @@
[self.titleLabel setFont:[UIFont fontWithName:@"Helvetica-Bold" size:18]];
self.titleLabel.textColor = color;
- if([UserInfoModel shareModel].token.length>3)
+ if([UserInfoModel shareModel].token.length>3 && title.length>0)
{
[UserInfoModel shijianShangBao:0 key:@"client.jump.to" value:title extra:@""];
}
diff --git a/ProductApp/ProductApp/ProductMain/工具/cell/GongJuListTableViewCell.m b/ProductApp/ProductApp/ProductMain/工具/cell/GongJuListTableViewCell.m
index eb22702..0374670 100644
--- a/ProductApp/ProductApp/ProductMain/工具/cell/GongJuListTableViewCell.m
+++ b/ProductApp/ProductApp/ProductMain/工具/cell/GongJuListTableViewCell.m
@@ -98,11 +98,13 @@
if(tag==1)
{
[self pushData];
+ [UserInfoModel shijianShangBao:0 key:@"client.collect.tool.cancel" value:@"tool" extra:[self.model.config yy_modelToJSONString]];
}
}];
}
else
{
+ [UserInfoModel shijianShangBao:0 key:@"client.collect.tool" value:@"tool" extra:[self.model.config yy_modelToJSONString]];
[self pushData];
}
}
diff --git a/ProductApp/ProductApp/ProductMain/工具/通用工具/view/GongJuCreateView.m b/ProductApp/ProductApp/ProductMain/工具/通用工具/view/GongJuCreateView.m
index 8bacd29..ccc7c55 100644
--- a/ProductApp/ProductApp/ProductMain/工具/通用工具/view/GongJuCreateView.m
+++ b/ProductApp/ProductApp/ProductMain/工具/通用工具/view/GongJuCreateView.m
@@ -227,9 +227,11 @@
{
[view clearValue];
}
+ [UserInfoModel shijianShangBao:0 key:@"client.common.tool.handle.clear.data" value:@"" extra:@""];
}
else
{
+ [UserInfoModel shijianShangBao:0 key:@"client.common.tool.handle.submit.data" value:@"" extra:@""];
///modelDetail.config.prompt
NSMutableDictionary *dicpush = [NSMutableDictionary new];
diff --git a/ProductApp/ProductApp/ProductMain/引导/StartSFViewController.m b/ProductApp/ProductApp/ProductMain/引导/StartSFViewController.m
index 688607f..d498fa5 100644
--- a/ProductApp/ProductApp/ProductMain/引导/StartSFViewController.m
+++ b/ProductApp/ProductApp/ProductMain/引导/StartSFViewController.m
@@ -135,7 +135,7 @@
UILabel *lb = self.arrLB[sender.tag];
[lb setTextColor:MainColor];
- [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"身份选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],lb.text]];
+ [UserInfoModel shijianShangBao:0 key:@"client.guide.identity.check" value:@"身份选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],lb.text]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self.view setUserInteractionEnabled:YES];
diff --git a/ProductApp/ProductApp/ProductMain/引导/StartViewController.m b/ProductApp/ProductApp/ProductMain/引导/StartViewController.m
index 781d108..e378486 100644
--- a/ProductApp/ProductApp/ProductMain/引导/StartViewController.m
+++ b/ProductApp/ProductApp/ProductMain/引导/StartViewController.m
@@ -202,7 +202,7 @@
///初始化收藏工具
[self pushCollectInit];
- [UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"职业选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],lb.text]];
+ [UserInfoModel shijianShangBao:0 key:@"client.guide.domain.check" value:@"职业选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],lb.text]];
///
if(sender.tag==0)
diff --git a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m
index d1d0203..9673872 100644
--- a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m
+++ b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m
@@ -45,6 +45,7 @@
}
-(void)navMuenButtonAction
{///分享
+ [UserInfoModel shijianShangBao:0 key:@"client.setting.share.poster" value:@"" extra:@""];
[self.viewShow shareAction];
}
- (void)viewDidLoad {
diff --git a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m
index 787b8ae..e63fac9 100644
--- a/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m
+++ b/ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m
@@ -252,6 +252,10 @@
[dicpush setObject:[Tools isStringnil:self.modelDetailZWPG.content] forKey:@"content"];
[dicpush setObject:@"" forKey:@"require"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
+
+ [dicpush setObject:[Tools isStringnil:self.modelDetailZWPG.ID] forKey:@"id"];
+
+ [dicpush setObject:@"1" forKey:@"isshili"];
}
else
{
diff --git a/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.m b/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.m
index 16db07e..163081c 100644
--- a/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.m
+++ b/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.m
@@ -150,6 +150,9 @@
[tableView setDataWithArray:self.arrData withBlock:^(NSMutableArray *newArray) {
weakSelf.arrData = newArray;
self.model.chapterContents = newArray;
+
+ [UserInfoModel shijianShangBao:0 key:@"client.drag.ppt.outline" value:@"" extra:@""];
+
}];
}
diff --git a/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangView.m b/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangView.m
index e662f36..e7fd3bf 100644
--- a/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangView.m
+++ b/ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangView.m
@@ -88,6 +88,8 @@
__weak typeof(self) weakSelf = self;
[tableView setDataWithArray:self.arrTitle withBlock:^(NSMutableArray *newArray) {
weakSelf.arrTitle = newArray;
+
+ [UserInfoModel shijianShangBao:0 key:@"client.drag.ppt.outline" value:@"" extra:@""];
}];
///
@@ -101,6 +103,7 @@
{
self.modelDetail.result.outline.chapters = newArray;
}
+ [UserInfoModel shijianShangBao:0 key:@"client.drag.ppt.outline" value:@"" extra:@""];
}];
UIButton *btnext = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 144, 46)];
diff --git a/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m b/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m
index 5297c6c..ef38e67 100644
--- a/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m
+++ b/ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m
@@ -41,6 +41,7 @@
}
-(void)navMuenButtonAction
{
+ [UserInfoModel shijianShangBao:0 key:@"client.setting.share.poster" value:@"" extra:@""];
[self.viewShow shareShow];
}
- (void)viewDidLoad {
diff --git a/ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/FenXiangHaiBaoView.m b/ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/FenXiangHaiBaoView.m
index 459294e..01630ad 100644
--- a/ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/FenXiangHaiBaoView.m
+++ b/ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/FenXiangHaiBaoView.m
@@ -376,7 +376,7 @@
{
self.imageCreate = [self jietu];
}
-
+ [UserInfoModel shijianShangBao:0 key:@"client.share.poster" value:@"" extra:@""];
switch (sender.tag) {
case 0:
diff --git a/ProductApp/ProductApp/ProductMain/首页/智能PPT生成/ZhiNengPPTViewController.m b/ProductApp/ProductApp/ProductMain/首页/智能PPT生成/ZhiNengPPTViewController.m
index a6b8ecf..050468d 100644
--- a/ProductApp/ProductApp/ProductMain/首页/智能PPT生成/ZhiNengPPTViewController.m
+++ b/ProductApp/ProductApp/ProductMain/首页/智能PPT生成/ZhiNengPPTViewController.m
@@ -38,6 +38,8 @@
}];
[self.view sendSubviewToBack:imgvback];
+ [UserInfoModel shijianShangBao:0 key:@"client.ai.create.ppt" value:@"" extra:@""];
+
ZhiNengPPTView *view =[[ZhiNengPPTView alloc] init];
[self.view addSubview:view];
diff --git a/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m b/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m
index f89a866..5d2f63c 100644
--- a/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m
+++ b/ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m
@@ -306,8 +306,8 @@
case 1:
{///保存
[LoadAlterView show];
-
- if([self.scene isEqualToString:@"rewrite_correct"])
+ int shili = [[self.dicpush objectForKey:@"isshili"] intValue];
+ if([self.scene isEqualToString:@"rewrite_correct"] && shili != 1)
{///批改
[NetWorkManager requestCorrectSaveData:self ID:[self.dicpush objectForKey:@"id"] Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m
index 58601c3..e15ce49 100644
--- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m
+++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m
@@ -74,6 +74,7 @@
[super viewDidLoad];
[self.navigationController setNavigationBarHidden:YES animated:NO];
[self.navigationView setHidden:YES];
+ [self.navigationView setTitle:@"相机" titleColor:RGBACOLOR(0, 0, 0, 0.1)];
[self.view setBackgroundColor:[UIColor blackColor]];
if ([self checkCameraPermission]) {