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

2.5.4 

1、职场的会员办理里面的权益需要与学生和老师区分开。
2、上班族名称改为职场。
This commit is contained in:
pengguangjian 2025-03-04 18:13:21 +08:00
parent fe99f95844
commit 1cca27ab72
51 changed files with 818 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ProductApp/Pods/AFNetworking/PrivacyInfo.xcprivacy generated Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>C617.1</string>
</array>
</dict>
</array>
</dict>
</plist>

14
ProductApp/Pods/FMDB/PrivacyInfo.xcprivacy generated Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array/>
</dict>
</plist>

23
ProductApp/Pods/IQKeyboardManager/PrivacyInfo.xcprivacy generated Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>C617.1</string>
</array>
</dict>
</array>
</dict>
</plist>

563
ProductApp/Pods/Pods.xcodeproj/project.pbxproj generated
View File

File diff suppressed because it is too large Load Diff

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

@ -272,6 +272,7 @@
CA8181B02C9EB96000EE7E6E /* StartKTXZPGDetailFJView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8181AF2C9EB96000EE7E6E /* StartKTXZPGDetailFJView.m */; };
CA8181B32C9EB96F00EE7E6E /* StartKTXZPGDetailXZView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8181B22C9EB96F00EE7E6E /* StartKTXZPGDetailXZView.m */; };
CA8181B62C9ECB5800EE7E6E /* StartKTXZPGDetailFJItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8181B52C9ECB5800EE7E6E /* StartKTXZPGDetailFJItemView.m */; };
CA820E832D755AF0007DF2D8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = CA820E822D755AF0007DF2D8 /* PrivacyInfo.xcprivacy */; };
CA8EE5172CC88B22009D73E3 /* ExamplePptModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8EE5162CC88B22009D73E3 /* ExamplePptModel.m */; };
CA8EE51A2CC89319009D73E3 /* ExamplePptDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8EE5192CC89319009D73E3 /* ExamplePptDetailModel.m */; };
CA8EE51D2CC8C835009D73E3 /* TongYiXieYiAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA8EE51C2CC8C835009D73E3 /* TongYiXieYiAlterView.m */; };
@ -1070,6 +1071,7 @@
CA8181B22C9EB96F00EE7E6E /* StartKTXZPGDetailXZView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartKTXZPGDetailXZView.m; sourceTree = "<group>"; };
CA8181B42C9ECB5800EE7E6E /* StartKTXZPGDetailFJItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartKTXZPGDetailFJItemView.h; sourceTree = "<group>"; };
CA8181B52C9ECB5800EE7E6E /* StartKTXZPGDetailFJItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartKTXZPGDetailFJItemView.m; sourceTree = "<group>"; };
CA820E822D755AF0007DF2D8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
CA8EE5152CC88B22009D73E3 /* ExamplePptModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExamplePptModel.h; sourceTree = "<group>"; };
CA8EE5162CC88B22009D73E3 /* ExamplePptModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExamplePptModel.m; sourceTree = "<group>"; };
CA8EE5182CC89319009D73E3 /* ExamplePptDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExamplePptDetailModel.h; sourceTree = "<group>"; };
@ -4028,6 +4030,7 @@
CAE010B62CD9D0E9003E327F /* 分数.pag */,
CA5088E72CF41E3F003A82A5 /* PPT切换效果.pag */,
CA815EBC2CDB0AAA00677C00 /* ppt加载.pag */,
CA820E822D755AF0007DF2D8 /* PrivacyInfo.xcprivacy */,
);
path = ProductApp;
sourceTree = "<group>";
@ -4889,6 +4892,7 @@
CB489FCA2744A0BD00DA044A /* loading4@3x.png in Resources */,
CB489FC32744A0BD00DA044A /* loading2@2x.png in Resources */,
CB489FBD2744A0BD00DA044A /* loading3@3x.png in Resources */,
CA820E832D755AF0007DF2D8 /* PrivacyInfo.xcprivacy in Resources */,
CB489FD92744A30000DA044A /* slider_select.png in Resources */,
CA487D952CA407F100AE773B /* D-DIN-PRO-700-Bold.otf in Resources */,
CA5D03162CC0DDF0007B3BA5 /* Pay_Public_余额抵扣.png in Resources */,
@ -5622,7 +5626,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = D5PBFE23SF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -5677,7 +5681,7 @@
"$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib",
"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
);
MARKETING_VERSION = 2.5.1;
MARKETING_VERSION = 2.5.4;
PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
@ -5693,7 +5697,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = D5PBFE23SF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -5748,7 +5752,7 @@
"$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib",
"$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib",
);
MARKETING_VERSION = 2.5.1;
MARKETING_VERSION = 2.5.4;
PRODUCT_BUNDLE_IDENTIFIER = com.batiao.aiwrite;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;

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

Binary file not shown.

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

@ -3,4 +3,86 @@
uuid = "41EC793F-022E-49E6-A76A-A910FEF0483C"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E7AC2FF4-D41C-4A9D-BC80-23C209F28030"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x62cd;&#x7167;&#x5199;&#x4f5c;/&#x6587;&#x7ae0;/view/StartPZXZDetailView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "566"
endingLineNumber = "566"
landmarkName = "-tiyanAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B6A2F772-51F5-4DE1-9AD8-AA93FAFC2397"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;&#x5199;&#x4f5c;/&#x601d;&#x8def;/view/StartZNXZSiLuView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
landmarkName = "-bottomAction:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "2BAAB504-16C7-4B39-8BB3-E61FD18FAAAE"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x4f5c;&#x6587;&#x6279;&#x6539;/&#x6279;&#x6539;&#x4fe1;&#x606f;/view/StartZWPIDetailView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "239"
endingLineNumber = "239"
landmarkName = "-tiyanAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "1444DBC7-B8F5-4E73-A509-411EDE527168"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;PPT/&#x9884;&#x89c8;PPT/StartZNPPTYuLanViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "89"
endingLineNumber = "89"
landmarkName = "-createAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5068A4C4-5B80-4045-9E6F-30C990F92D64"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/view/StartGNView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "351"
endingLineNumber = "351"
landmarkName = "-tiyanAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_PPT创作.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_PPT创作.imageset/组 43167@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_PPT创作.imageset/组 43167@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_newcount.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_newcount.imageset/组 44160@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_newcount.imageset/组 44160@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_大纲助手.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_大纲助手.imageset/组 43165@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_大纲助手.imageset/组 43165@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_方案策划.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_方案策划.imageset/组 43166@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_方案策划.imageset/组 43166@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无线token.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无线token.imageset/组 43163@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无线token.imageset/组 43163@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无限次数.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无限次数.imageset/组 43162@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_无限次数.imageset/组 43162@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_海量工具.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_海量工具.imageset/组 43160@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_海量工具.imageset/组 43160@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_短视频脚本.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_短视频脚本.imageset/组 43164@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_短视频脚本.imageset/组 43164@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

22
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_私人助手.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_私人助手.imageset/组 43161@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/引导页/支付/yd_pay_私人助手.imageset/组 43161@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

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

@ -262,7 +262,7 @@ static UserInfoModel *userinfo;
break;
case 3:
{
str = @"上班族";
str = @"职场";
}
break;
default:

2
ProductApp/ProductApp/Other/Tools.m
View File

@ -637,7 +637,7 @@ static dispatch_source_t _timer;
+ (CGFloat)getLabelHeightWithText:(NSString *)text width:(CGFloat)width font: (CGFloat)font linHeight:(float)linHeight{
NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
style.lineBreakMode = NSLineBreakByCharWrapping;
style.alignment = NSTextAlignmentLeft;
style.lineSpacing = linHeight;

10
ProductApp/ProductApp/Other/ViewLable.m
View File

@ -36,7 +36,7 @@
{
NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
style.lineSpacing = 5.2;
style.lineBreakMode = NSLineBreakByWordWrapping;
style.lineBreakMode = NSLineBreakByCharWrapping;
style.alignment = NSTextAlignmentLeft;
_style = style;
}
@ -73,6 +73,7 @@
[self addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self);
make.height.offset(18);
}];
_lbname = lbname;
// [self mas_makeConstraints:^(MASConstraintMaker *make) {
@ -125,7 +126,7 @@
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
float fheight = [self getAttStringHeight:attrString width:self.width]+1;
[self mas_updateConstraints:^(MASConstraintMaker *make) {
[self.lbname mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(fheight);
}];
if(self.backHeight)
@ -206,8 +207,9 @@
self.lbname.attributedText = attrString;
self.inow++;
float fheight = [Tools getLabelHeightWithText:self.lbname.text width:self.width font:self.lbname.font.pointSize linHeight:5]+1;
[self mas_updateConstraints:^(MASConstraintMaker *make) {
float fheight = [Tools getLabelHeightWithText:self.lbname.text width:self.width font:self.lbname.font.pointSize linHeight:5.2]+1;
[self.lbname mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(fheight);
}];
if(self.backHeight)

47
ProductApp/ProductApp/PrivacyInfo.xcprivacy Normal file
View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyTrackingDomains</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>35F9.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>E174.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>C617.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
</dict>
</array>
</dict>
</plist>

2
ProductApp/ProductApp/ProductMain/AIChart/cell/AIChatTextTableViewCell.m
View File

@ -123,7 +123,7 @@
make.left.offset(15);
make.top.offset(10);
make.right.equalTo(viewinforight).offset(-25);
make.height.offset(10);
// make.height.offset(10);
}];
lbvalueright.isCloseAnimation = YES;
[lbvalueright setBackHeight:^(float fheight, BOOL isend) {

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

@ -27,6 +27,8 @@
#import "PublicNetWorkManager.h"
#import "NotNetWorkView.h"
#import "LoginViewController.h"
@interface StartViewController ()
///
@property (nonatomic , strong) NSMutableArray *arrLB;
@ -403,11 +405,19 @@
}
if([[[NSUserDefaults standardUserDefaults] objectForKey:YingDaoYe] intValue] == 1)
{
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appd.window setRootViewController:[LoginViewController new]];
}
else
{
AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appd.window setRootViewController:[TabBarController new]];
}
}
}
}
//[[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:YingDaoYe];

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

@ -16,6 +16,7 @@
#import "RoleTreeModel.h"
#import "BaseViewController.h"
#import "StartPayViewController.h"
#import "LoginViewController.h"
@interface StartGNView ()<UIScrollViewDelegate>
///
@ -339,12 +340,20 @@
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
LoginViewController *vc = [LoginViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_workplace_create_ppt";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
}
}

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

@ -16,6 +16,7 @@
#import "XieZuoFenXiangAlterView.h"
#import "RoleTreeModel.h"
#import "LoginViewController.h"
@interface StartZWPIDetailView ()<UIScrollViewDelegate>
///
@ -235,10 +236,18 @@
}
if(self.isshiyong)
{///支付
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
LoginViewController *vc = [LoginViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
else
{///写作文章
NSMutableDictionary *dicpush = [NSMutableDictionary new];

5
ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayTQView.h
View File

@ -10,7 +10,10 @@
NS_ASSUME_NONNULL_BEGIN
@interface StartPayTQView : UIView
///0引导页 1我的
@property (nonatomic , assign) int ptype;
///
@property (nonatomic , strong) NSString *source;
@end
NS_ASSUME_NONNULL_END

47
ProductApp/ProductApp/ProductMain/引导/支付页/view/StartPayTQView.m
View File

@ -11,6 +11,8 @@
@interface StartPayTQView ()<UICollectionViewDelegate,UICollectionViewDataSource>
///
@property (nonatomic , strong) NSArray *arrtq;
///
@property (nonatomic , strong) UICollectionView *collect;
@end
@implementation StartPayTQView
@ -67,7 +69,7 @@
[collect.layer setMasksToBounds:YES];
[collect.layer setCornerRadius:20];
[collect registerClass:[StartPayTQViewCell class] forCellWithReuseIdentifier:@"StartPayTQViewCell"];
_collect = collect;
[self mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.equalTo(collect);
}];
@ -76,10 +78,36 @@
});
self.arrtq = @[@"智能创作",@"智能续写",@"改写润色",@"创作思路",@"作文批改",@"写作助手",@"分段创作",@"海量素材",@"课堂写作",@"拍照写作",@"创作工具",@"高分范文"];
if([UserInfoModel shareModel].identityType.intValue == 3)
{
self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"无线token"];
}
}
return self;
}
-(void)setPtype:(int)ptype
{
_ptype = ptype;
}
-(void)setSource:(NSString *)source
{
_source = source;
if([source isEqualToString:@"guide_workplace_create_ppt"] || [UserInfoModel shareModel].identityType.intValue == 3)
{///职场
self.arrtq = @[@"PPT创作",@"方案策划",@"大纲助手",@"短视频脚本",@"海量工具",@"私人助手",@"无限次数",@"无线token"];
[self.collect mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(189);
}];
}
else
{
self.arrtq = @[@"智能创作",@"智能续写",@"改写润色",@"创作思路",@"作文批改",@"写作助手",@"分段创作",@"海量素材",@"课堂写作",@"拍照写作",@"创作工具",@"高分范文"];
[self.collect mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(273);
}];
}
[self.collect reloadData];
}
#pragma mark - UICollectionView
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
@ -91,6 +119,21 @@
cell.lbname.text = self.arrtq[indexPath.row];
cell.imgvback.image = [UIImage imageNamed:[NSString stringWithFormat:@"yd_pay_%@",self.arrtq[indexPath.row]]];
if([self.source isEqualToString:@"guide_workplace_create_ppt"] || [UserInfoModel shareModel].identityType.intValue == 3)
{///职场
if(indexPath.row==4)
{
UIImageView *imgvcc = [[UIImageView alloc] init];
[imgvcc setImage:[UIImage imageNamed:@"yd_pay_newcount"]];
[cell.contentView addSubview:imgvcc];
[imgvcc mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.sizeOffset(CGSizeMake(29, 14));
make.left.equalTo(cell.viewback.mas_right).offset(-12);
make.top.equalTo(cell.viewback).offset(-7);
}];
}
}
return cell;
}
//定义每个section的间距

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

@ -19,6 +19,8 @@
#import "BaseViewController.h"
@interface StartPayView ()<PayManagerDelegate>
///
@property (nonatomic , strong) StartPayTQView *viewtq;
@property (nonatomic , strong) UIButton *btdel;
///
@property (nonatomic , strong) StartPayGoodsView *viewgoods;
@ -123,6 +125,7 @@
}];
[viewtq.layer setMasksToBounds:YES];
[viewtq.layer setCornerRadius:20];
_viewtq = viewtq;
StartPayGoodsView *viewgoods = [StartPayGoodsView new];
[scvback addSubview:viewgoods];
@ -369,7 +372,7 @@
-(void)setPtype:(int)ptype
{
_ptype = ptype;
self.viewtq.ptype = ptype;
if(ptype == 1)
{
[self.btdel setHidden:YES];
@ -396,6 +399,7 @@
{
_source = source;
self.viewgoods.source = source;
self.viewtq.source = source;
}
-(void)removeTimer

9
ProductApp/ProductApp/ProductMain/引导/智能PPT/预览PPT/StartZNPPTYuLanViewController.m
View File

@ -9,6 +9,7 @@
#import "StartZNPPTYuLanTableViewCell.h"
#import "StartPayViewController.h"
#import "XLPhotoBrowser.h"
#import "LoginViewController.h"
@interface StartZNPPTYuLanViewController ()<UITableViewDelegate,UITableViewDataSource>
///
@ -85,9 +86,17 @@
-(void)createAction
{
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
LoginViewController *vc = [LoginViewController new];
[self.navigationController pushViewController:vc animated:YES];
}
else
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_workplace_create_ppt";
[self.navigationController pushViewController:vc animated:YES];
}
}
-(void)showImages:(NSInteger)irow
{

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

@ -8,6 +8,7 @@
#import "StartZNXZSiLuView.h"
#import "StartPayViewController.h"
#import "SSENetWorkManager.h"
#import "LoginViewController.h"
typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
@interface StartZNXZSiLuView ()<UIScrollViewDelegate>
@ -250,10 +251,18 @@ typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
}
else
{///
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
LoginViewController *vc = [LoginViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_write";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
}
#pragma mark - UIScrollView

4
ProductApp/ProductApp/ProductMain/引导/课堂写作/StartKTXZWenZhangViewController.m
View File

@ -25,12 +25,12 @@
[self.navigationView setTitle:@"" titleColor:[UIColor whiteColor]];
[self.navigationView setBackgroundColor:[UIColor clearColor]];
[self.navigationView.backButton setHidden:YES];
// [self.navigationView.backButton setHidden:YES];
}
-(void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
// self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
- (void)viewDidLoad {
[super viewDidLoad];

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

@ -16,6 +16,7 @@
#import "XieZuoXiangQingViewController.h"
#import "CorrectWriteErrorModel.h"
#import "LoginViewController.h"
@interface StartKTXZPGDetailView ()<UIScrollViewDelegate>
///
@ -228,11 +229,19 @@
return;
}
if(self.isshiyong)
{
if([UserInfoModel PayWXQuanXian]==NO&&[UserInfoModel shareModel].temp.intValue==1)
{
LoginViewController *vc = [LoginViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_classroom_write";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
else
{///
if(self.modelDetailYDY)

3
ProductApp/ProductApp/ProductMain/我的/系统设置/账户管理/ZhangHuGuanLiViewController.m
View File

@ -100,7 +100,10 @@
-(void)dengluAction
{
LoginViewController *vc = [[LoginViewController alloc] init];
if([UserInfoModel PayWXQuanXian])
{
vc.isbind = YES;
}
[self.navigationController pushViewController:vc animated:YES];
}
#pragma mark - UITableView

2
ProductApp/ProductApp/ProductMain/首页/写作分享/分享海报views/写作建议/FXXieZuoJianYiView.m
View File

@ -357,7 +357,7 @@
make.left.equalTo(lastview);
make.top.equalTo(lastview.mas_bottom).offset(10);
make.right.equalTo(self.viewJianYi).offset(-20);
make.height.offset(20);
// make.height.offset(20);
}];
lbwz.textColor = RGBCOLOR(61, 61, 61);
lbwz.textFont = [UIFont systemFontOfSize:15];