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

BUG

This commit is contained in:
pengguangjian 2024-11-07 18:32:07 +08:00
parent ab11985b47
commit 301a615b2c
99 changed files with 1078 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,7 @@
CA9CFF712CC9E9E300C3E90E /* RoleInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA9CFF702CC9E9E300C3E90E /* RoleInfoModel.m */; };
CA9CFF742CCA2FB200C3E90E /* SSEDrawListTextModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA9CFF732CCA2FB200C3E90E /* SSEDrawListTextModel.m */; };
CA9CFF772CCA457400C3E90E /* XieZuoSaveAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA9CFF762CCA457400C3E90E /* XieZuoSaveAlterView.m */; };
CAA144CA2CDC66A300A25AC4 /* UpdataAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA144C92CDC66A300A25AC4 /* UpdataAlterView.m */; };
CAA600CD2CA92FB700026CF4 /* FXErView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA600CC2CA92FB700026CF4 /* FXErView.m */; };
CAA600D12CA9565500026CF4 /* KeTangXieZuoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA600D02CA9565500026CF4 /* KeTangXieZuoViewController.m */; };
CAA600D52CA9579800026CF4 /* KeTangXieZuoCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA600D42CA9579800026CF4 /* KeTangXieZuoCollectionViewCell.m */; };
@ -1030,6 +1031,8 @@
CA9CFF732CCA2FB200C3E90E /* SSEDrawListTextModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SSEDrawListTextModel.m; sourceTree = "<group>"; };
CA9CFF752CCA457400C3E90E /* XieZuoSaveAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XieZuoSaveAlterView.h; sourceTree = "<group>"; };
CA9CFF762CCA457400C3E90E /* XieZuoSaveAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XieZuoSaveAlterView.m; sourceTree = "<group>"; };
CAA144C82CDC66A300A25AC4 /* UpdataAlterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdataAlterView.h; sourceTree = "<group>"; };
CAA144C92CDC66A300A25AC4 /* UpdataAlterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdataAlterView.m; sourceTree = "<group>"; };
CAA600CB2CA92FB700026CF4 /* FXErView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FXErView.h; sourceTree = "<group>"; };
CAA600CC2CA92FB700026CF4 /* FXErView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FXErView.m; sourceTree = "<group>"; };
CAA600CF2CA9565500026CF4 /* KeTangXieZuoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeTangXieZuoViewController.h; sourceTree = "<group>"; };
@ -2042,6 +2045,8 @@
CA11ED692CA6924800209DFC /* alter */ = {
isa = PBXGroup;
children = (
CAA144C82CDC66A300A25AC4 /* UpdataAlterView.h */,
CAA144C92CDC66A300A25AC4 /* UpdataAlterView.m */,
CA11ED6D2CA6945800209DFC /* view */,
CA11ED6A2CA6925D00209DFC /* KaiTongAlterView.h */,
CA11ED6B2CA6925D00209DFC /* KaiTongAlterView.m */,
@ -5008,6 +5013,7 @@
CA0688CD2CD328C500DF7025 /* ToolCheckModel.m in Sources */,
CB489F762744A0BD00DA044A /* UIColor+LSFoundation.m in Sources */,
CB489F952744A0BD00DA044A /* BaseRequestDataController.m in Sources */,
CAA144CA2CDC66A300A25AC4 /* UpdataAlterView.m in Sources */,
CB489F8A2744A0BD00DA044A /* UIButton+HQCustomIcon.m in Sources */,
CA4257912CA2652D00A36A10 /* StartZNPPTView.m in Sources */,
CB489F632744A0BD00DA044A /* CountDownManager.m in Sources */,

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

Binary file not shown.

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

@ -40,7 +40,7 @@
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
@ -50,13 +50,43 @@
endingLineNumber = "338"
landmarkName = "-bottomAction:"
landmarkType = "7">
<Locations>
<Location
uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D - f0b70fbf7c1b29"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[CamreViewController bottomAction:]"
moduleName = "ProductApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "338"
endingLineNumber = "338">
</Location>
<Location
uuid = "F33A2D73-E914-4309-8C86-1BC4FA3BA81D - 318eb1806ca6068f"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__36-[CamreViewController bottomAction:]_block_invoke"
moduleName = "ProductApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "339"
endingLineNumber = "339">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5"
shouldBeEnabled = "No"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
@ -66,6 +96,84 @@
endingLineNumber = "363"
landmarkName = "-bottomAction:"
landmarkType = "7">
<Locations>
<Location
uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5 - f0b70fbf7c1fe0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[CamreViewController bottomAction:]"
moduleName = "ProductApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "363"
endingLineNumber = "363">
</Location>
<Location
uuid = "24246768-FB4F-4C9A-9FAF-51A9F99C84C5 - a82b2db259f82353"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "__36-[CamreViewController bottomAction:]_block_invoke_2"
moduleName = "ProductApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/gongzuo/Desktop/%E5%85%AC%E5%8F%B8GIT/%E6%9E%81%E5%85%89%E5%86%99%E4%BD%9C/ProductApp/ProductApp/ProductMain/%E9%A6%96%E9%A1%B5/%E8%87%AA%E5%AE%9A%E4%B9%89%E7%9B%B8%E6%9C%BA/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "364"
endingLineNumber = "364">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B3C9F4F8-B1B7-4678-AA13-F3B004BA126A"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x667a;&#x80fd;&#x5199;&#x4f5c;/&#x5168;&#x6587;&#x5199;&#x4f5c;/&#x5199;&#x4f5c;&#x8be6;&#x60c5;/view/XieZuoXiangQingView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "283"
endingLineNumber = "283"
landmarkName = "-cxAction:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C2315BAF-37C0-44A6-BB89-CA3A65C178F7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x9996;&#x9875;/&#x81ea;&#x5b9a;&#x4e49;&#x76f8;&#x673a;/CamreViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "354"
endingLineNumber = "354"
landmarkName = "-bottomAction:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3E79A7F2-E55C-4BDB-A68C-0689167DA248"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x626b;&#x63cf;&#x8bc6;&#x522b;&#x9875;&#x9762;/view/StartKTXZPGView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "269"
endingLineNumber = "269"
landmarkName = "-createJiLu"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>

BIN
ProductApp/ProductApp/Assets.xcassets/login/login_logo.imageset/200圆角.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/login/login_logo.imageset/300圆角.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

4
ProductApp/ProductApp/Assets.xcassets/login/login_logo.imageset/Contents.json vendored
View File

@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "logo@2x.png",
"filename" : "200圆角.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "logo@3x.png",
"filename" : "300圆角.png",
"idiom" : "universal",
"scale" : "3x"
}

BIN
ProductApp/ProductApp/Assets.xcassets/login/login_logo.imageset/logo@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/login/login_logo.imageset/logo@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 KiB

21
ProductApp/ProductApp/Assets.xcassets/首页/ic_correct_score_red.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/首页/ic_correct_score_red.imageset/ic_correct_score_red.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/首页/分享海报/hb_log.imageset/512圆角@2x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/首页/分享海报/hb_log.imageset/512圆角@3x.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/首页/分享海报/hb_log.imageset/96圆角 1.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/首页/分享海报/hb_log.imageset/96圆角.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

4
ProductApp/ProductApp/Assets.xcassets/首页/分享海报/hb_log.imageset/Contents.json vendored
View File

@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "512圆角@2x.png",
"filename" : "96圆角 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "512圆角@3x.png",
"filename" : "96圆角.png",
"idiom" : "universal",
"scale" : "3x"
}

8
ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.h
View File

@ -15,6 +15,8 @@
@property (nonatomic , strong) UINavigationController *supernav;
//自定义导航栏
@property (nonatomic, strong) NaviGationView *navigationView;
///进入页面的时间
@property (nonatomic , strong) NSString *startInputTime;
/**
* 添加自定义导航栏
* isPush 是否为push
@ -32,4 +34,10 @@
@property (nonatomic, strong) TabBarController *tabBars;
///获取页面停留时间
-(NSString *)getTingLiuShiJian;
///判断是否需要跳转登录页面
-(void)tanLoginChuan;
@end

64
ProductApp/ProductApp/BaseControl/TabBar/BaseViewController.m
View File

@ -7,6 +7,12 @@
//
//#import "LoginViewController.h"
#import "BaseViewController.h"
#import "AppDelegate.h"
#import "GuiZheAlterView.h"
#import "LoginViewController.h"
#import "NavgationController.h"
static int tabnavHeight;
@interface BaseViewController ()<UITabBarControllerDelegate>
{
@ -15,7 +21,11 @@ static int tabnavHeight;
@end
@implementation BaseViewController
-(void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
self.tabBarController.delegate = self;
}
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
@ -23,7 +33,8 @@ static int tabnavHeight;
if ([self respondsToSelector:@selector(edgesForExtendedLayout)]){
self.edgesForExtendedLayout = UIRectEdgeNone;
}
self.tabBarController.delegate = self;
self.startInputTime = [Tools getCurrentTime:@"yyyy-MM-dd HH:mm:ss"];
}
- (void)viewWillAppear:(BOOL)animated {
@ -106,7 +117,13 @@ static int tabnavHeight;
- (void)muensButtonClick {
[self navMuensButtonAction];
}
///获取页面停留时间
-(NSString *)getTingLiuShiJian
{
NSString *strendTime = [Tools getCurrentTime:@"yyyy-MM-dd HH:mm:ss"];
NSString *strmiao = [Tools timeDifference:self.startInputTime EndTime:strendTime TimeType:5];
return [NSString stringWithFormat:@"停留时间：%@s",strmiao];
}
#pragma mark -子类可以重写下面3个方法，实现相应的步骤
- (void)navBackButtonAction {
}
@ -144,17 +161,48 @@ static int tabnavHeight;
// }
}
-(BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController{
// if ([tabBarController.tabBar.selectedItem.title isEqualToString:@"消息"]) {
//
// return NO;//为NO就不会切换tab
// }
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:@""];
return YES;
}
- (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item {
}
-(void)tanLoginChuan
{
if([UserInfoModel shareModel].temp.intValue == 1 && ([UserInfoModel shareModel].vip.intValue == 2||[UserInfoModel shareModel].vip.intValue == 3||[UserInfoModel shareModel].vip.intValue == 11 || [UserInfoModel shareModel].vip.intValue == 12))
{
AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
[UserInfoModel shijianShangBao:0 key:@"client.member.force.login" value:@"" extra:@""];
[GuiZheAlterView showInfo:@"系统检测到您目前尚未登录，\n但您已成为我们尊贵的会员。\n为了防止您的会员账号丢失，\n建议您立即前往登录。" title:@"温馨提示" bttitle:@"立即前往" superview:appde.window backAction:^{
dispatch_async(dispatch_get_main_queue(), ^{
AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
[GuiZheAlterView dismisView];
});
}];
}
}
#pragma mark - lary
- (NaviGationView *)navigationView {
if (!_navigationView) {

4
ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m
View File

@ -56,7 +56,9 @@
if(_strurl.length>5)
{
NSString *strlast = [self.strurl lastPathComponent];
strlast = [strlast stringByReplacingOccurrencesOfString:@".html" withString:@"Agreement"];
[UserInfoModel shijianShangBao:0 key:@"client.view.agreement" value:strlast extra:self.strurl];
[webview loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:_strurl]]];
}
else

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

@ -412,6 +412,9 @@
{
self.backValue();
}
[UserInfoModel shijianShangBao:0 key:@"client.pay.select" value:sender.tag==1?@"weixin":@"alipay" extra:@""];
}
-(void)getYouHuiList

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

@ -42,6 +42,8 @@
-(void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[self tanLoginChuan];
}
- (void)viewDidLoad {
[super viewDidLoad];

8
ProductApp/ProductApp/ProductMain/NetWorkManager/PublicNetWorkManager.m
View File

@ -411,10 +411,10 @@
NSMutableDictionary *dicHeader = [NSMutableDictionary new];
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:type forKey:@"type"];
[dicpush setObject:key forKey:@"key"];
[dicpush setObject:value forKey:@"value"];
[dicpush setObject:extra forKey:@"extra"];
[dicpush setObject:[Tools isStringnil:type] forKey:@"type"];
[dicpush setObject:[Tools isStringnil:key] forKey:@"key"];
[dicpush setObject:[Tools isStringnil:value] forKey:@"value"];
[dicpush setObject:[Tools isStringnil:extra] forKey:@"extra"];
[YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:2 url:@"api/user/event" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id _Nullable responseObject, NSError * _Nullable error) {
BOOL state = NO;

1
ProductApp/ProductApp/ProductMain/NetWorkManager/SSENetWorkManager.h
View File

@ -20,6 +20,7 @@ typedef void(^SSENetWorkManagerBackIDValue)(NSString *value);
@interface SSENetWorkManager : NSObject
+ (instancetype)shareManager;
- (void)requestTo:(NSString*)host dicpush:(NSDictionary *)dicpush config:(SSENetWorkManagerBackConfigValue)config backValue:(SSENetWorkManagerBackStringValue)backValue error:(SSENetWorkManagerBackErrorValue)error ID:(SSENetWorkManagerBackIDValue)ID;
-(void)cancleTask;
@end
NS_ASSUME_NONNULL_END

16
ProductApp/ProductApp/ProductMain/NetWorkManager/SSENetWorkManager.m
View File

@ -22,6 +22,8 @@
@property (nonatomic , strong) SSENetWorkManagerBackErrorValue backError;
@property (nonatomic , strong) SSENetWorkManagerBackIDValue backID;
@property (nonatomic , strong) NSURLSessionDataTask *task;
@end
@implementation SSENetWorkManager
@ -79,7 +81,15 @@
NSURLSessionDataTask *task = [session dataTaskWithRequest:request];
// 启动任务
[task resume];
self.task = task;
}
-(void)cancleTask
{
if(self.task)
{
[self.task cancel];
self.task = nil;
}
}
#pragma mark - NSURLSessionDelegate
@ -215,11 +225,15 @@
NSString *strerror = [error localizedDescription];
self.backError(strerror);
[UserInfoModel shijianShangBao:0 key:@"client.sse.connect.failure" value:@"write_text" extra:@"error"];
}
else
{
self.backValue(@"",YES);
[UserInfoModel shijianShangBao:0 key:@"client.sse.connect.failure" value:@"write_text" extra:@""];
}
self.task = nil;
}

16
ProductApp/ProductApp/ProductMain/alter/UpdataAlterView.h Normal file
View File

@ -0,0 +1,16 @@
//
// UpdataAlterView.h
// ProductApp
//
// Created by 工作 on 2024/6/20.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface UpdataAlterView : UIView
+(void)showName:(NSString *)name strversion:(NSString *)strversion isforce:(BOOL)isforce;
@end
NS_ASSUME_NONNULL_END

185
ProductApp/ProductApp/ProductMain/alter/UpdataAlterView.m Normal file
View File

@ -0,0 +1,185 @@
//
// UpdataAlterView.m
// ProductApp
//
// Created by 工作 on 2024/6/20.
//
#import "UpdataAlterView.h"
#import "AppDelegate.h"
@interface UpdataAlterView ()
@property (nonatomic , strong) UILabel *lbname;
///
@property (nonatomic , strong) UIButton *btdis;
///
@property (nonatomic , strong) UIView *viewV;
@property (nonatomic , strong) UILabel *lbV;
///
@property (nonatomic , strong) NSString *strtitle;
@property (nonatomic , strong) NSString *strversion;
@property (nonatomic , assign) BOOL isforce;
@end
@implementation UpdataAlterView
-(id)initWithFrame:(CGRect)frame
{
if(self = [super initWithFrame:frame])
{
[self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)];
UIView *viewback = [[UIView alloc] init];
[viewback setBackgroundColor:[UIColor clearColor]];
[self addSubview:viewback];
[viewback mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(40);
make.right.equalTo(self).offset(-40);
make.center.equalTo(self);
}];
[viewback.layer setMasksToBounds:NO];
[viewback.layer setCornerRadius:40];
UIImage *image = [UIImage imageNamed:@"home_updata"];
UIImageView *imgvback = [[UIImageView alloc] init];
[imgvback setImage:[image resizableImageWithCapInsets:UIEdgeInsetsMake(image.size.height*0.9, image.size.width*0.5, image.size.height, image.size.width*0.5)]];
[imgvback setContentMode:UIViewContentModeScaleAspectFill];
[viewback addSubview:imgvback];
[imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(viewback);
}];
UILabel *lbtitle = [[UILabel alloc] init];
[lbtitle setText:@"发现新版本"];
[lbtitle setTextColor:RGBCOLOR(51, 51, 51)];
[lbtitle setTextAlignment:NSTextAlignmentLeft];
[lbtitle setFont:[UIFont boldSystemFontOfSize:18]];
[viewback addSubview:lbtitle];
[lbtitle mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(viewback);
make.top.offset(130);
}];
UILabel *lbV = [[UILabel alloc] init];
[lbV setText:@"V2.0.0"];
[lbV setTextColor:RGBCOLOR(109, 109, 109)];
[lbV setTextAlignment:NSTextAlignmentLeft];
[lbV setFont:[UIFont systemFontOfSize:14]];
[viewback addSubview:lbV];
[lbV mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(lbtitle);
make.top.equalTo(lbtitle.mas_bottom).offset(-1);
}];
_lbV = lbV;
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"1、新版本修复了一些BUG"];
[lbname setTextColor:RGBCOLOR(51, 51, 51)];
[lbname setTextAlignment:NSTextAlignmentCenter];
[lbname setFont:[UIFont systemFontOfSize:14]];
[lbname setNumberOfLines:0];
[viewback addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(lbV.mas_bottom).offset(25);
make.left.offset(50);
make.right.equalTo(viewback).offset(-50);
}];
_lbname = lbname;
UIButton *btok = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-210, 40)];
[btok setTitle:@"立即更新" forState:UIControlStateNormal];
[btok setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[btok.titleLabel setFont:[UIFont systemFontOfSize:16]];
[btok.layer setMasksToBounds:YES];
[btok.layer setCornerRadius:20];
[btok setBackgroundColor:MainColor];
[viewback addSubview:btok];
[btok mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(80);
make.right.equalTo(viewback).offset(-80);
make.top.equalTo(lbname.mas_bottom).offset(35);
make.height.offset(40);
}];
[Tools changedView:btok colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
[btok addTarget:self action:@selector(updataAction) forControlEvents:UIControlEventTouchUpInside];
UIButton *btdis = [[UIButton alloc] init];
[btdis setTitle:@"下次再说" forState:UIControlStateNormal];
[btdis setTitleColor:RGBCOLOR(102, 102, 102) forState:UIControlStateNormal];
[btdis.titleLabel setFont:[UIFont systemFontOfSize:14]];
[viewback addSubview:btdis];
[btdis mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(btok);
make.top.equalTo(btok.mas_bottom);
make.height.offset(40);
}];
[btdis setHidden:YES];
[btdis addTarget:self action:@selector(disAction) forControlEvents:UIControlEventTouchUpInside];
_btdis = btdis;
[viewback mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(btdis).offset(1);
}];
}
return self;
}
-(void)setStrtitle:(NSString *)strtitle
{
self.lbname.text = strtitle;
///行间距
NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
style.lineSpacing = 11;
style.lineBreakMode = NSLineBreakByTruncatingTail;
style.alignment = NSTextAlignmentCenter;
NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:self.lbname.text];
[attrString addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, self.lbname.text.length)];
self.lbname.attributedText = attrString;
}
-(void)setStrversion:(NSString *)strversion
{
self.lbV.text = strversion;
[self.viewV setHidden:YES];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[Tools changedView:self.viewV colors:@[(id)RGBCOLOR(255, 213, 108).CGColor,(id)RGBCOLOR(254, 122, 133).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
[self.viewV setHidden:NO];
});
}
-(void)setIsforce:(BOOL)isforce
{
self.btdis.hidden = isforce;
}
//更新 跳转App Store
-(void)updataAction
{
[UserInfoModel shijianShangBao:0 key:@"client.pkg.update" value:@"" extra:@""];
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:DownLoadUrl] options:@{} completionHandler:nil];
}
-(void)disAction
{
[UserInfoModel shijianShangBao:0 key:@"client.pkg.cance" value:@"" extra:@""];
[self removeFromSuperview];
}
+(void)showName:(NSString *)name strversion:(NSString *)strversion isforce:(BOOL)isforce
{
UpdataAlterView *view = [[UpdataAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate;
view.strtitle = name;
view.strversion = strversion;
view.isforce = isforce;
[app.window addSubview:view];
}
@end

8
ProductApp/ProductApp/ProductMain/login/LoginViewController.m
View File

@ -44,6 +44,10 @@
{
[self getPaizhi];
}
if(!self.isphoneView)
{
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.login" value:@"center" extra:@""];
}
}
-(void)drawUI
{
@ -128,7 +132,7 @@
subViewList:list
loginBlock:^(NSDictionary * _Nullable dic) {
[UserInfoModel shijianShangBao:0 key:@"client.login.click" value:@"onekey" extra:@""];
[UserInfoModel shijianShangBao:0 key:@"client.login" value:@"onekey" extra:@""];
//登录完成回调
if([[dic objectForKey:@"code"] intValue] == 30000){
NSMutableDictionary *dicpush = [NSMutableDictionary new];
@ -157,7 +161,7 @@
contentView:self.contentView
subViewList:list
loginBlock:^(NSDictionary * _Nullable dic) {
[UserInfoModel shijianShangBao:0 key:@"client.login.click" value:@"onekey" extra:@""];
[UserInfoModel shijianShangBao:0 key:@"client.login" value:@"onekey" extra:@""];
//登录完成回调
if([[dic objectForKey:@"code"] intValue] == 30000){
NSMutableDictionary *dicpush = [NSMutableDictionary new];

3
ProductApp/ProductApp/ProductMain/login/view/LoginAppleView.m
View File

@ -267,11 +267,12 @@
-(void)xieyiAction:(UIButton *)sender
{
sender.selected = !sender.selected;
[UserInfoModel shijianShangBao:0 key:@"client.check.agreement" value:@"login" extra:[[NSString alloc] initWithFormat:@"%@",[NSNumber numberWithBool:sender.selected]]];
}
///apple
-(void)dengluAction
{
[UserInfoModel shijianShangBao:0 key:@"client.login.click" value:@"apple" extra:@""];
[UserInfoModel shijianShangBao:0 key:@"client.login" value:@"apple" extra:@""];
NSString *strc = [[UserInfoModel shareModel].config objectForKey:@"client.agreement.dialog"];
if((strc.intValue == 1 || [Tools isStringnil:strc].length==0) && self.btxy.selected == NO)
{

1
ProductApp/ProductApp/ProductMain/login/view/LoginTelView.m
View File

@ -238,6 +238,7 @@ typedef NS_ENUM(NSInteger, Mode) {
{
sender.selected=!sender.selected;
self.isselect = sender.selected;
[UserInfoModel shijianShangBao:0 key:@"client.check.agreement" value:@"login" extra:[[NSString alloc] initWithFormat:@"%@",[NSNumber numberWithBool:sender.selected]]];
}
/// 隐私协议点击回调

4
ProductApp/ProductApp/ProductMain/login/view/LoginView.m
View File

@ -489,6 +489,8 @@
-(void)xieyiAction:(UIButton *)sender
{
sender.selected = !sender.selected;
[UserInfoModel shijianShangBao:0 key:@"client.check.agreement" value:@"login" extra:[[NSString alloc] initWithFormat:@"%@",[NSNumber numberWithBool:sender.selected]]];
}
-(void)dengluAction
@ -509,7 +511,7 @@
[HXHud showMessage:@"请输入验证码" afterDelayType:0];
return;
}
[UserInfoModel shijianShangBao:0 key:@"client.login.click" value:@"code" extra:self.fieldPhone.text];
[UserInfoModel shijianShangBao:0 key:@"client.login" value:@"code" extra:self.fieldPhone.text];
NSString *strc = [[UserInfoModel shareModel].config objectForKey:@"client.agreement.dialog"];
if((strc.intValue == 1 || [Tools isStringnil:strc].length==0) && self.btxy.selected == NO)

3
ProductApp/ProductApp/ProductMain/login/view/LoginWXView.m
View File

@ -269,11 +269,12 @@
-(void)xieyiAction:(UIButton *)sender
{
sender.selected = !sender.selected;
[UserInfoModel shijianShangBao:0 key:@"client.check.agreement" value:@"login" extra:[[NSString alloc] initWithFormat:@"%@",[NSNumber numberWithBool:sender.selected]]];
}
///wx登录
-(void)dengluAction
{
[UserInfoModel shijianShangBao:0 key:@"client.login.click" value:@"weixin" extra:@""];
[UserInfoModel shijianShangBao:0 key:@"client.login" value:@"weixin" extra:@""];
NSString *strc = [[UserInfoModel shareModel].config objectForKey:@"client.agreement.dialog"];
if((strc.intValue == 1 || [Tools isStringnil:strc].length==0) && self.btxy.selected == NO)
{

1
ProductApp/ProductApp/ProductMain/工具/GongJuViewController.m
View File

@ -46,6 +46,7 @@
[self getdata];
}
[self tanLoginChuan];
}
- (void)viewDidLoad {
[super viewDidLoad];

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

@ -131,7 +131,7 @@
[view addSubview:lbts];
[lbts mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname.mas_right).offset(2);
make.top.offset(16);
make.centerY.equalTo(lbname);
}];
UILabel *lbcontent = [[UILabel alloc] init];

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

@ -131,7 +131,7 @@
[view addSubview:lbts];
[lbts mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname.mas_right).offset(2);
make.top.offset(16);
make.centerY.equalTo(lbname);
}];
ViewLable *lbwz = [[ViewLable alloc] init];

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

@ -134,7 +134,7 @@
[view addSubview:lbts];
[lbts mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname.mas_right).offset(2);
make.top.offset(16);
make.centerY.equalTo(lbname);
}];
ViewLable *lbwz = [[ViewLable alloc] init];

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

@ -471,7 +471,7 @@
[self.viewout setHidden:NO];
self.lbcontent.fspeed = self.modelConfig.time.intValue/1000.0;
} backValue:^(NSString * _Nonnull value, BOOL isfinish) {
if(value.length>3)
if(value.length>5)
{
[self chuliShuJu:value isfinish:NO];
}

1
ProductApp/ProductApp/ProductMain/工具/通用工具/结果/view/GongJuCreateResultView.m
View File

@ -60,7 +60,6 @@
[viewback addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(12);
make.top.offset(16);
}];
lbname.attributedText = [Tools arrstring:lbname.text andstart:0 andend:2 andfont:[UIFont systemFontOfSize:14] andcolor:RGBCOLOR(102, 102, 102)];

14
ProductApp/ProductApp/ProductMain/引导/StartGNViewController.m
View File

@ -21,10 +21,22 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
}
-(void)navBackButtonAction
{
[self.navigationController popViewControllerAnimated:YES];
if(self.type==3)
{
[UserInfoModel shijianShangBao:0 key:@"client.guide.last" value:@"职业选择" extra:@""];
}
else
{
[UserInfoModel shijianShangBao:0 key:@"client.guide.last" value:@"年级选择" extra:@""];
}
}
- (void)viewDidLoad {
[super viewDidLoad];
[self.navigationController setNavigationBarHidden:YES animated:NO];
[self.navigationView setHidden:YES];
[self.navigationView setHidden:NO];
[self.view setBackgroundColor:[UIColor whiteColor]];

9
ProductApp/ProductApp/ProductMain/引导/StartNJViewController.m
View File

@ -32,10 +32,15 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:animated];
[self showNaviGationView:YES];
[self showNaviGationView:NO];
[self.navigationView setTitle:@"" titleColor:RGBCOLOR(60, 60, 60)];
[self.navigationView setBackgroundColor:[UIColor clearColor]];
}
-(void)navBackButtonAction
{
[self.navigationController popViewControllerAnimated:YES];
[UserInfoModel shijianShangBao:0 key:@"client.guide.last" value:@"身份选择" extra:@""];
}
- (void)viewDidLoad {
[super viewDidLoad];
@ -188,6 +193,8 @@
}
}
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"年级选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],strtitle]];
StartGNViewController *vc = [StartGNViewController new];
vc.type = self.type;
vc.arrNJ = arrselect;

9
ProductApp/ProductApp/ProductMain/引导/StartSFViewController.m
View File

@ -20,10 +20,15 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:animated];
[self showNaviGationView:YES];
[self showNaviGationView:NO];
[self.navigationView setTitle:@"" titleColor:RGBCOLOR(60, 60, 60)];
[self.navigationView setBackgroundColor:[UIColor clearColor]];
}
-(void)navBackButtonAction
{
[self.navigationController popViewControllerAnimated:YES];
[UserInfoModel shijianShangBao:0 key:@"client.guide.last" value:@"职业选择" extra:@""];
}
- (void)viewDidLoad {
[super viewDidLoad];
@ -130,6 +135,8 @@
UILabel *lb = self.arrLB[sender.tag];
[lb setTextColor:MainColor];
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" 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];
StartNJViewController *vc = [StartNJViewController new];

3
ProductApp/ProductApp/ProductMain/引导/StartViewController.m
View File

@ -201,6 +201,9 @@
[[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:YingDaoYe];
///初始化收藏工具
[self pushCollectInit];
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"职业选择" extra:[NSString stringWithFormat:@"%@，%@",[self getTingLiuShiJian],lb.text]];
///
if(sender.tag==0)
{

7
ProductApp/ProductApp/ProductMain/引导/view/StartGNView.m
View File

@ -14,6 +14,7 @@
#import "StartZNPPTViewController.h"
#import "RoleTreeModel.h"
#import "BaseViewController.h"
@interface StartGNView ()<UIScrollViewDelegate>
///
@ -287,11 +288,13 @@
default:
break;
}
BaseViewController *vcbase = (BaseViewController *)self.viewController;
if(self.type<=2)
{
NSString *str = arr[self.pagec.selectNumber];
if([str isEqualToString:@"yd_xs_3"])
{///课堂写作
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"课堂写作" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartKeTangXieZuoViewController *vc = [StartKeTangXieZuoViewController new];
vc.strtitle = self.strtitle;
vc.strpid = self.strpid;
@ -300,6 +303,7 @@
}
else if([str isEqualToString:@"yd_xs_2"])
{///拍照写作
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"拍照写作" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartPZXZViewController *vc = [StartPZXZViewController new];
vc.strpid = self.strpid;
vc.role_id = self.role_id;
@ -308,6 +312,7 @@
}
else if([str isEqualToString:@"yd_xs_1"])
{///作文批改
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"作文批改" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartZWPIViewController *vc = [StartZWPIViewController new];
vc.strpid = self.strpid;
vc.role_id = self.role_id;
@ -316,6 +321,7 @@
}
else
{///智能写作
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"写作生成" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartZNXZViewController *vc = [StartZNXZViewController new];
vc.strpid = self.strpid;
vc.role_id = self.role_id;
@ -325,6 +331,7 @@
}
else
{///职员
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:@"PPT" extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartZNPPTViewController *vc = [StartZNPPTViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}

1
ProductApp/ProductApp/ProductMain/引导/作文批改/StartZWPIViewController.m
View File

@ -22,6 +22,7 @@
[super viewDidLoad];
[self.navigationController setNavigationBarHidden:YES animated:NO];
[self showNaviGationView:YES];
[self.view setBackgroundColor:[UIColor whiteColor]];
UIImageView *imgvback = [[UIImageView alloc] init];
[imgvback setImage:[UIImage imageNamed:@"yd_back"]];

9
ProductApp/ProductApp/ProductMain/引导/作文批改/view/StartZWPIView.m
View File

@ -10,6 +10,7 @@
#import "StartZWPIViewCell.h"
#import "StartKTXZPGView.h"
#import "BaseViewController.h"
#define StartZWPICellHeight UISCREEN_HEIGHT-KMagrinTop-TabHeight-180
@interface StartZWPIView ()<JhtBannerScrollViewDelegate, JhtBannerScrollViewDataSource>
@ -122,10 +123,16 @@
-(void)nextAction
{
ExampleCorrectListDataItems *model = self.arrdata[self.bannerView.currentIndex];
BaseViewController *vcbase = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"作文批改-%@",model.title] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.type = 1;
view.isshiyong = YES;
view.modelDetailZWPG = self.arrdata[self.bannerView.currentIndex];
view.modelDetailZWPG = model;
[self.viewController.view addSubview:view];
}

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

@ -82,21 +82,7 @@
[LoadAlterView dismiss];
}
}];
[NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
{
view.arrErrorLocation = responseObject.data;
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
if(loadcount>=3)
{
[LoadAlterView dismiss];
}
}];
[NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
@ -113,6 +99,22 @@
}
}];
///可以不请求
[NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
{
view.arrErrorLocation = responseObject.data;
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
if(loadcount>=3)
{
[LoadAlterView dismiss];
}
}];
}
}

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

@ -15,13 +15,15 @@
#import "XieZuoXiangQingViewController.h"
#import "XieZuoFenXiangAlterView.h"
#import "RoleTreeModel.h"
@interface StartZWPIDetailView ()<UIScrollViewDelegate>
///
@property (nonatomic , strong) UIScrollView *scvback;
///
@property (nonatomic , strong) UILabel *lbfen;
@property (nonatomic , strong) UIImageView *imgvnumber;
///
@property (nonatomic , strong) UIView *viewback;
@ -41,6 +43,9 @@
///
@property (nonatomic , strong) XieZuoFenXiangAlterView *viewshare;
///
@property (nonatomic , strong) NSMutableArray *arrBtnLocation;
@end
@implementation StartZWPIDetailView
@ -65,7 +70,7 @@
[lbfen setText:@""];
[lbfen setTextColor:RGBCOLOR(231, 47, 21)];
[lbfen setTextAlignment:NSTextAlignmentCenter];
[lbfen setFont:[UIFont fontWithName:@"D-DIN-PRO-Bold" size:20]];
[lbfen setFont:[UIFont fontWithName:@"SmileySans-Oblique" size:35]];
[scvback addSubview:lbfen];
[lbfen mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.offset(20);
@ -73,6 +78,17 @@
}];
_lbfen = lbfen;
UIImageView *imgvnumber = [[UIImageView alloc] init];
[imgvnumber setImage:[UIImage imageNamed:@"ic_correct_score_red"]];
[scvback addSubview:imgvnumber];
[imgvnumber mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(lbfen.mas_bottom);
make.centerX.equalTo(lbfen);
make.height.offset(10);
make.width.offset(50);
}];
_imgvnumber = imgvnumber;
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];
@ -230,6 +246,13 @@
{
[dicpush setObject:[Tools isStringnil:self.modelHestory.result.write_correct.ID] forKey:@"id"];
}
else if(self.modelDetailZWPG)
{
[dicpush setObject:[Tools isStringnil:self.modelDetailZWPG.title] forKey:@"title"];
[dicpush setObject:[Tools isStringnil:self.modelDetailZWPG.content] forKey:@"content"];
[dicpush setObject:@"" forKey:@"require"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
}
else
{
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
@ -263,6 +286,19 @@
viewfj.viewshare = self.viewshare;
viewfj.modelResult = self.modelDetailZWPG.result;
viewfj.modelContentItems = self.modelContentItems;
[viewfj setBackTopSelect:^(NSInteger tag) {
for(UIButton *bt in self.arrBtnLocation)
{
if(bt.tag==tag+10000)
{
[bt setBackgroundColor:RGBACOLOR(255, 255, 255, 0.4)];
}
else
{
[bt setBackgroundColor:[UIColor clearColor]];
}
}
}];
_viewfj = viewfj;
}
}
@ -335,7 +371,7 @@
make.width.offset(UISCREEN_WIDTH);
if(viewlast)
{
make.top.equalTo(viewlast.mas_bottom).offset(20);
make.top.equalTo(viewlast.mas_bottom);
}
else
{
@ -353,12 +389,15 @@
}
}];
viewlast = imgvback;
}
[self.scvback mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(viewlast).offset(20);
}];
}
[self drawlocation:375/UISCREEN_WIDTH];
self.viewzh.modelResult = modelDetailZWPG.result;
}
@ -382,7 +421,7 @@
make.width.offset(UISCREEN_WIDTH);
if(viewlast)
{
make.top.equalTo(viewlast.mas_bottom).offset(20);
make.top.equalTo(viewlast.mas_bottom);
}
else
{
@ -407,10 +446,17 @@
self.lbfen.text = [Tools isStringnilkong:modelHestory.result.write_correct_score.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
[self.scvback bringSubviewToFront:self.imgvnumber];
if(self.lbfen.text.intValue<1)
{
[self.imgvnumber setHidden:YES];
}
self.viewzh.modelHestoryResult = self.modelHestory.result;
self.modelContentItems = self.modelHestory.result.write_correct;
}
@ -431,7 +477,7 @@
make.width.offset(UISCREEN_WIDTH);
if(viewlast)
{
make.top.equalTo(viewlast.mas_bottom).offset(20);
make.top.equalTo(viewlast.mas_bottom);
}
else
{
@ -462,6 +508,11 @@
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];
[self.scvback bringSubviewToFront:self.imgvnumber];
if(self.lbfen.text.intValue<1)
{
[self.imgvnumber setHidden:YES];
}
});
}
@ -500,5 +551,62 @@
}
return _viewshare;
}
///绘制点击位置
-(void)drawlocation:(float)bilv
{
self.arrBtnLocation = [NSMutableArray new];
for(int i = 0 ; i < self.modelDetailZWPG.result.split_review.count;i++)
{
TextbookInfoModelDataResultSplit *modelsplit = self.modelDetailZWPG.result.split_review[i];
///57,104-353,122
for(NSString *str in modelsplit.position)
{
NSArray *arrlocation = [str componentsSeparatedByString:@"-"];
if(arrlocation.count==2)
{
NSArray *arrlefttop = [arrlocation[0] componentsSeparatedByString:@","];
NSArray *arrrightbottom = [arrlocation[1] componentsSeparatedByString:@","];
if(arrlefttop.count==2&&arrrightbottom.count==2)
{
UIButton *btlocation = [[UIButton alloc] init];
[btlocation setBackgroundColor:[UIColor clearColor]];
[self.scvback addSubview:btlocation];
[btlocation mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset([arrlefttop[0] floatValue]/bilv);
make.top.offset([arrlefttop[1] floatValue]/bilv);
make.width.offset(([arrrightbottom[0] floatValue]-[arrlefttop[0] floatValue])/bilv);
make.height.offset(([arrrightbottom[1] floatValue]-[arrlefttop[1] floatValue])/bilv);
}];
[btlocation setTag:10000+i];
[btlocation addTarget:self action:@selector(locationAction:) forControlEvents:UIControlEventTouchUpInside];
[self.arrBtnLocation addObject:btlocation];
}
}
}
}
}
-(void)locationAction:(UIButton *)sender
{
for(UIButton *bt in self.arrBtnLocation)
{
if(bt.tag==sender.tag)
{
[bt setBackgroundColor:RGBACOLOR(255, 255, 255, 0.4)];
}
else
{
[bt setBackgroundColor:[UIColor clearColor]];
}
}
[self.viewtop setSelecttag:1];
[self showVC:1];
[self.scvbackinfo setContentOffset:CGPointMake(UISCREEN_WIDTH, 0)];
[self.viewfj setShowRow:(int)sender.tag-10000];
}
@end

7
ProductApp/ProductApp/ProductMain/引导/拍照写作/view/StartPZXZView.m
View File

@ -9,7 +9,7 @@
#import "StartPZXZPageView.h"
#import <CoreMotion/CoreMotion.h>
#import "StartPZXZDetailViewController.h"
#import "BaseViewController.h"
@interface StartPZXZView ()<UIScrollViewDelegate>
///
@ -212,6 +212,11 @@
make.height.equalTo(self.scvback);
}];
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]]];
[UIView animateWithDuration:1 delay:0.0 options:UIViewAnimationOptionCurveEaseOut animations:^{
imgvback.alpha = 0.0; // 将视图的透明度逐渐调整为0.0，即透明

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

@ -448,6 +448,8 @@
model.isaddEnd = NO;
self.modelSelect = model;
[UserInfoModel shijianShangBao:0 key:@"client.write.change.paragraph" value:@"重写段落" extra:model.value];
[self getDuanLuo:model.value];
}
-(void)bottomAction:(UIButton *)sender
@ -460,6 +462,21 @@
switch (sender.tag) {
case 0:
{
NSString *strscene = @"";
///10改写作文 11拍题成文 12 拍照续写
if(self.type == 10)
{
strscene = @"pic_rewrite";
}
else if(self.type == 11)
{
strscene = @"pic_question";
}
else if(self.type == 12)
{
strscene = @"pic_with_front";
}
[UserInfoModel shijianShangBao:0 key:@"client.write.rewrite.text" value:strscene extra:@""];
[self getdata];
}
break;
@ -501,6 +518,8 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = [arrcontent componentsJoinedByString:@"\n"];
[HXHud showMessage:@"复制成功" afterDelayType:0];
[UserInfoModel shijianShangBao:0 key:@"client.write.copy.text" value:@"拍照写作" extra:[arrcontent componentsJoinedByString:@"\n"]];
}];
}
else
@ -526,6 +545,9 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = [Tools isStringnilkong:self.modelHestory.result.content];
[HXHud showMessage:@"复制成功" afterDelayType:0];
[UserInfoModel shijianShangBao:0 key:@"client.write.copy.text" value:@"拍照写作" extra:self.modelHestory.result.content];
}
////

3
ProductApp/ProductApp/ProductMain/引导/支付页/StartPayViewController.m
View File

@ -73,6 +73,9 @@
}
}];
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.member.recharge" value:self.source extra:@""];
}

2
ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayGoodsView.h
View File

@ -18,6 +18,8 @@ typedef void(^StartPayGoodsViewSelectGoods)(OrderGoodsModelData *model);
@property (nonatomic , strong) StartPayGoodsViewSelectGoods backSelectGoods;
///
@property (nonatomic , strong) PayPublicView *viewpay ;
///
@property (nonatomic , strong) NSString *source;
-(void)removeTime;
@end

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

@ -192,6 +192,8 @@
self.modelSelect = model;
self.backSelectGoods(self.modelSelect);
[self.collect reloadData];
[UserInfoModel shijianShangBao:0 key:@"client.goods.select" value:[NSString stringWithFormat:@"%@:%@",self.source,self.modelSelect.goods_name] extra:[self.modelSelect yy_modelToJSONString]];
}
-(void)removeTime
{

37
ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayView.m
View File

@ -16,7 +16,7 @@
#import "NomoVerbAlterView.h"
#import "PayManager.h"
#import "VistaInAppPurchaseManager.h"
#import "BaseViewController.h"
@interface StartPayView ()<PayManagerDelegate>
@property (nonatomic , strong) UIButton *btdel;
@ -393,6 +393,11 @@
}
}
-(void)setSource:(NSString *)source
{
_source = source;
self.viewgoods.source = source;
}
-(void)removeTimer
{
@ -402,6 +407,9 @@
{
[self.viewgoods removeTime];
BaseViewController *basevc = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.pay.skip" value:@"back" extra:[basevc getTingLiuShiJian]];
if(self.ptype==0)
{
TabBarController *vc = [TabBarController new];
@ -417,6 +425,13 @@
-(void)payAction
{
NSString *strvalue = [self getpaytype];
NSDictionary *dic = @{@"id":[Tools isStringnil:self.modelSelect.goods_id],
@"name":[Tools isStringnil:self.modelSelect.goods_name],
@"price":[Tools isStringnil:self.modelSelect.price],
@"source":[Tools isStringnil:self.source]};
[UserInfoModel shijianShangBao:0 key:@"client.pay.pay" value:strvalue extra:[dic yy_modelToJSONString]];
///需要判断是否需要登录
[UserInfoModel pushLoinVC:self.viewController ispush:YES];
@ -491,6 +506,24 @@
return strvalue;
}
-(void)getdataUserInfo
{
[LoadAlterView show];
[PublicNetWorkManager requestUserData:self Callback:^(BOOL state, UserModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
[UserInfoModel setIdentityType:responseObject.data.identityType];
[UserInfoModel shareModel].isAllLevel = responseObject.data.isAllLevel;
[UserInfoModel shareModel].user_stage = responseObject.data.user_stage;
[UserInfoModel setTemp:responseObject.data.temp];
[UserInfoModel setUserid:responseObject.data.user_id];
[UserInfoModel shareModel].vip = responseObject.data.vip;
}
[self.viewController.navigationController popViewControllerAnimated:YES];
}];
}
#pragma mark - payManager
#pragma mark - Apple支付
///所有商品价格信息
@ -517,7 +550,7 @@
NSString *strtempcence = self.source;
[UserInfoModel shijianShangBao:0 key:@"client.pay.success" value:[NSString stringWithFormat:@"%@:%@",strvalue,strtempcence] extra:self.modelSelect.goods_id];
[self.viewController.navigationController popViewControllerAnimated:YES];
[self getdataUserInfo];
}
-(void)payCancle
{

4
ProductApp/ProductApp/ProductMain/引导/智能PPT/view/StartZNPPTView.m
View File

@ -271,6 +271,10 @@
{
[LoadAlterView show];
ExamplePptModelDataItems *model = self.arrdata[self.bannerView.currentIndex];
BaseViewController *vcbase = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"智能PPT-%@",model.name] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
[NetWorkManager requestExamplePptDetailData:self ID:model.ID Callback:^(BOOL state, ExamplePptDetailModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)

1
ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangSonTableViewCell.h
View File

@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface StartZNPPTDaGangSonTableViewCell : UITableViewCell
@property (nonatomic , strong) ExamplePptDetailModelDataResultOutlineChaptersItem *model;
@property (nonatomic , assign) BOOL isyindao;
@end
NS_ASSUME_NONNULL_END

14
ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangSonTableViewCell.m
View File

@ -12,7 +12,10 @@
@property (nonatomic , strong) UITextField *fieldname;
///
@property (nonatomic , strong) UIButton *btedit;
///
@property (nonatomic , strong) UIImageView *btpx;
///
@property (nonatomic , strong) UIView *viewpx;
@end
@implementation StartZNPPTDaGangSonTableViewCell
@ -72,6 +75,7 @@
make.height.offset(30);
make.width.offset(35);
}];
_viewpx = viewpx;
UIImageView *btpx = [[UIImageView alloc] init];
btpx.image = [UIImage imageNamed:@"yd_dg_px"];
@ -83,6 +87,7 @@
make.width.offset(20);
}];
btpx.tag=-1;
_btpx = btpx;
UIButton *btedit = [[UIButton alloc] init];
[btedit setImage:[UIImage imageNamed:@"yd_dg_edit"] forState:UIControlStateNormal];
@ -103,6 +108,13 @@
_model = model;
[self.fieldname setUserInteractionEnabled:NO];
self.fieldname.text = model.chapterTitle;
if(self.isyindao)
{
[self.viewpx setHidden:YES];
[self.btedit setHidden:YES];
}
}
-(void)editFieldAction
{

1
ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.h
View File

@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
///0上面 1下面 2全部
@property (nonatomic , assign) NSInteger typeline;
@property (nonatomic , assign) NSInteger irow;
@property (nonatomic , assign) BOOL isyindao;
///
@property (nonatomic , strong) ExamplePptDetailModelDataResultOutlineChapters *model;
@end

18
ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/cell/StartZNPPTDaGangTableViewCell.m
View File

@ -23,6 +23,8 @@
///
@property (nonatomic , strong) UIImageView *btpx;
///
@property (nonatomic , strong) UIView *viewpx;
///
@property (nonatomic , strong) UIButton *btedit;
///
@property (nonatomic , strong) UITableView *tableView ;
@ -105,6 +107,7 @@
make.height.offset(30);
make.width.offset(35);
}];
_viewpx = viewpx;
UIImageView *btpx = [[UIImageView alloc] init];
btpx.image = [UIImage imageNamed:@"yd_dg_px"];
@ -223,9 +226,21 @@
[self.arrData addObjectsFromArray:model.chapterContents];
self.tableView.dataArray = self.arrData;
}
if(self.isyindao)
{
[self.viewpx setHidden:YES];
[self.btedit setHidden:YES];
}
[self.tableView reloadData];
}
-(void)setIsyindao:(BOOL)isyindao
{
_isyindao = isyindao;
if(isyindao)
{
[self.tableView setUserInteractionEnabled:NO];
}
}
- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
{
@ -247,6 +262,7 @@
[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
[cell setBackgroundColor:[UIColor clearColor]];
}
cell.isyindao = self.isyindao;
cell.model = self.arrData[indexPath.row];
return cell;

12
ProductApp/ProductApp/ProductMain/引导/智能PPT/大纲/view/StartZNPPTDaGangView.m
View File

@ -202,7 +202,15 @@
make.height.offset(fheight+10);
}];
}
-(void)setIsyindao:(BOOL)isyindao
{
_isyindao = isyindao;
if(isyindao)
{
[self.tableView setUserInteractionEnabled:NO];
[self.tableViewinfo setUserInteractionEnabled:NO];
}
}
-(void)nextAction
{
[StartZNPPTDaGangAlterView show];
@ -320,7 +328,7 @@
[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
[cell setBackgroundColor:[UIColor clearColor]];
}
cell.isyindao = self.isyindao;
if(tableView.tag==1)
{///内容
[self setCellType:indexPath arrvalue:self.arrContent cell:cell];

6
ProductApp/ProductApp/ProductMain/引导/智能写作/view/StartZNXZView.m
View File

@ -9,6 +9,8 @@
#import "StartZNXZKeysViewController.h"
#import "ExampleWriteList.h"
#import "BaseViewController.h"
@interface StartZNXZView ()
///
@property (nonatomic , strong) UIButton *btselect;
@ -254,6 +256,10 @@
[HXHud showMessage:@"请选择标题" afterDelayType:0];
return;
}
BaseViewController *vcbase = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"智能写作-标题%@",self.strtitle] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartZNXZKeysViewController *vc = [StartZNXZKeysViewController new];
vc.strpid = self.strpid;
vc.strtitle = self.strtitle;

8
ProductApp/ProductApp/ProductMain/引导/智能写作/关键词/view/StartZNXZKeysView.m
View File

@ -374,6 +374,8 @@
}
[self.arrSelect addObject:lbst.text];
[self drawSelectView];
[UserInfoModel shijianShangBao:0 key:@"client.guide.write.require.select" value:lbst.text extra:@""];
}
else
{
@ -382,6 +384,8 @@
}
-(void)delAction:(UIButton *)sender
{
[UserInfoModel shijianShangBao:0 key:@"client.guide.write.require.remove" value:self.arrShow[sender.tag] extra:@""];
[self.arrSelect removeObjectAtIndex:sender.tag];
[self drawSelectView];
}
@ -401,6 +405,10 @@
[HXHud showMessage:@"请选择写作要求" afterDelayType:0];
return;
}
BaseViewController *vcbase = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"智能写作-标题%@-关键词%@",self.strtitle,[self.arrSelect componentsJoinedByString:@"、"]] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartZNXZSiLuViewController *vc = [StartZNXZSiLuViewController new];
vc.strtitle = self.strtitle;
vc.modelTitle = self.modelTitle;

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

@ -288,6 +288,10 @@ typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
{
[dicpush setObject:[Tools isStringnil:title_id] forKey:@"title_id"];
}
else
{
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.member.recharge" value:@"更换思路" extra:[dicpush yy_modelToJSONString]];
}
[[SSENetWorkManager shareManager] requestTo:[NSString stringWithFormat:@"https://aiw.batiao8.com/api/chat?scene=%@",scenct] dicpush:dicpush config:^(SSEConfigModel * _Nonnull config) {
self.modelConfig = config;
@ -337,7 +341,8 @@ typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# 题材" withString:@""];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 题材" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#题材" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 开头" withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#开头" withString:@"|&&|"];

5
ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKTXZWenZhangView.m
View File

@ -7,7 +7,7 @@
#import "StartKTXZWenZhangView.h"
#import "StartKTXZPGView.h"
#import "BaseViewController.h"
@interface StartKTXZWenZhangView ()<UIScrollViewDelegate>
///
@ -451,6 +451,9 @@
[HXHud showMessage:@"请等待文章写作完成" afterDelayType:0];
return;
}
BaseViewController *vcbase = (BaseViewController *)self.viewController;
[UserInfoModel shijianShangBao:0 key:@"client.guide.next" value:[NSString stringWithFormat:@"课堂写作-%@-按照写作标准批改作文",self.modelDetailYDY.title] extra:[NSString stringWithFormat:@"%@",[vcbase getTingLiuShiJian]]];
StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)];
view.isshiyong = YES;
view.modelDetailYDY = self.modelDetailYDY;

7
ProductApp/ProductApp/ProductMain/引导/课堂写作/view/StartKeTangXieZuoView.m
View File

@ -7,6 +7,7 @@
#import "StartKeTangXieZuoView.h"
#import "StartKTXZWenZhangViewController.h"
#import "BaseViewController.h"
@interface StartKeTangXieZuoView ()<UIScrollViewDelegate>
///
@ -286,6 +287,12 @@
-(void)createAction
{
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]]];
}
StartKTXZWenZhangViewController *vc = [StartKTXZWenZhangViewController new];
vc.strpid = self.strpid;
vc.strtitle = self.strtitle;

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

@ -99,21 +99,6 @@
}];
}
[NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
{
view.arrErrorLocation = responseObject.data;
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
if(loadcount>=3)
{
[LoadAlterView dismiss];
}
}];
[NetWorkManager requestCorrectWrite_correctData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteCorrectModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
@ -130,6 +115,22 @@
}
}];
///可以不请求
[NetWorkManager requestCorrectWrite_correct_errorData:self.view ID:self.strID Callback:^(BOOL state, CorrectWriteErrorModel *responseObject, NSString * _Nullable describle) {
loadcount++;
if(state)
{
view.arrErrorLocation = responseObject.data;
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
if(loadcount>=3)
{
[LoadAlterView dismiss];
}
}];
}
}

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

@ -30,6 +30,11 @@
-(void)setArrTitle:(NSArray *)arrTitle
{
if(arrTitle.count==0)return;
for(UIView *view in self.subviews)
{
[view removeFromSuperview];
}
_arrTitle = arrTitle;
self.arrbtn = [NSMutableArray new];

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

@ -15,11 +15,14 @@
#import "XieZuoFenXiangAlterView.h"
#import "XieZuoXiangQingViewController.h"
#import "CorrectWriteErrorModel.h"
@interface StartKTXZPGDetailView ()<UIScrollViewDelegate>
///
@property (nonatomic , strong) UIScrollView *scvback;
///
@property (nonatomic , strong) UILabel *lbfen;
@property (nonatomic , strong) UIImageView *imgvnumber;
///
@property (nonatomic , strong) UIView *viewback;
///
@ -39,6 +42,10 @@
///
@property (nonatomic , strong) XieZuoFenXiangAlterView *viewshare;
///
@property (nonatomic , strong) NSMutableArray *arrBtnLocation;
@end
@implementation StartKTXZPGDetailView
@ -62,7 +69,7 @@
[lbfen setText:@""];
[lbfen setTextColor:RGBCOLOR(231, 47, 21)];
[lbfen setTextAlignment:NSTextAlignmentCenter];
[lbfen setFont:[UIFont fontWithName:@"D-DIN-PRO-Bold" size:20]];
[lbfen setFont:[UIFont fontWithName:@"SmileySans-Oblique" size:35]];
[scvback addSubview:lbfen];
[lbfen mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.offset(20);
@ -70,6 +77,17 @@
}];
_lbfen = lbfen;
UIImageView *imgvnumber = [[UIImageView alloc] init];
[imgvnumber setImage:[UIImage imageNamed:@"ic_correct_score_red"]];
[scvback addSubview:imgvnumber];
[imgvnumber mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(lbfen.mas_bottom);
make.centerX.equalTo(lbfen);
make.height.offset(10);
make.width.offset(50);
}];
_imgvnumber = imgvnumber;
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];
@ -239,6 +257,9 @@
{
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setObject:[Tools isStringnil:self.strID] forKey:@"id"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.start.write" value:@"一键成文" extra:[dicpush yy_modelToJSONString]];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.dicpush = dicpush;
vc.scene = @"rewrite_correct";
@ -265,6 +286,19 @@
viewfj.viewshare = self.viewshare;
viewfj.modelResult = self.modelDetailYDY.result;
viewfj.modelContentItems = self.modelContentItems;
[viewfj setBackTopSelect:^(NSInteger tag) {
for(UIButton *bt in self.arrBtnLocation)
{
if(bt.tag==tag+10000)
{
[bt setBackgroundColor:RGBACOLOR(255, 255, 255, 0.4)];
}
else
{
[bt setBackgroundColor:[UIColor clearColor]];
}
}
}];
_viewfj = viewfj;
}
}
@ -332,7 +366,7 @@
make.width.offset(UISCREEN_WIDTH);
if(viewlast)
{
make.top.equalTo(viewlast.mas_bottom).offset(20);
make.top.equalTo(viewlast.mas_bottom);
}
else
{
@ -358,8 +392,16 @@
}
self.lbfen.text = [Tools isStringnilkong:modelDetailYDY.result.total_score];
[self.scvback bringSubviewToFront:self.lbfen];
[self.scvback bringSubviewToFront:self.imgvnumber];
if(self.lbfen.text.intValue<1)
{
[self.imgvnumber setHidden:YES];
}
//// 综合评价 分句点评 写作思路
self.viewzh.modelResult = modelDetailYDY.result;
[self drawlocation:375/UISCREEN_WIDTH];
}
-(void)setArrXZImages:(NSArray *)arrXZImages
{
@ -379,7 +421,7 @@
make.width.offset(UISCREEN_WIDTH);
if(viewlast)
{
make.top.equalTo(viewlast.mas_bottom).offset(20);
make.top.equalTo(viewlast.mas_bottom);
}
else
{
@ -410,6 +452,11 @@
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];
[self.scvback bringSubviewToFront:self.imgvnumber];
if(self.lbfen.text.intValue<1)
{
[self.imgvnumber setHidden:YES];
}
});
}
-(void)haibaoAction:(NSNotification *)notifi
@ -427,7 +474,6 @@
}
-(XieZuoFenXiangAlterView *)viewshare
{
if(!_viewshare)
@ -438,4 +484,61 @@
return _viewshare;
}
///绘制点击位置
-(void)drawlocation:(float)bilv
{
self.arrBtnLocation = [NSMutableArray new];
for(int i = 0 ; i < self.modelDetailYDY.result.split_review.count;i++)
{
TextbookInfoModelDataResultSplit *modelsplit = self.modelDetailYDY.result.split_review[i];
///57,104-353,122
for(NSString *str in modelsplit.position)
{
NSArray *arrlocation = [str componentsSeparatedByString:@"-"];
if(arrlocation.count==2)
{
NSArray *arrlefttop = [arrlocation[0] componentsSeparatedByString:@","];
NSArray *arrrightbottom = [arrlocation[1] componentsSeparatedByString:@","];
if(arrlefttop.count==2&&arrrightbottom.count==2)
{
UIButton *btlocation = [[UIButton alloc] init];
[btlocation setBackgroundColor:[UIColor clearColor]];
[self.scvback addSubview:btlocation];
[btlocation mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset([arrlefttop[0] floatValue]/bilv);
make.top.offset([arrlefttop[1] floatValue]/bilv);
make.width.offset(([arrrightbottom[0] floatValue]-[arrlefttop[0] floatValue])/bilv);
make.height.offset(([arrrightbottom[1] floatValue]-[arrlefttop[1] floatValue])/bilv);
}];
[btlocation setTag:10000+i];
[btlocation addTarget:self action:@selector(locationAction:) forControlEvents:UIControlEventTouchUpInside];
[self.arrBtnLocation addObject:btlocation];
}
}
}
}
}
-(void)locationAction:(UIButton *)sender
{
for(UIButton *bt in self.arrBtnLocation)
{
if(bt.tag==sender.tag)
{
[bt setBackgroundColor:RGBACOLOR(255, 255, 255, 0.4)];
}
else
{
[bt setBackgroundColor:[UIColor clearColor]];
}
}
[self.viewtop setSelecttag:1];
[self showVC:1];
[self.scvbackinfo setContentOffset:CGPointMake(UISCREEN_WIDTH, 0)];
[self.viewfj setShowRow:(int)sender.tag-10000];
}
@end

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

@ -447,7 +447,9 @@ typedef void(^backenddraw)(void);
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# 开头" withString:@""];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 开头" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"＃ 开头" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#开头" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 中间" withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#中间" withString:@"|&&|"];

3
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/分句点评/StartKTXZPGDetailFJItemView.m
View File

@ -262,7 +262,8 @@
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# 鼓励的评价" withString:@""];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 鼓励的评价" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#鼓励的评价" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 优秀的建议" withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#优秀的建议" withString:@"|&&|"];

5
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/分句点评/StartKTXZPGDetailFJView.h
View File

@ -11,7 +11,7 @@
#import "CorrectWriteCorrectModel.h"
NS_ASSUME_NONNULL_BEGIN
typedef void(^StartKTXZPGDetailFJViewTopSelect)(NSInteger tag);
@interface StartKTXZPGDetailFJView : UIView
///
@property (nonatomic , strong) XieZuoFenXiangAlterView *viewshare;
@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
///句子数据
@property (nonatomic , strong) CorrectWriteCorrectModelData *modelContentItems;
///
@property (nonatomic , strong) StartKTXZPGDetailFJViewTopSelect backTopSelect;
///显示第几句点评
-(void)setShowRow:(int)row;

10
ProductApp/ProductApp/ProductMain/引导/课堂写作/批改信息/view/分句点评/StartKTXZPGDetailFJView.m
View File

@ -138,6 +138,16 @@
}
self.arrViews[sender.tag] = viewone;
}
if(self.modelResult)
{
[UserInfoModel shijianShangBao:0 key:@"client.guide.correct.evaluate.sentence" value:@"引导页切换分句点评" extra:[self.modelResult.split_review[sender.tag] yy_modelToJSONString]];
}
if(self.backTopSelect)
{
self.backTopSelect(sender.tag);
}
[self.scvback setContentOffset:CGPointMake(UISCREEN_WIDTH*sender.tag, 0)];
}
-(void)setModelResult:(TextbookInfoModelDataResult *)modelResult

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

@ -379,8 +379,8 @@
[self drawTopView:self.viewtop];
NSString *value = modelHestoryResult.write_correct_evaluate;
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# 综合评价" withString:@""];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 综合评价" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#综合评价" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 作文优点" withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#作文优点" withString:@"|&&|"];

3
ProductApp/ProductApp/ProductMain/我的/WoDeViewController.m
View File

@ -49,7 +49,10 @@
[UserInfoModel shareModel].user_stage = responseObject.data.user_stage;
[UserInfoModel setTemp:responseObject.data.temp];
[UserInfoModel setUserid:responseObject.data.user_id];
[UserInfoModel shareModel].vip = responseObject.data.vip;
self.viewback.modelDetail = responseObject.data;
[self tanLoginChuan];
}
}];
}

5
ProductApp/ProductApp/ProductMain/我的/view/WoDeView.m
View File

@ -180,7 +180,7 @@
{
_modelDetail = modelDetail;
self.viewinfo.modelDetail = modelDetail;
[self.btHYkt setHidden:NO];
if(modelDetail.vip.intValue == 1 && [Tools isStringnil:self.modelDetail.vip_expire].length>0)
{
[self.lbHYname setText:@"加入会员解锁全部智能功能"];
@ -205,7 +205,6 @@
{
[self.lbHYname setText:@"加入会员解锁全部智能功能"];
self.lbHYinfo.text = @"专属八大特权";
[self.btHYkt setHidden:NO];
[self.btHYkt setTitle:@"立即开通" forState:UIControlStateNormal];
}
@ -296,6 +295,7 @@
{
ShouYeLiShiJiLuViewController *vc = [ShouYeLiShiJiLuViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.write.history" value:@"个人中心" extra:@""];
}
else if([self.arrdata[indexPath.row] isEqualToString:@"在线客服"])
{
@ -322,6 +322,7 @@
-(void)getKeFuData
{
[UserInfoModel shijianShangBao:0 key:@"client.contact.service" value:@"" extra:@""];
[LoadAlterView show];
[PublicNetWorkManager requestWeixinServiceData:self Callback:^(BOOL state, WeixinServiceModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];

2
ProductApp/ProductApp/ProductMain/我的/系统设置/SetViewController.m
View File

@ -59,7 +59,7 @@
}];
_tableView = tableView;
self.arrdata = @[@"版本更新",@"账号绑定",@"账户管理",@"关于我们",@"注销账户"];
self.arrdata = @[@"权限管理",@"账号绑定",@"账户管理",@"关于我们",@"注销账户"];
UIButton *btdenglu = [[UIButton alloc] init];
[btdenglu setTitle:@"退出登录" forState:UIControlStateNormal];

2
ProductApp/ProductApp/ProductMain/我的/系统设置/关于我们/GunYuController.m
View File

@ -76,7 +76,7 @@
}];
self.arrdata = @[@"版权公司",@"版本号",@"算法备案公示"];
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.about.us" value:@"" extra:@""];
}
-(void)longAction

2
ProductApp/ProductApp/ProductMain/我的/系统设置/意见反馈/view/YiJianFanKuiView.m
View File

@ -292,6 +292,8 @@
[HXHud showMessage:@"请输入反馈意见" afterDelayType:1];
return;
}
[UserInfoModel shijianShangBao:0 key:@"client.feedback" value:@"" extra:@""];
[HXLoadingHUD showWithStatus:@"" maskType:0];
[PublicNetWorkManager requestUserFeedbackData:self type:self.btitemSelect.titleLabel.text contact:self.fieldshoujihao.text images:self.imageIDArray content:self.textview.text Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[HXLoadingHUD dismiss];

4
ProductApp/ProductApp/ProductMain/我的/系统设置/账号绑定/ZhangHaoBangDingViewController.m
View File

@ -322,7 +322,7 @@
NSDictionary *dic=@{@"code":[Tools isStringnil:resp.code],
@"code_type":@""};
[UserInfoModel shijianShangBao:0 key:@"client.account.bind" value:@"weixin" extra:@""];
[LoadAlterView show];
[PublicNetWorkManager requestUserLoginData:self.view login_type:@"weixin" phone:@{} weixin:dic apple:@{} device:@{} onekey:@{} bind:[NSNumber numberWithBool:YES] unbind:[NSNumber numberWithBool:NO] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
if(state)
@ -384,6 +384,7 @@
-(void)pushJieBang:(NSString *)login_type
{
[UserInfoModel shijianShangBao:0 key:@"client.account.unbind" value:@"login_type" extra:@""];
[LoadAlterView show];
[PublicNetWorkManager requestUserLoginData:self.view login_type:login_type phone:@{} weixin:@{} apple:@{} device:@{} onekey:@{} bind:[NSNumber numberWithBool:NO] unbind:[NSNumber numberWithBool:YES] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
if(state)
@ -405,6 +406,7 @@
#pragma mark - apple
-(void)loginPushApple:(NSDictionary *)dic login_type:(NSString *)login_type
{
[UserInfoModel shijianShangBao:0 key:@"client.account.bind" value:@"apple" extra:@""];
[PublicNetWorkManager requestUserLoginData:self.view login_type:login_type phone:@{} weixin:@{} apple:dic device:@{} onekey:@{} bind:[NSNumber numberWithBool:YES] unbind:[NSNumber numberWithBool:NO] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)

3
ProductApp/ProductApp/ProductMain/范文/FanWenViewController.m
View File

@ -27,6 +27,9 @@
-(void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[self tanLoginChuan];
}
- (void)viewDidLoad {
[super viewDidLoad];

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

@ -262,6 +262,10 @@
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
pasteboard.string = [Tools isStringnil:self.modelDetail.content];
[HXHud showMessage:@"复制成功" afterDelayType:0];
[UserInfoModel shijianShangBao:0 key:@"client.write.copy.text" value:@"范文" extra:self.modelDetail.content];
}
}];
}

29
ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m
View File

@ -21,6 +21,7 @@
#import "PublicNetWorkManager.h"
#import "NetWorkManager.h"
#import "FanWenDetailViewController.h"
#import "UpdataAlterView.h"
@interface ShouYeViewController ()<UITableViewDelegate,UITableViewDataSource>
///
@ -57,6 +58,7 @@
[self getFanWen];
}
[self tanLoginChuan];
}
- (void)viewDidLoad {
[super viewDidLoad];
@ -87,6 +89,10 @@
[self getUserData];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
NSDictionary *dic = [[UserInfoModel shareModel].config objectForKey:@"client.version.upgrade"];
[self showUpDataAltre:dic];
});
}
-(void)drawTopView
@ -134,6 +140,7 @@
{///历史记录
ShouYeLiShiJiLuViewController *vc = [ShouYeLiShiJiLuViewController new];
[self.navigationController pushViewController:vc animated:YES];
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.write.history" value:@"首页" extra:@""];
}
else
{///身份选择
@ -150,7 +157,17 @@
}
}
}
///更新
-(void)showUpDataAltre:(NSDictionary *)dic
{
NSString *strfw = [[dic objectForKey:@"version"] stringByReplacingOccurrencesOfString:@"." withString:@""];
NSString *strbd = [[Tools applicationVersion] stringByReplacingOccurrencesOfString:@"." withString:@""];
if(strfw.intValue>strbd.intValue)
{
BOOL isforce = [[dic objectForKey:@"force"] boolValue];
[UpdataAlterView showName:[Tools isStringnil:[dic objectForKey:@"description"]] strversion:[NSString stringWithFormat:@"V%@",[dic objectForKey:@"version"]] isforce:isforce];
}
}
#pragma mark - UITableView
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
@ -187,7 +204,7 @@
else
{
int shenfen = [UserInfoModel shareModel].identityType.intValue;
if (shenfen==1||shenfen==2)
if (shenfen==2)
{
static NSString *strcell = @"ShouYeLSZWPGTableViewCell";
ShouYeLSZWPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
@ -233,7 +250,7 @@
else
{
int shenfen = [UserInfoModel shareModel].identityType.intValue;
if (shenfen==1||shenfen==2)
if (shenfen==2)
{
static NSString *strcell = @"ShouYeLSKTPGTableViewCell";
ShouYeLSKTPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell];
@ -371,9 +388,9 @@
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"高分作文"];
[lbname setTextColor:RGBCOLOR(51, 51, 51)];
[lbname setTextColor:RGBCOLOR(26, 26, 26)];
[lbname setTextAlignment:NSTextAlignmentLeft];
[lbname setFont:[UIFont systemFontOfSize:14]];
[lbname setFont:[UIFont boldSystemFontOfSize:16]];
[viewback addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(14);
@ -440,7 +457,7 @@
[UserInfoModel shareModel].user_stage = responseObject.data.user_stage;
[UserInfoModel setTemp:responseObject.data.temp];
[UserInfoModel setUserid:responseObject.data.user_id];
[UserInfoModel shareModel].vip = responseObject.data.vip;
[self updateBtShow];
[self getFanWen];
}

9
ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m
View File

@ -8,6 +8,7 @@
#import "ShouYeLSKTPGTableViewCell.h"
#import "ZhiNengXieZuoViewController.h"
#import "CamreViewController.h"
#import "KeTangXieZuoViewController.h"
@interface ShouYeLSKTPGTableViewCell ()
@ -42,7 +43,7 @@
make.top.right.equalTo(viewback);
make.height.offset(75);
}];
[self drawSmillView:viewkt title:@"智能写作" info:@"优秀作家" img:@"home_ls_znxz" tag:1];
[self drawSmillView:viewkt title:@"写作生成" info:@"优秀作家" img:@"home_ls_znxz" tag:1];
UIView *viewpg = [[UIView alloc] init];
@ -145,8 +146,10 @@
switch (sender.tag) {
case 0:
{
CamreViewController *vc = [CamreViewController new];
vc.type = 3;
// CamreViewController *vc = [CamreViewController new];
// vc.type = 3;
// [self.viewController.navigationController pushViewController:vc animated:YES];
KeTangXieZuoViewController *vc = [KeTangXieZuoViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;

1
ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m
View File

@ -31,6 +31,7 @@
[viewback mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
[viewback setUserInteractionEnabled:YES];
[viewback.layer setMasksToBounds:YES];
[viewback.layer setCornerRadius:8];
[viewback setImage:[UIImage imageNamed:@"home_ls_zwpg"]];

26
ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/FenXiangHaiBaoView.m
View File

@ -113,6 +113,32 @@
}
}
UILabel *lbfen = [[UILabel alloc] init];
[lbfen setText:[Tools isStringnil:self.modelPF.total_score]];
[lbfen setTextColor:RGBCOLOR(231, 47, 21)];
[lbfen setTextAlignment:NSTextAlignmentCenter];
[lbfen setFont:[UIFont fontWithName:@"SmileySans-Oblique" size:35]];
[self.scvback addSubview:lbfen];
[lbfen mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.offset(20);
make.left.offset(UISCREEN_WIDTH-50);
}];
UIImageView *imgvnumber = [[UIImageView alloc] init];
[imgvnumber setImage:[UIImage imageNamed:@"ic_correct_score_red"]];
[self.scvback addSubview:imgvnumber];
[imgvnumber mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(lbfen.mas_bottom);
make.centerX.equalTo(lbfen);
make.height.offset(10);
make.width.offset(50);
}];
if(lbfen.text.intValue<1)
{
[imgvnumber setHidden:YES];
}
UIView *viewline = [[UIView alloc] init];
[self.scvback addSubview:viewline];
[viewline mas_makeConstraints:^(MASConstraintMaker *make) {

1
ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.m
View File

@ -156,6 +156,7 @@
}
else
{
[UserInfoModel shijianShangBao:0 key:@"client.check.stage" value:@"切换领域" extra:@""];
[self updataUserInfo];
}
});

5
ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.m
View File

@ -142,7 +142,7 @@
-(void)setArrdata:(NSArray *)arrdata
{
_arrdata = arrdata;
self.viewnj.type = [[UserInfoModel shareModel].identityType integerValue];
self.viewnj.arrdata = self.arrdata;
}
///切换领域
@ -203,6 +203,9 @@
[dicpush setObject:[NSNumber numberWithBool:isall] forKey:@"isAllLevel"];
[dicpush setObject:[NSNumber numberWithInt:type] forKey:@"identityType"];
[UserInfoModel shijianShangBao:0 key:@"client.check.stage" value:@"切换学段" extra:[dicpush yy_modelToJSONString]];
[PublicNetWorkManager requestUserPutData:self body:dicpush Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
if(state)
{

2
ProductApp/ProductApp/ProductMain/首页/智能写作/ZhiNengXieZuoViewController.m
View File

@ -21,7 +21,7 @@
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:animated];
[self showNaviGationView:YES];
[self.navigationView setTitle:@"智能写作" titleColor:RGBCOLOR(60, 60, 60)];
[self.navigationView setTitle:@"写作生成" titleColor:RGBCOLOR(60, 60, 60)];
[self.navigationView setBackgroundColor:[UIColor clearColor]];
}
- (void)viewDidLoad {

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

@ -227,6 +227,8 @@
[view setBackValue:^(NSString * _Nonnull name) {
UITextField *field = self.arrfield[2];
field.text = name;
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.write.check.composition.technique" value:name extra:@""];
}];
}
@ -239,6 +241,8 @@
self.btselect = sender;
[self.btselect setSelected:YES];
[self.btselect setBackgroundColor:RGBCOLOR(108, 119, 246)];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.paragraph.type.check" value:sender.titleLabel.text extra:@""];
}
///提交
-(void)sendAction

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

@ -181,6 +181,8 @@
[view setBackValue:^(NSString * _Nonnull name) {
UITextField *field = self.arrfield[2];
field.text = name;
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.write.check.composition.type" value:name extra:@""];
}];
}
else
@ -190,6 +192,9 @@
[view setBackValue:^(NSString * _Nonnull name) {
UITextField *field = self.arrfield[3];
field.text = name;
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.write.check.words.num" value:name extra:@""];
}];
}
}
@ -234,6 +239,8 @@
[dicpush setObject:[self getFieldValue:3] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.start.write" value:@"一键成文" extra:[dicpush yy_modelToJSONString]];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dic_type = [self getFieldValue:2];

3
ProductApp/ProductApp/ProductMain/首页/智能写作/view/ZhiNengXieZuoTopView.m
View File

@ -72,6 +72,9 @@
[self.btselect.titleLabel setFont:[UIFont boldSystemFontOfSize:20]];
self.imgvback.centerX = self.btselect.centerX;
self.backSelect(sender.tag);
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.write.type.check" value:sender.titleLabel.text extra:@""];
}
@end

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

@ -178,6 +178,7 @@
[self mas_makeConstraints:^(MASConstraintMaker *make) {
self.selfBottom = make.bottom.equalTo(self.viewlast).offset(15);
}];
[UserInfoModel shijianShangBao:0 key:@"client.write.expand.method" value:@"展开" extra:@""];
}
else
{
@ -186,7 +187,9 @@
[self mas_makeConstraints:^(MASConstraintMaker *make) {
self.selfBottom = make.bottom.equalTo(self.viewtop);
}];
[UserInfoModel shijianShangBao:0 key:@"client.write.expand.method" value:@"折叠" extra:@""];
}
}
@end

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

@ -280,6 +280,8 @@
[self getDuanLuo:model.value];
[UserInfoModel shijianShangBao:0 key:@"client.write.change.paragraph" value:@"重写段落" extra:model.value];
}
-(void)bottomAction:(UIButton *)sender
{
@ -291,6 +293,7 @@
switch (sender.tag) {
case 0:
{///重写
[UserInfoModel shijianShangBao:0 key:@"client.write.rewrite.text" value:self.scene extra:@""];
[UserInfoModel quanXianJiaoYan:self.viewController scence:[NSString stringWithFormat:@"write_%@",self.strqxjyly] ispush:YES back:^(BOOL value) {
if(value)
{

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

@ -234,6 +234,8 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
[dicpush setObject:[Tools isStringnil:self.dic_require_num] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:[UserInfoModel shareModel].user_stage.name] forKey:@"stage"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.start.write" value:@"一键成文" extra:[dicpush yy_modelToJSONString]];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_with_outline";
vc.dicpush = dicpush;
@ -257,6 +259,15 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
[dicpush setObject:[Tools isStringnil:self.dic_require_num] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:self.dic_stage] forKey:@"stage"];
if([scenct isEqualToString:@"write_outline"])
{
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.member.recharge" value:@"更换思路" extra:[dicpush yy_modelToJSONString]];
}
else
{
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.member.recharge" value:@"梳理思路" extra:[dicpush yy_modelToJSONString]];
}
[[SSENetWorkManager shareManager] requestTo:[NSString stringWithFormat:@"https://aiw.batiao8.com/api/chat?scene=%@",scenct] dicpush:dicpush config:^(SSEConfigModel * _Nonnull config) {
[LoadAlterView dismiss];
self.modelConfig = config;
@ -313,7 +324,8 @@ typedef void(^ChuangZuoSiLuViewDraw)(void);
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# 题材" withString:@""];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 题材" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#题材" withString:@""];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# 开头" withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#开头" withString:@"|&&|"];

5
ProductApp/ProductApp/ProductMain/首页/智能写作/全文写作/换个思路/view/HuanGeSiLuView.m
View File

@ -194,6 +194,8 @@
}
NSString *strtemp = [self.arrselect componentsJoinedByString:@"、"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.method.change.require" value:@"write_change_method" extra:strtemp];
[LoadAlterView show];
[NetWorkManager requestChatCheckData:self content:strtemp Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
@ -324,7 +326,8 @@
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# " withString:@"|&&|"];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# " withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#" withString:@"|&&|"];
NSArray *arrtt = [strshow componentsSeparatedByString:@"|&&|"];
self.arrData = [NSMutableArray new];

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

@ -172,6 +172,10 @@
NSMutableDictionary *dicpush = [NSMutableDictionary new];
[dicpush setDictionary:self.dicpush];
[dicpush setObject:self.strvalue forKey:@"paragraph"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.start.write" value:@"段落写作" extra:[dicpush yy_modelToJSONString]];
DuanLuoXieZuoQWViewController *vc = [DuanLuoXieZuoQWViewController new];
vc.dicpush = dicpush;
[self.viewController.navigationController pushViewController:vc animated:YES];

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

@ -194,7 +194,8 @@
}
else
{
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"# " withString:@"|&&|"];
NSString *strshow = [value stringByReplacingOccurrencesOfString:@"＃" withString:@"#"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"# " withString:@"|&&|"];
strshow = [strshow stringByReplacingOccurrencesOfString:@"#" withString:@"|&&|"];
if([[strshow substringWithRange:NSMakeRange(0, 4)] isEqualToString:@"|&&|"])
{

1
ProductApp/ProductApp/ProductMain/首页/智能写作/段落/续写润色/view/DuanLuoXieZuoQWView.m
View File

@ -219,6 +219,7 @@
self.modelSelect = model;
[self getDuanLuo:model.value];
[UserInfoModel shijianShangBao:0 key:@"client.write.change.paragraph" value:@"重写段落" extra:model.value];
}
-(void)bottomAction:(UIButton *)sender
{

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

@ -424,6 +424,8 @@
[dicpush setObject:[Tools isStringnil:self.modelDetail.word_count] forKey:@"require_num"];
[dicpush setObject:[Tools isStringnil:strtempstate] forKey:@"stage"];
[UserInfoModel shijianShangBao:0 key:@"client.ai.write.start.write" value:@"一键成文" extra:[dicpush yy_modelToJSONString]];
XieZuoXiangQingViewController *vc = [XieZuoXiangQingViewController new];
vc.scene = @"write_one_key";
vc.dicpush = dicpush;