pengguangjian
/
jiGuangXieZuo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apple 支付

This commit is contained in:
pengguangjian 2024-11-05 18:33:52 +08:00
parent 902e9036c6
commit 317ffc46c6
50 changed files with 666 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ProductApp/ProductApp.xcodeproj/project.pbxproj
View File

@ -5317,12 +5317,12 @@
);
INFOPLIST_FILE = ProductApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "极光写作";
INFOPLIST_KEY_NSCameraUsageDescription = "极光写作意见反馈上传图片需要使用相机";
INFOPLIST_KEY_NSCameraUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相机";
INFOPLIST_KEY_NSContactsUsageDescription = "极光写作AI助手聊天需要使用通讯录";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "极光写作AI助手聊天需要使用位置信息";
INFOPLIST_KEY_NSLocationUsageDescription = "极光写作AI助手聊天需要使用位置信息";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "极光写作AI助手聊天需要使用麦克风";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光写作意见反馈上传图片需要使用相册";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相册";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "极光写作分享保存图片需要保存图片到相册";
INFOPLIST_KEY_NSUserTrackingUsageDescription = "极光写作用于向您推荐个性化广告";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@ -5387,12 +5387,12 @@
);
INFOPLIST_FILE = ProductApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "极光写作";
INFOPLIST_KEY_NSCameraUsageDescription = "极光写作意见反馈上传图片需要使用相机";
INFOPLIST_KEY_NSCameraUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相机";
INFOPLIST_KEY_NSContactsUsageDescription = "极光写作AI助手聊天需要使用通讯录";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "极光写作AI助手聊天需要使用位置信息";
INFOPLIST_KEY_NSLocationUsageDescription = "极光写作AI助手聊天需要使用位置信息";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "极光写作AI助手聊天需要使用麦克风";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光写作意见反馈上传图片需要使用相册";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "极光写作拍照写作、作文批改、课堂批改和意见反馈上传图片需要使用相册";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "极光写作分享保存图片需要保存图片到相册";
INFOPLIST_KEY_NSUserTrackingUsageDescription = "极光写作用于向您推荐个性化广告";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;

BIN
ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

32
ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -36,5 +36,37 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "338"
endingLineNumber = "338"
landmarkName = "-bottomAction:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "363"
endingLineNumber = "363"
landmarkName = "-bottomAction:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

22
ProductApp/ProductApp/Assets.xcassets/首页/home_ppt_znxz_back.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "组 44628@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "组 44628@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
ProductApp/ProductApp/Assets.xcassets/首页/home_ppt_znxz_back.imageset/组 44628@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/首页/home_ppt_znxz_back.imageset/组 44628@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

8
ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.h
View File

@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
#define UserInfoModelIdentityType @"UserInfoModelIdentityType"
typedef void(^UserInfoModelQuanXianBack)(BOOL value);
@class RoleTreeModelData;
@interface UserInfoModel : NSObject
+(UserInfoModel *)shareModel;
@ -101,6 +101,12 @@ NS_ASSUME_NONNULL_BEGIN
///聊天信息是否正在绘制
+(int)getAiChatIsDrawing;
+(void)setAiChatIsDrawing:(int)value;
///权限校验
+(void)quanXianJiaoYan:(UIViewController *)vc scence:(NSString *)scence ispush:(BOOL)ispush back:(UserInfoModelQuanXianBack)backValue;
///权限上报
+(void)quanxianShangBaoScence:(NSString *)scence;
@end
NS_ASSUME_NONNULL_END

42
ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.m
View File

@ -12,6 +12,7 @@
#import "PublicNetWorkManager.h"
#import "RoleTreeModel.h"
#import "StartPayViewController.h"
static UserInfoModel *userinfo;
@implementation UserInfoModel
@ -303,4 +304,45 @@ static UserInfoModel *userinfo;
{
[[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithFormat:@"%d",value] forKey:AiChatIsDrawing];
}
///权限校验
+(void)quanXianJiaoYan:(UIViewController *)vc scence:(NSString *)scence ispush:(BOOL)ispush back:(UserInfoModelQuanXianBack)backValue
{
[LoadAlterView show];
[PublicNetWorkManager requestUserAuthData:nil scene:@"scence" Callback:^(BOOL state, UserAuthModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
if(responseObject.data.auth.intValue == 1)
{///成功
backValue(YES);
[UserInfoModel quanxianShangBaoScence:scence];
}
else
{///跳转支付
if(ispush)
{
StartPayViewController *vcpush = [StartPayViewController new];
vcpush.ptype = 1;
vcpush.source = scence;
[vc.navigationController pushViewController:vcpush animated:YES];
}
backValue(NO);
}
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
backValue(NO);
}
}];
}
///权限上报
+(void)quanxianShangBaoScence:(NSString *)scence
{
[PublicNetWorkManager requestUserAuthPostData:nil scene:scence count:@"1" Callback:^(BOOL state, id _Nullable responseObject, NSString * _Nullable describle) {
}];
}
@end

1
ProductApp/ProductApp/Other/支付view/PayPublicView.m
View File

@ -128,6 +128,7 @@
self.btselect = nil;
self.modelYHQ = nil;
self.fieldyh.text = @"";
if([UserInfoModel PayWXQuanXian]==NO)return;
for(UIView *view in self.viewpay.subviews)
{
[view removeFromSuperview];

84
ProductApp/ProductApp/ProductMain/AIChart/AIChatViewController.m
View File

@ -77,16 +77,13 @@
[viewbottom setBackValue:^(AIChatModel * _Nonnull model) {
[self.arrdata addObject:model];
[self scrollToBottom];
[FMDMySql insertChar:model andtablename:self.strtablename];
if(model.isnetwork)
{
[self getSseValue:model.text];
}
[self.tableView reloadData];
[self scrollToBottom];
}];
UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
@ -146,7 +143,6 @@
[self.arrdata addObjectsFromArray:arrtemp];
if(self.arrdata.count>0)
{
[self.tableView reloadData];
[self scrollToBottom];
}
}
@ -154,11 +150,14 @@
-(void)scrollToBottom
{
dispatch_async(dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
[self.tableView scrollToRowAtIndexPath:index atScrollPosition:UITableViewScrollPositionBottom animated:NO];
});
// dispatch_async(dispatch_get_main_queue(), ^{
// NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
// [self.tableView scrollToRowAtIndexPath:index atScrollPosition:UITableViewScrollPositionBottom animated:NO];
// });
[self.tableView reloadData];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
[self.tableView scrollToRowAtIndexPath:index atScrollPosition:UITableViewScrollPositionBottom animated:NO];
});
}
@ -181,7 +180,6 @@
model.isaudioStart = YES;
NSString *strpath = [NSString stringWithFormat:@"%@/%@",[[AudioRecored manager] getPath],model.audioUrl];
NSData *datatemp = [NSData dataWithContentsOfFile:strpath];
[self playAudioAction:strpath];
}
@ -274,13 +272,13 @@
[cell setBackValue:^(AIChatModel * _Nonnull model) {
if([UserInfoModel getAiChatIsDrawing]==1)return;
[self.arrdata addObject:model];
[self scrollToBottom];
[FMDMySql insertChar:model andtablename:self.strtablename];
if(model.isnetwork)
{
[self getSseValue:model.text];
}
[self.tableView reloadData];
[self scrollToBottom];
}];
[cell setBackAudioValue:^(AIChatModel * _Nonnull model) {
@ -392,18 +390,41 @@
}
-(void)getSseValue:(NSString *)value
{
[UserInfoModel quanXianJiaoYan:self scence:@"write_assistant" ispush:YES back:^(BOOL isnext) {
if(isnext)
{
[self getHuiDa:value];
}
}];
}
-(void)getHuiDa:(NSString *)value
{
self.cellDraw = nil;
AIChatModel *modelDraw = [AIChatModel new];
modelDraw.isAnimation = YES;
modelDraw.text = @" ";
modelDraw.isDrwaEnd = NO;
[self.arrdata addObject:modelDraw];
[self scrollToBottom];
[UserInfoModel setAiChatIsDrawing:1];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self getInfoValue:value];
});
}
-(void)getInfoValue:(NSString *)value
{
dispatch_async(dispatch_get_main_queue(), ^{
[LoadAlterView show];
});
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
__block float ftemp = ftemp = self.tableView.contentSize.height;
__block float ftheight = self.tableView.height;
dispatch_async(dispatch_get_main_queue(), ^{
@ -411,6 +432,13 @@
});
__block NSIndexPath *index = [NSIndexPath indexPathForRow:self.arrdata.count-1 inSection:0];
AIChatTextTableViewCell *cellDraw = [self.tableView cellForRowAtIndexPath:index];
if(cellDraw.hidden==YES||cellDraw==nil)
{
[self scrollToBottom];
sleep(1);
cellDraw = [self.tableView cellForRowAtIndexPath:index];
}
self.cellDraw = cellDraw;
[cellDraw setBackDrawValue:^(BOOL isDrawFinish) {
if(isDrawFinish)
{
@ -431,8 +459,19 @@
});
[UserInfoModel setAiChatIsDrawing:0];
}
else
{
AIChatModel *modeltemp = self.arrdata.lastObject;
float fheight = modeltemp.height;
self.cellDraw.height = fheight;
if(ftemp-ftheight>0 && self.isDragging==NO)
{
[self.tableView setContentOffset:CGPointMake(0, ftemp-ftheight+fheight-50)];
}
}
}];
self.cellDraw = cellDraw;
[self.tableView beginUpdates];
@ -451,13 +490,13 @@
self.cellDraw.model = modeltemp;
float fheight = modeltemp.height;
self.cellDraw.height = fheight;
if(ftemp-ftheight>0 && self.isDragging==NO)
{
[self.tableView setContentOffset:CGPointMake(0, ftemp-ftheight+fheight-50)];
}
// float fheight = modeltemp.height;
//
// self.cellDraw.height = fheight;
// if(ftemp-ftheight>0 && self.isDragging==NO)
// {
// [self.tableView setContentOffset:CGPointMake(0, ftemp-ftheight+fheight-50)];
// }
}
else
{
@ -479,7 +518,6 @@
}];
});
}

3
ProductApp/ProductApp/ProductMain/alter/KaiTongAlterView.h
View File

@ -10,7 +10,8 @@
NS_ASSUME_NONNULL_BEGIN
@interface KaiTongAlterView : UIView
///
@property (nonatomic , strong) NSString *source;
@end
NS_ASSUME_NONNULL_END

19
ProductApp/ProductApp/ProductMain/alter/KaiTongAlterView.m
View File

@ -7,6 +7,7 @@
#import "KaiTongAlterView.h"
#import "KaiTongAlterTQView.h"
#import "StartPayViewController.h"
@interface KaiTongAlterView ()
@ -19,6 +20,16 @@
if(self = [super initWithFrame:frame])
{
[self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)];
// 创建模糊效果
UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
// 创建模糊视图
UIVisualEffectView *visualEffectView = [[UIVisualEffectView alloc] initWithEffect:blurEffect];
// 设置模糊视图的大小与父视图相同
visualEffectView.frame = self.bounds;
[visualEffectView setAlpha:0.9];
[self addSubview:visualEffectView];
UIView *viewback = [[UIView alloc] init];
[self addSubview:viewback];
[viewback mas_makeConstraints:^(MASConstraintMaker *make) {
@ -66,6 +77,7 @@
make.left.right.equalTo(imgvtop);
make.top.equalTo(imgvtop.mas_bottom);
}];
[imgvback setUserInteractionEnabled:YES];
KaiTongAlterTQView *viewtq = [KaiTongAlterTQView new];
[imgvback addSubview:viewtq];
@ -141,11 +153,14 @@
}
-(void)ktAction
{
StartPayViewController *vc = [StartPayViewController new];
vc.ptype = 1;
vc.source = self.source;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
-(void)cancleAction
{
[self.viewController.navigationController popViewControllerAnimated:YES];
}
@end

10
ProductApp/ProductApp/ProductMain/工具/图文转换/view/GongJuImageToTextView.m
View File

@ -309,6 +309,16 @@
[HXHud showMessage:@"请添加图片" afterDelayType:0];
return;
}
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"tools_pic_to_text" ispush:YES back:^(BOOL value) {
if(value)
{
[self pushimage];
}
}];
}
-(void)pushimage
{
[LoadAlterView show];
[[PublicUploadImageManager shareManager] netWorkUrlUserPost:[NSString stringWithFormat:@"%@%@",BaseUrl,@"api/file/ocr"] UploadImage:self.imageshow dicQuery:@{} Callback:^(BOOL state, NSDictionary *responseObject, NSString * _Nullable describle) {
if(state)

10
ProductApp/ProductApp/ProductMain/工具/敏感词/view/GongJuMinGanCiView.m
View File

@ -381,8 +381,14 @@
[HXHud showMessage:@"请选择检测类型" afterDelayType:0];
return;
}
[self addtoolsNumber];
[self getdata:[arrtypes componentsJoinedByString:@","]];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"tools_stopword_check" ispush:YES back:^(BOOL value) {
if(value)
{
[self addtoolsNumber];
[self getdata:[arrtypes componentsJoinedByString:@","]];
}
}];
}
-(void)addtoolsNumber
{

29
ProductApp/ProductApp/ProductMain/工具/文本工具/view/GongJuTextView.m
View File

@ -337,8 +337,33 @@
[HXHud showMessage:self.textview.placeholder afterDelayType:0];
return;
}
[self addtoolsNumber];
[self getdata];
NSString *scence = @"";
if(self.type==8)
{
scence = @"tools_expand_write";
}
else if (self.type==7)
{
scence = @"tools_shrink_write";
}
else if (self.type==6)
{
scence = @"tools_get_abstract";
}
else if (self.type==3)
{
scence = @"tools_keyword";
}
///8 扩写 7缩写 6摘要提取 3提取关键词
[UserInfoModel quanXianJiaoYan:self.viewController scence:scence ispush:YES back:^(BOOL value) {
if(value)
{
[self addtoolsNumber];
[self getdata];
}
}];
}
-(void)addtoolsNumber
{

22
ProductApp/ProductApp/ProductMain/工具/文本比较/view/GongJuWenBenView.m
View File

@ -227,7 +227,28 @@
NSString *strb = self.texttwo.text;
if(stra.length==0)
{
[HXHud showMessage:@"请输入文本" afterDelayType:0];
return;
}
if(strb.length==0)
{
[HXHud showMessage:@"请输入比较的文本" afterDelayType:0];
return;
}
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"tools_text_compare" ispush:YES back:^(BOOL value) {
if(value)
{
[self bijiao];
}
}];
}
-(void)bijiao
{
NSString *stra = self.textone.text;
NSString *strb = self.texttwo.text;
DiffMatchPatch *dmp = [[DiffMatchPatch alloc]init];
NSMutableArray *diffs = [NSMutableArray array];
diffs = [dmp diff_mainOfOldString:stra andNewString:strb checkLines:NO];
@ -263,7 +284,6 @@
self.textone.attributedText = attstringA;
self.texttwo.attributedText = attstringB;
}

12
ProductApp/ProductApp/ProductMain/工具/智能翻译/view/GongJuFanYiView.m
View File

@ -434,8 +434,16 @@
[HXHud showMessage:self.textview.placeholder afterDelayType:0];
return;
}
[self addtoolsNumber];
[self getdata];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"tools_translate" ispush:YES back:^(BOOL value) {
if(value)
{
[self addtoolsNumber];
[self getdata];
}
}];
}
-(void)addtoolsNumber
{

17
ProductApp/ProductApp/ProductMain/工具/通用工具/view/GongJuCreateView.m
View File

@ -256,12 +256,17 @@
[dicpush setObject:[Tools isStringnil:[view getValues]] forKey:[Tools isStringnil:model.name]];
}
GongJuCreateResultViewController *vc = [GongJuCreateResultViewController new];
vc.scene = self.modelDetail.scene;
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];
[self addtoolsNumber];
[UserInfoModel quanXianJiaoYan:self.viewController scence:[NSString stringWithFormat:@"common_tool_%@",self.modelDetail.scene] ispush:YES back:^(BOOL value) {
if(value)
{
GongJuCreateResultViewController *vc = [GongJuCreateResultViewController new];
vc.scene = self.modelDetail.scene;
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];
[self addtoolsNumber];
}
}];
}
}
-(void)addtoolsNumber

3
ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.h
View File

@ -23,7 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
///批改历史
@property (nonatomic , strong) CorrectSaveDetailModelData *modelHestory;
///是否有权限
@property (nonatomic , assign) BOOL isquanxian;
@end
NS_ASSUME_NONNULL_END

16
ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/StartZWPIDetailViewController.m
View File

@ -8,6 +8,7 @@
#import "StartZWPIDetailViewController.h"
#import "StartZWPIDetailView.h"
#import "NetWorkManager.h"
#import "KaiTongAlterView.h"
@interface StartZWPIDetailViewController ()
///
@ -34,6 +35,8 @@
{
[self.navigationView setTitle:@"作文批改记录" titleColor:RGBCOLOR(60, 60, 60)];
}
[self getQuanXian];
}
-(void)navMuenButtonAction
{///分享
@ -108,5 +111,18 @@
}
}
-(void)getQuanXian
{
if(self.isquanxian==YES)return;
[UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) {
if(value==NO)
{
KaiTongAlterView *view = [[KaiTongAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.source = @"correct_recharge_dialog";
[self.view addSubview:view];
}
}];
}
@end

2
ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.h
View File

@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface StartZWPIDetailView : UIView
///是否是引导页
@property (nonatomic , assign) BOOL isshiyong;
///引导页数据-作文批改
///引导页数据-作文批改 或者示例
@property (nonatomic , strong) ExampleCorrectListDataItems *modelDetailZWPG;
///批改的图片

42
ProductApp/ProductApp/ProductMain/引导/作文批改/批改信息/view/StartZWPIDetailView.m
View File

@ -21,6 +21,8 @@
///
@property (nonatomic , strong) UIScrollView *scvback;
///
@property (nonatomic , strong) UILabel *lbfen;
///
@property (nonatomic , strong) UIView *viewback;
@property (nonatomic , strong) UIView *viewbottom;
@ -59,6 +61,18 @@
}];
_scvback = scvback;
UILabel *lbfen = [[UILabel alloc] init];
[lbfen setText:@""];
[lbfen setTextColor:RGBCOLOR(231, 47, 21)];
[lbfen setTextAlignment:NSTextAlignmentCenter];
[lbfen setFont:[UIFont fontWithName:@"D-DIN-PRO-Bold" size:20]];
[scvback addSubview:lbfen];
[lbfen mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.offset(20);
make.left.offset(UISCREEN_WIDTH-50);
}];
_lbfen = lbfen;
UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, UISCREEN_HEIGHT*0.2, UISCREEN_WIDTH, UISCREEN_HEIGHT*0.8-TabHeight-20-NavHeight)];
[viewback setBackgroundColor:[UIColor whiteColor]];
[self addSubview:viewback];
@ -221,10 +235,16 @@
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
}
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_correct" ispush:YES back:^(BOOL value) {
if(value)
{
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
vc.strqxjyly = @"write_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
}
-(void)showVC:(NSInteger)page
@ -295,7 +315,11 @@
{
_modelDetailZWPG = modelDetailZWPG;
if(modelDetailZWPG==nil)return;
if(self.isshiyong==NO)
{
[self.scvbackinfo setContentSize:CGSizeMake(UISCREEN_WIDTH*2, 0)];
self.viewtop.arrTitle = @[@"综合评价",@"分句点评"];
}
self.viewshare.arrimageUrls = self.modelDetailZWPG.output_image;
if(self.modelDetailZWPG.output_image.count>0)
@ -381,6 +405,9 @@
make.bottom.equalTo(viewlast).offset(20);
}];
self.lbfen.text = [Tools isStringnilkong:modelHestory.result.write_correct_score.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
self.viewzh.modelHestoryResult = self.modelHestory.result;
self.modelContentItems = self.modelHestory.result.write_correct;
@ -431,6 +458,11 @@
_modelPF = modelPF;
self.viewzh.modelPF = modelPF;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
self.lbfen.text = [Tools isStringnilkong:modelPF.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
});
}
///分享

6
ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.h
View File

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic , assign) BOOL isshiyong;
///引导页数据-课堂写作
@property (nonatomic , strong) TextbookInfoModelData *modelDetailYDY;
///引导页数据-作文批改
///引导页数据-作文批改 或者示例
@property (nonatomic , strong) ExampleCorrectListDataItems *modelDetailZWPG;
@ -31,6 +31,10 @@ NS_ASSUME_NONNULL_BEGIN
///课堂写作 课堂写作id
@property (nonatomic , strong) NSString *textbook_id;
///是否有权限
@property (nonatomic , assign) BOOL isquanxian;
@end
NS_ASSUME_NONNULL_END

3
ProductApp/ProductApp/ProductMain/引导/扫描识别页面/view/StartKTXZPGView.m
View File

@ -320,7 +320,7 @@
vc.textbook_id = self.textbook_id;
vc.strID = self.strID;
vc.arrXZImages = self.arrXZImages;
vc.isquanxian = self.isquanxian;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;
@ -331,6 +331,7 @@
vc.modelDetailZWPG = self.modelDetailZWPG;
vc.strID = self.strID;
vc.arrXZImages = self.arrXZImages;
vc.isquanxian = self.isquanxian;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;

3
ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/StartPZXZDetailViewController.m
View File

@ -58,7 +58,8 @@
}
-(void)navMuenButtonAction
{
UIViewController *vc = [NSClassFromString(@"YiJianFanKuiController") new];
[self.navigationController pushViewController:vc animated:YES];
}
- (void)viewDidLoad {
[super viewDidLoad];

20
ProductApp/ProductApp/ProductMain/引导/拍照写作/文章/view/StartPZXZDetailView.m
View File

@ -531,9 +531,23 @@
}
else
{///复制
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = self.lbwz.strValue;
[HXHud showMessage:@"复制成功" afterDelayType:0];
if(self.modelYD)
{
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"photos_write_example_copy" ispush:YES back:^(BOOL value) {
if(value)
{
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = self.lbwz.strValue;
[HXHud showMessage:@"复制成功" afterDelayType:0];
}
}];
}
else
{
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = self.lbwz.strValue;
[HXHud showMessage:@"复制成功" afterDelayType:0];
}
}
}
-(void)tuoluo

4
ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayGoodsView.m
View File

@ -99,6 +99,10 @@
else
{
[self.viewpay setHidden:YES];
[self mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(self.viewpay.mas_top).offset(10);
}];
}
}

9
ProductApp/ProductApp/ProductMain/引导/智能写作/思路/view/StartZNXZSiLuView.m
View File

@ -364,8 +364,13 @@ typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
arrson = [str componentsSeparatedByString:@"*"];
}
NSMutableArray *arrvalue = [NSMutableArray arrayWithArray:arrson];
[arrvalue removeObject:@""];
[arrvalue removeObject:@"\n"];
if(arrvalue.count>0)
{
if([arrvalue[0] length]<4)
{
[arrvalue removeObjectAtIndex:0];
}
}
model.arrSon = arrvalue;
if(i>0)
{

3
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.h
View File

@ -23,6 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
///
@property (nonatomic , strong) NSString *strID;
///是否有权限
@property (nonatomic , assign) BOOL isquanxian;
@end
NS_ASSUME_NONNULL_END

17
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/StartKTXZPGDetailViewController.m
View File

@ -8,8 +8,8 @@
#import "StartKTXZPGDetailViewController.h"
#import "StartKTXZPGDetailView.h"
#import "KaiTongAlterView.h"
#import "NetWorkManager.h"
#import "KaiTongAlterView.h"
@interface StartKTXZPGDetailViewController ()
///
@ -32,6 +32,8 @@
{
[self.navigationView setMuenImg:@"xz_fenxiang"];
}
[self getQuanXian];
}
-(void)navMuenButtonAction
{
@ -127,5 +129,16 @@
}
}
-(void)getQuanXian
{
if(self.isquanxian==YES)return;
[UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) {
if(value==NO)
{
KaiTongAlterView *view = [[KaiTongAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.source = @"correct_recharge_dialog";
[self.view addSubview:view];
}
}];
}
@end

58
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/StartKTXZPGDetailView.m
View File

@ -19,6 +19,8 @@
///
@property (nonatomic , strong) UIScrollView *scvback;
///
@property (nonatomic , strong) UILabel *lbfen;
///
@property (nonatomic , strong) UIView *viewback;
///
@property (nonatomic , strong) StartKTXZPGDetailTabView *viewtop;
@ -56,6 +58,18 @@
}];
_scvback = scvback;
UILabel *lbfen = [[UILabel alloc] init];
[lbfen setText:@""];
[lbfen setTextColor:RGBCOLOR(231, 47, 21)];
[lbfen setTextAlignment:NSTextAlignmentCenter];
[lbfen setFont:[UIFont fontWithName:@"D-DIN-PRO-Bold" size:20]];
[scvback addSubview:lbfen];
[lbfen mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.offset(20);
make.left.offset(UISCREEN_WIDTH-50);
}];
_lbfen = lbfen;
UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, UISCREEN_HEIGHT*0.2, UISCREEN_WIDTH, UISCREEN_HEIGHT*0.8-TabHeight-20-NavHeight)];
[viewback setBackgroundColor:[UIColor whiteColor]];
[self addSubview:viewback];
@ -203,13 +217,36 @@
}
else
{///
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
if(self.modelDetailYDY)
{
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_correct_example" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
vc.strqxjyly = @"write_correct_example";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
else
{
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_correct" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
vc.strqxjyly = @"write_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
}
}
-(void)showVC:(NSInteger)page
@ -319,6 +356,8 @@
make.bottom.equalTo(viewlast).offset(20);
}];
}
self.lbfen.text = [Tools isStringnilkong:modelDetailYDY.result.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
//// 综合评价 分句点评 写作思路
self.viewzh.modelResult = modelDetailYDY.result;
}
@ -367,6 +406,11 @@
_modelPF = modelPF;
self.viewzh.modelPF = modelPF;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
self.lbfen.text = [Tools isStringnilkong:modelPF.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
});
}
-(void)haibaoAction:(NSNotification *)notifi
{

9
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/写作思路/StartKTXZPGDetailXZView.m
View File

@ -472,8 +472,13 @@ typedef void(^backenddraw)(void);
arrson = [str componentsSeparatedByString:@"*"];
}
NSMutableArray *arrvalue = [NSMutableArray arrayWithArray:arrson];
[arrvalue removeObject:@""];
[arrvalue removeObject:@"\n"];
if(arrvalue.count>0)
{
if([arrvalue[0] length]<4)
{
[arrvalue removeObjectAtIndex:0];
}
}
model.arrSon = arrvalue;
if(i>0)
{

4
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/综合评价/StartKTXZPGDetailZHView.m
View File

@ -218,6 +218,10 @@
if(self.modelHestoryResult.write_correct_score.complex_review.score.count%2!=0)iline+=1;
}
UIView *viewlast = nil;
if(iline==0)
{
viewlast = viewinfo;
}
for(int i = 0; i < iline; i++)
{
for(int j = 0 ; j < 2; j++)

35
ProductApp/ProductApp/ProductMain/范文/详情/view/FanWenDetailView.m
View File

@ -256,21 +256,32 @@
{
if(sender.tag==0)
{
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = [Tools isStringnil:self.modelDetail.content];
[HXHud showMessage:@"复制成功" afterDelayType:0];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"excellent_composition_copy" ispush:YES back:^(BOOL value) {
if(value)
{
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = [Tools isStringnil:self.modelDetail.content];
[HXHud showMessage:@"复制成功" afterDelayType:0];
}
}];
}
else
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.modelDetail.ID] forKey:@"example_text_id"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.topic] forKey:@"require"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_example_text";
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_excellent_composition" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.modelDetail.ID] forKey:@"example_text_id"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.topic] forKey:@"require"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_example_text";
vc.strqxjyly = @"write_excellent_composition";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
}

11
ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m
View File

@ -27,6 +27,17 @@
[viewback.layer setCornerRadius:8];
[viewback setImage:[UIImage imageNamed:@"home_znxzback"]];
UIImageView *viewback1 = [[UIImageView alloc] init];
[self.contentView addSubview:viewback1];
[viewback1 mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
[viewback1.layer setMasksToBounds:YES];
[viewback1.layer setCornerRadius:8];
[viewback1 setImage:[UIImage imageNamed:@"home_ppt_znxz_back"]];
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"写作生成"];
[lbname setTextColor:RGBCOLOR(26, 26, 26)];

5
ProductApp/ProductApp/ProductMain/首页/写作分享/XieZuoFenXiangAlterView.m
View File

@ -481,7 +481,10 @@
NSString *strdp = @"";
for(SSEDrawListTextModel *model in self.arrQWDP)
{
strdp = [strdp stringByAppendingString:model.value];
if(model.value)
{
strdp = [strdp stringByAppendingString:model.value];
}
}
NSArray *arrvalue = @[[NSString stringWithFormat:@"评分标准：%@",[UserInfoModel shareModel].user_stage.parent_name],
[Tools isStringnil:strdp]];

46
ProductApp/ProductApp/ProductMain/首页/智能PPT生成/view/ZhiNengPPTView.m
View File

@ -515,36 +515,32 @@
///生成
-(void)shengchengAction
{
[StartZNPPTHUDAlter show];
if(self.viewfile.hidden==NO && self.dataSave)
{
NSMutableDictionary *dicQuery = [NSMutableDictionary new];
[dicQuery setObject:@"ppt" forKey:@"scene"];
[[PublicUploadImageManager shareManager] netWorkUrlUserPost:[NSString stringWithFormat:@"%@api/user/upload",BaseUrl] UploadData:self.dataSave name:self.lbfilename.text dicQuery:dicQuery Callback:^(BOOL state, NSDictionary *responseObject, NSString * _Nullable describle) {
if(state)
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"ppt_create" ispush:YES back:^(BOOL value) {
if(value)
{
[StartZNPPTHUDAlter show];
if(self.viewfile.hidden==NO && self.dataSave)
{
self.file_id = [Tools isStringnil:[responseObject objectForKey:@"id"]];
[self createSiLu];
NSMutableDictionary *dicQuery = [NSMutableDictionary new];
[dicQuery setObject:@"ppt" forKey:@"scene"];
[[PublicUploadImageManager shareManager] netWorkUrlUserPost:[NSString stringWithFormat:@"%@api/user/upload",BaseUrl] UploadData:self.dataSave name:self.lbfilename.text dicQuery:dicQuery Callback:^(BOOL state, NSDictionary *responseObject, NSString * _Nullable describle) {
if(state)
{
self.file_id = [Tools isStringnil:[responseObject objectForKey:@"id"]];
[self createSiLu];
}
else
{
[HXHud showMessage:@"文件上传失败" afterDelayType:1];
}
}];
}
else
{
[HXHud showMessage:@"文件上传失败" afterDelayType:1];
[self createSiLu];
}
}];
}
else
{
[self createSiLu];
}
// [StartZNPPTHUDAlter show];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [StartZNPPTHUDAlter dismis];
// StartZNPPTDaGangViewController *vc = [StartZNPPTDaGangViewController new];
// [self.viewController.navigationController pushViewController:vc animated:YES];
//
// });
}
}];
}
-(void)createSiLu

12
ProductApp/ProductApp/ProductMain/首页/智能写作/view/ZhiNengXieZuoDuanLuoView.m
View File

@ -249,6 +249,16 @@
return;
}
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_paragraph" ispush:YES back:^(BOOL value) {
if(value)
{
[self pushnext];
}
}];
}
-(void)pushnext
{
[LoadAlterView show];
[NetWorkManager requestChatCheckData:self content:[NSString stringWithFormat:@"%@%@",[self getFieldValue:0],[self getFieldValue:1]] Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
@ -269,8 +279,8 @@
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
-(NSString *)getFieldValue:(int)tag
{
UITextField *field = self.arrfield[tag];

47
ProductApp/ProductApp/ProductMain/首页/智能写作/view/ZhiNengXieZuoQuanWenView.m
View File

@ -218,27 +218,34 @@
[HXHud showMessage:@"请输入作文标题" afterDelayType:0];
return;
}
[LoadAlterView show];
[NetWorkManager requestChatCheckData:self content:[NSString stringWithFormat:@"%@%@",[self getFieldValue:0],[self getFieldValue:1]] Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_one_key" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[self getFieldValue:0] forKey:@"title"];
[dicpush setObject:[self getFieldValue:1] forKey:@"require"];
[dicpush setObject:[self getFieldValue:2] forKey:@"type"];
[dicpush setObject:[self getFieldValue:3] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dic_type = [self getFieldValue:2];
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
[LoadAlterView show];
[NetWorkManager requestChatCheckData:self content:[NSString stringWithFormat:@"%@%@",[self getFieldValue:0],[self getFieldValue:1]] Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[self getFieldValue:0] forKey:@"title"];
[dicpush setObject:[self getFieldValue:1] forKey:@"require"];
[dicpush setObject:[self getFieldValue:2] forKey:@"type"];
[dicpush setObject:[self getFieldValue:3] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dic_type = [self getFieldValue:2];
vc.dicpush = dicpush;
vc.strqxjyly = @"write_one_key";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
}];
}

3
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/XieZuoXiangQingViewController.h
View File

@ -19,6 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
///写作思路数据 SSEDrawModel
@property (nonatomic , strong) NSArray *arrSL;
///权限校验来源
@property (nonatomic , strong) NSString *strqxjyly;
@end
NS_ASSUME_NONNULL_END

6
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/XieZuoXiangQingViewController.m
View File

@ -29,6 +29,11 @@
[self.navigationView setBackgroundColor:[UIColor clearColor]];
[self.navigationView setMuenTitle:@"反馈" titleColor:RGBCOLOR(60, 60, 60)];
}
-(void)navMuenButtonAction
{
UIViewController *vc = [NSClassFromString(@"YiJianFanKuiController") new];
[self.navigationController pushViewController:vc animated:YES];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self.view setBackgroundColor:[UIColor whiteColor]];
@ -39,6 +44,7 @@
make.left.right.bottom.equalTo(self.view);
make.top.offset(NavHeight);
}];
view.strqxjyly = self.strqxjyly;
view.dicpush = self.dicpush;
view.dic_type = self.dic_type;
view.arrSL = self.arrSL;

3
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.h
View File

@ -18,7 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic , strong) NSString *dic_type;
///写作思路数据 SSEDrawModel
@property (nonatomic , strong) NSArray *arrSL;
///权限校验来源
@property (nonatomic , strong) NSString *strqxjyly;
@end
NS_ASSUME_NONNULL_END

8
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/写作详情/view/XieZuoXiangQingView.m
View File

@ -291,7 +291,13 @@
switch (sender.tag) {
case 0:
{///重写
[self getdata];
[UserInfoModel quanXianJiaoYan:self.viewController scence:[NSString stringWithFormat:@"write_%@",self.strqxjyly] ispush:YES back:^(BOOL value) {
if(value)
{
[self getdata];
}
}];
}
break;
case 1:

5
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/创作思路/ChuangZuoSiLuViewController.m
View File

@ -24,6 +24,11 @@
[self.navigationView setBackgroundColor:[UIColor clearColor]];
[self.navigationView setMuenTitle:@"反馈" titleColor:RGBCOLOR(60, 60, 60)];
}
-(void)navMuenButtonAction
{
UIViewController *vc = [NSClassFromString(@"YiJianFanKuiController") new];
[self.navigationController pushViewController:vc animated:YES];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self.view setBackgroundColor:[UIColor whiteColor]];

43
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/创作思路/view/ChuangZuoSiLuView.m
View File

@ -213,8 +213,6 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
[self.viewController.navigationController pushViewController:vc animated:YES];
[vc setBackValue:^(NSString * _Nonnull value) {
[self setDic_require:value];
// self->_dic_require = value;
// [self getdata:@"switch_outline"];
}];
}
@ -225,19 +223,26 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
[HXHud showMessage:@"请等待写作完成" afterDelayType:0];
return;
}
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.dic_title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.dic_require] forKey:@"require"];
[dicpush setObject:[Tools isStringnil:self.dic_type] forKey:@"type"];
[dicpush setObject:[Tools isStringnil:self.dic_require_num] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_with_outline";
vc.dicpush = dicpush;
vc.dic_type = self.dic_type;
vc.arrSL = self.arrDraw;
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_method" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.dic_title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.dic_require] forKey:@"require"];
[dicpush setObject:[Tools isStringnil:self.dic_type] forKey:@"type"];
[dicpush setObject:[Tools isStringnil:self.dic_require_num] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_with_outline";
vc.dicpush = dicpush;
vc.dic_type = self.dic_type;
vc.arrSL = self.arrDraw;
vc.strqxjyly = @"write_method";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
-(void)getdata:(NSString *)scenct
@ -298,6 +303,7 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
-(void)chuliShuJu:(NSString *)value isfinish:(BOOL)isfinish
{
NSLog(@"%@",value);
if(isfinish)
{
for(SSEDrawModel *model in self.arrDraw)
@ -334,8 +340,13 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
arrson = [str componentsSeparatedByString:@"*"];
}
NSMutableArray *arrvalue = [NSMutableArray arrayWithArray:arrson];
[arrvalue removeObject:@""];
[arrvalue removeObject:@"\n"];
if(arrvalue.count>0)
{
if([arrvalue[0] length]<4)
{
[arrvalue removeObjectAtIndex:0];
}
}
model.arrSon = arrvalue;
if(i>0)
{

3
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/换个思路/HuanGeSiLuViewController.m
View File

@ -30,7 +30,8 @@
}
-(void)navMuenButtonAction
{
UIViewController *vc = [NSClassFromString(@"YiJianFanKuiController") new];
[self.navigationController pushViewController:vc animated:YES];
}
- (void)viewDidLoad {
[super viewDidLoad];

17
ProductApp/ProductApp/ProductMain/首页/智能写作/段落/view/DuanLuoXieZuoCellView.m
View File

@ -166,12 +166,17 @@
}
if(self.paragraph_type.intValue==0)
{///开头段落续写
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setDictionary:self.dicpush];
[dicpush setObject:self.strvalue forKey:@"paragraph"];
DuanLuoXieZuoQWViewController *vc = [DuanLuoXieZuoQWViewController new];
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_paragraph_continue" ispush:YES back:^(BOOL value) {
if(value)
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setDictionary:self.dicpush];
[dicpush setObject:self.strvalue forKey:@"paragraph"];
DuanLuoXieZuoQWViewController *vc = [DuanLuoXieZuoQWViewController new];
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
}

60
ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m
View File

@ -332,46 +332,42 @@
[HXHud showMessage:@"请添加图片" afterDelayType:0];
return;
}
///1作文批改 2拍照写作
///1作文批改 2拍照写作 3课堂写作
if(self.type==1)
{
// StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
// vc.type = 1;
// vc.arrXZImages = self.arrData;
// [self.navigationController pushViewController:vc animated:YES];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 1;
view.arrXZImages = self.arrData;
[self.view addSubview:view];
[UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) {
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 1;
view.arrXZImages = self.arrData;
view.isquanxian = value;
[self.view addSubview:view];
}];
}
else if(self.type==2)
{
NSArray *arrtt = @[@"改写作文",@"拍题成文",@"拍照续写"];
int temp = (int)[arrtt indexOfObject:[self.viewtype getSelectName]];
// StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
// vc.type = temp+10;
// vc.arrXZImages = self.arrData;
// [self.navigationController pushViewController:vc animated:YES];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = temp+10;
view.arrXZImages = self.arrData;
[self.view addSubview:view];
[UserInfoModel quanXianJiaoYan:self scence:@"photos_write" ispush:YES back:^(BOOL value) {
if(value)
{
NSArray *arrtt = @[@"改写作文",@"拍题成文",@"拍照续写"];
int temp = (int)[arrtt indexOfObject:[self.viewtype getSelectName]];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = temp+10;
view.arrXZImages = self.arrData;
[self.view addSubview:view];
}
}];
}
else if(self.type==3)
{
// StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
// vc.type = 0;
// vc.arrXZImages = self.arrData;
// vc.textbook_id = self.textbook_id;
// [self.navigationController pushViewController:vc animated:YES];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 0;
view.arrXZImages = self.arrData;
view.textbook_id = self.textbook_id;
[self.view addSubview:view];
[UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) {
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 0;
view.arrXZImages = self.arrData;
view.textbook_id = self.textbook_id;
view.isquanxian = value;
[self.view addSubview:view];
}];
}
}
break;

21
ProductApp/ProductApp/ProductMain/首页/自定义相机/view/CamreShiLiView.m
View File

@ -128,16 +128,19 @@
-(void)okAction
{
///1作文批改 2拍照写作
///1作文批改 2拍照写作 3课堂写作
if(self.type==1 || self.type == 3)
{
// StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
// vc.type = 1;
// vc.modelDetailZWPG = self.arrdata[self.bannerView.currentIndex];
// [self.viewController.navigationController pushViewController:vc animated:YES];
///0课堂写作 1作文批改
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 1;
if(self.type==3)
{
view.type = 0;
}
else
{
view.type = 1;
}
view.modelDetailZWPG = self.arrdata[self.bannerView.currentIndex];
[self.viewController.view addSubview:view];
}
@ -145,10 +148,6 @@
{
NSArray *arrtt = @[@"改写作文",@"拍题成文",@"拍照续写"];
int temp = (int)[arrtt indexOfObject:self.strpzname];
// StartKTXZPGViewController *vc = [StartKTXZPGViewController new];
// vc.type = temp+10;
// vc.modelXZSL = self.arrdata[self.bannerView.currentIndex];
// [self.viewController.navigationController pushViewController:vc animated:YES];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = temp+10;

34
ProductApp/ProductApp/ProductMain/首页/课堂写作/详情/view/KeTangXieZuoXiangQingView.m
View File

@ -412,20 +412,26 @@
///生成例文
-(void)aiAction
{
NSString *strtempstate = [self.strtitle stringByReplacingOccurrencesOfString:@"上册" withString:@""];
strtempstate = [strtempstate stringByReplacingOccurrencesOfString:@"下册" withString:@""];
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.modelDetail.title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.content] forKey:@"require"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.genre] forKey:@"type"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.word_count] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:strtempstate] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dicpush = dicpush;
vc.dic_type = self.modelDetail.genre;
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel quanXianJiaoYan:self.viewController scence:@"write_one_key_classroom" ispush:YES back:^(BOOL value) {
if(value)
{
NSString *strtempstate = [self.strtitle stringByReplacingOccurrencesOfString:@"上册" withString:@""];
strtempstate = [strtempstate stringByReplacingOccurrencesOfString:@"下册" withString:@""];
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.modelDetail.title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.content] forKey:@"require"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.genre] forKey:@"type"];
[dicpush setObject:[Tools isStringnil:self.modelDetail.word_count] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:strtempstate] forKey:@"stage"];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dicpush = dicpush;
vc.dic_type = self.modelDetail.genre;
vc.strqxjyly = @"write_one_key_classroom";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}];
}
///梳理思路
-(void)ccreateAction