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

动效pag

This commit is contained in:
pengguangjian 2024-11-05 12:20:10 +08:00
parent f58a024df9
commit 902e9036c6
51 changed files with 888 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,6 +363,9 @@
CAD092CB2CD48A2500853A26 /* MyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD092CA2CD48A2500853A26 /* MyDocument.m */; };
CAD092CE2CD4A43300853A26 /* ZZDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD092CD2CD4A43300853A26 /* ZZDocument.m */; };
CAD092D12CD4AFE300853A26 /* PptOutlineModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD092D02CD4AFE300853A26 /* PptOutlineModel.m */; };
CAE010B52CD9CF5B003E327F /* 逐字动效.pag in Resources */ = {isa = PBXBuildFile; fileRef = CAE010B42CD9CF5B003E327F /* 逐字动效.pag */; };
CAE010B72CD9D0E9003E327F /* 分数.pag in Resources */ = {isa = PBXBuildFile; fileRef = CAE010B62CD9D0E9003E327F /* 分数.pag */; };
CAE010B92CD9D2BF003E327F /* PPT切换效果.pag in Resources */ = {isa = PBXBuildFile; fileRef = CAE010B82CD9D2BF003E327F /* PPT切换效果.pag */; };
CAF2BC7D2CCF7F7800028275 /* TextbookModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAF2BC7C2CCF7F7800028275 /* TextbookModel.m */; };
CAF2BC812CCF8D2700028275 /* FanWenSearchListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAF2BC802CCF8D2700028275 /* FanWenSearchListViewController.m */; };
CAF76E632CBDFF8500825E5E /* AIChatYuYinView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAF76E622CBDFF8500825E5E /* AIChatYuYinView.m */; };
@ -1210,6 +1213,9 @@
CAD092CD2CD4A43300853A26 /* ZZDocument.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZZDocument.m; sourceTree = "<group>"; };
CAD092CF2CD4AFE300853A26 /* PptOutlineModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PptOutlineModel.h; sourceTree = "<group>"; };
CAD092D02CD4AFE300853A26 /* PptOutlineModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PptOutlineModel.m; sourceTree = "<group>"; };
CAE010B42CD9CF5B003E327F /* 逐字动效.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = "逐字动效.pag"; sourceTree = "<group>"; };
CAE010B62CD9D0E9003E327F /* 分数.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = "分数.pag"; sourceTree = "<group>"; };
CAE010B82CD9D2BF003E327F /* PPT切换效果.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = "PPT切换效果.pag"; sourceTree = "<group>"; };
CAF2BC7B2CCF7F7800028275 /* TextbookModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TextbookModel.h; sourceTree = "<group>"; };
CAF2BC7C2CCF7F7800028275 /* TextbookModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TextbookModel.m; sourceTree = "<group>"; };
CAF2BC7F2CCF8D2700028275 /* FanWenSearchListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FanWenSearchListViewController.h; sourceTree = "<group>"; };
@ -2461,9 +2467,9 @@
children = (
CA5D02B92CC0B77D007B3BA5 /* 权限管理 */,
CA5D02B22CC0B397007B3BA5 /* 账号绑定 */,
CA5D029A2CC0B2DE007B3BA5 /* 账户管理 */,
CA5D02852CC0B2DE007B3BA5 /* 关于我们 */,
CA5D028E2CC0B2DE007B3BA5 /* 意见反馈 */,
CA5D029A2CC0B2DE007B3BA5 /* 账户管理 */,
CA5D029D2CC0B2DE007B3BA5 /* cell */,
CA5D029E2CC0B2DE007B3BA5 /* SetViewController.h */,
CA5D029F2CC0B2DE007B3BA5 /* SetViewController.m */,
@ -3722,6 +3728,9 @@
CA5D02B52CC0B69E007B3BA5 /* SmileySans-Oblique.ttf */,
CA5D036B2CC0DF9B007B3BA5 /* yq_animation.pag */,
CA3868652CC211E3009C98B0 /* pag_loading.pag */,
CAE010B42CD9CF5B003E327F /* 逐字动效.pag */,
CAE010B62CD9D0E9003E327F /* 分数.pag */,
CAE010B82CD9D2BF003E327F /* PPT切换效果.pag */,
);
path = ProductApp;
sourceTree = "<group>";
@ -4562,6 +4571,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CAE010B72CD9D0E9003E327F /* 分数.pag in Resources */,
CB489DD827449D5D00DA044A /* LaunchScreen.storyboard in Resources */,
CA5D03252CC0DDF0007B3BA5 /* Pay_Public_yhY.png in Resources */,
CB489FC72744A0BD00DA044A /* loading6@3x.png in Resources */,
@ -4583,6 +4593,7 @@
CA5D03162CC0DDF0007B3BA5 /* Pay_Public_余额抵扣.png in Resources */,
CB489FC42744A0BD00DA044A /* loading2@3x.png in Resources */,
CA5D03142CC0DDF0007B3BA5 /* Pau_Public_X@3x.png in Resources */,
CAE010B52CD9CF5B003E327F /* 逐字动效.pag in Resources */,
CB489FBC2744A0BD00DA044A /* loading1@2x.png in Resources */,
CB489FBB2744A0BD00DA044A /* loading1@3x.png in Resources */,
CB489F592744A0BD00DA044A /* bigfont.txt in Resources */,
@ -4594,6 +4605,7 @@
CB489FDA2744A30000DA044A /* 全屏.png in Resources */,
CB489FC22744A0BD00DA044A /* loading7@2x.png in Resources */,
CB489FDC2744A30000DA044A /* vedio_puse.png in Resources */,
CAE010B92CD9D2BF003E327F /* PPT切换效果.pag in Resources */,
CB489DD527449D5D00DA044A /* Assets.xcassets in Resources */,
CA5D03202CC0DDF0007B3BA5 /* Pay_Public_SelectNOT@3x.png in Resources */,
CB489FBF2744A0BD00DA044A /* loading7@3x.png in Resources */,

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

Binary file not shown.

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

@ -4,150 +4,6 @@
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "2195CB0C-9378-4CA5-A12C-791AF537D6C5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;PPT/StartZNPPTViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "82"
endingLineNumber = "82"
landmarkName = "-getpasteInfo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BDEECCD1-C526-4B6D-8E4E-21D63924A5E5"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;PPT/StartZNPPTViewController.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "79"
endingLineNumber = "79"
landmarkName = "-getpasteInfo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7246E31C-0D61-468C-80ED-EDA2C9F6266B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "385"
endingLineNumber = "385"
landmarkName = "-adjustUIWhenBtnOnClickWithAnimate:taped:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A6FC7C2C-9C85-4C08-9757-EA7466B68D2A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "467"
endingLineNumber = "467"
landmarkName = "-adjustUIWithProgress:oldIndex:currentIndex:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "144E884F-35FD-43B2-858C-7EFD5F276307"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/NetWorkManager/WebSocketManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "336"
endingLineNumber = "336"
landmarkName = "-webSocket:didReceiveMessage:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "51A20835-14FF-4F2C-9252-8798E7712AF7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/NetWorkManager/WebSocketManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "124"
endingLineNumber = "124"
landmarkName = "-connect"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "6246BC94-D07E-4E5C-88FC-6280FB9F6DAD"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/NetWorkManager/WebSocketManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "356"
endingLineNumber = "356"
landmarkName = "-webSocket:didFailWithError:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C2181E3D-270B-47C7-90A9-7D9082870C21"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/Other/&#x8bed;&#x97f3;/PlayAudio.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "81"
endingLineNumber = "81"
landmarkName = "-audioPlayerDidFinishPlaying:successfully:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D0A19A5D-9133-47F0-BEB7-AF3B4A685A30"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/Other/&#x8bed;&#x97f3;/PlayAudio.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "88"
endingLineNumber = "88"
landmarkName = "-audioPlayerDecodeErrorDidOccur:error:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@ -167,16 +23,16 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BFCE2200-C74A-449A-8CC6-F635A31459DC"
uuid = "E3E88296-61FA-49EF-B2DF-8785E421E3A1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ProductApp/ProductMain/&#x5f15;&#x5bfc;/&#x667a;&#x80fd;PPT/&#x5927;&#x7eb2;/view/StartZNPPTDaGangView.m"
filePath = "ProductApp/ProductMain/&#x6211;&#x7684;/&#x4f18;&#x60e0;&#x5238;/cell/YouHuiQuanListTableViewCell.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "289"
endingLineNumber = "289"
landmarkName = "-getJinDu:"
startingLineNumber = "234"
endingLineNumber = "234"
landmarkName = "-useAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>

22
ProductApp/ProductApp/Assets.xcassets/我的/bd_apple绑定.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_apple绑定.imageset/组 42544@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_apple绑定.imageset/组 42544@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/我的/bd_微信绑定.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_微信绑定.imageset/切图 85@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_微信绑定.imageset/切图 85@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

22
ProductApp/ProductApp/Assets.xcassets/我的/bd_手机号绑定.imageset/Contents.json vendored Normal file
View File

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

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_手机号绑定.imageset/切图 86@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 744 B

BIN
ProductApp/ProductApp/Assets.xcassets/我的/bd_手机号绑定.imageset/切图 86@3x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

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

@ -213,8 +213,8 @@ static UserInfoModel *userinfo;
BOOL ispay = NO;
if([UserInfoModel shareModel].config != nil )
{
NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.material.search"];
if(str.intValue == 1 || [Tools isStringnil:str].length==0 )
NSString *str = [[UserInfoModel shareModel].config objectForKey:@"client.apple.audit"];
if(str.intValue == 0 || [Tools isStringnil:str].length==0 )
{
ispay = YES;
}

19
ProductApp/ProductApp/Configure/ConfigireSetting.h
View File

@ -127,9 +127,7 @@ alpha:alphaValue]
///登录账号弹窗
#define DengluZhangHaoTanChuang @"DengluZhangHaoTanChuang"
///隐私协议
#define UserYinSiUrl @""
#define UserXieUrl @""
///协议弹窗
#define UserXieYiOk @"UserXieYiOk"
@ -147,6 +145,21 @@ alpha:alphaValue]
///聊天是否正在绘制
#define AiChatIsDrawing @"AiChatIsDrawing"
//用户协议
#define UserXieUrl @"static/policy/user.html"
//隐私协议
#define UserYinSiUrl @"static/policy/provacy.html"
//连续自动续费协议
#define ZiDongXuFeiXieYiUrl @"static/policy/renew.html"
//权限说明
#define QuanXianShuoMingUrl @"static/policy/limits.html"
//第三方共享清单
#define SiSanFangUrl @"static/policy/shareList.html"
//第三方SDK目录
#define SiSanFangSDKUrl @"static/policy/sdkList.html"
//算法备案公示地址
#define SuanFaBeiANUrl @"static/policy/formula.html"
@end
NS_ASSUME_NONNULL_END

BIN
ProductApp/ProductApp/PPT切换效果.pag Normal file
View File

Binary file not shown.

2
ProductApp/ProductApp/ProductMain/NetWorkManager/PayManager.m
View File

@ -251,7 +251,7 @@ static PayManager *manager = nil;
}else{
[LoadAlterView dismiss];
[HXHud showMessage:@"无法连接App store!" afterDelayType:0];
[UserInfoModel shijianShangBao:1 key:@"client.apple.err" value:self.source extra:@"无法连接App store!"];
[UserInfoModel shijianShangBao:1 key:@"client.apple.err" value:[Tools isStringnil:self.source] extra:@"无法连接App store!"];
if(self.delegate&&[self.delegate respondsToSelector:@selector(payFaile)])
{
[self.delegate payFaile];

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

@ -269,6 +269,7 @@
{
StartPayViewController *vc = [StartPayViewController new];
vc.ptype = 1;
vc.source = @"banner tools_banner";
[self.navigationController pushViewController:vc animated:YES];
}
else if([strpage isEqualToString:@"composition"])

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

@ -12,7 +12,6 @@
#import "StartZNXZViewController.h"
#import "StartPZXZViewController.h"
#import "StartZNPPTViewController.h"
#import "StartPayViewController.h"
#import "RoleTreeModel.h"
@ -321,16 +320,8 @@
}
else
{///职员
if(self.pagec.selectNumber==0)
{
StartZNPPTViewController *vc = [StartZNPPTViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else
{///
StartPayViewController *vc = [StartPayViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
StartZNPPTViewController *vc = [StartZNPPTViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}

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

@ -206,6 +206,7 @@
if(self.isshiyong)
{///支付
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_correct";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else

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

@ -526,6 +526,7 @@
if(self.isshiyong)
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_photo_write";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else

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

@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface StartPayViewController : BaseViewController
///0引导页 1我的
@property (nonatomic , assign) int ptype;
///
@property (nonatomic , strong) NSString *source;
@end
NS_ASSUME_NONNULL_END

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

@ -32,6 +32,7 @@
make.top.offset(0);
}];
view.ptype = self.ptype;
view.source = self.source;
[view setHidden:YES];
[HXLoadingHUD showWithStatus:@"" maskType:0];

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

@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface StartPayView : UIView
///0引导页 1我的
@property (nonatomic , assign) int ptype;
///
@property (nonatomic , strong) NSString *source;
///商品
@property (nonatomic , strong) NSArray *arrGoods;
@end

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

@ -451,9 +451,7 @@
NSString *strvalue = [self getpaytype];
[UserInfoModel shijianShangBao:0 key:@"client.pay.pay" value:strvalue extra:[self.modelSelect yy_modelToJSONString]];
NSString *strtempcence = @"center";
[self.manager creatOrderGoodsid:self.modelSelect.goods_id pay_type:strvalue source:strtempcence extra:@{} applegoodsid:self.modelSelect.apple_buy_id applegoodsNumber:1 coupon:self.viewgoods.viewpay.modelYHQ.ID];
[self.manager creatOrderGoodsid:self.modelSelect.goods_id pay_type:strvalue source:self.source extra:@{} applegoodsid:self.modelSelect.apple_buy_id applegoodsNumber:1 coupon:self.viewgoods.viewpay.modelYHQ.ID];
}
@ -502,7 +500,7 @@
-(void)paySuccess
{
NSString *strvalue = [self getpaytype];
NSString *strtempcence = @"center";
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];
@ -511,7 +509,7 @@
{
NSString *strvalue = [self getpaytype];
NSString *strtempcence = @"center";
NSString *strtempcence = self.source;
[UserInfoModel shijianShangBao:0 key:@"client.pay.cancel" value:[NSString stringWithFormat:@"%@:%@",strvalue,strtempcence] extra:self.modelSelect.goods_id];
}

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

@ -80,6 +80,7 @@
-(void)createAction
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_workplace_create_ppt";
[self.navigationController pushViewController:vc animated:YES];
}
-(void)showImages:(NSInteger)irow

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

@ -251,6 +251,7 @@ typedef void(^StartZNXZSiLuViewDrawEndBack)(UIView *viewlast);
else
{///
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_write";
[self.viewController.navigationController pushViewController:vc animated:YES];
}

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

@ -198,6 +198,7 @@
if(self.isshiyong)
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"guide_classroom_write";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else

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

@ -7,7 +7,7 @@
#import "WoDeViewController.h"
#import "WoDeView.h"
#import "PublicNetWorkManager.h"
@interface WoDeViewController ()
@ -21,7 +21,7 @@
-(void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
// [self getdata];
[self getdata];
}
- (void)viewDidLoad {
@ -41,7 +41,17 @@
}
-(void)getdata
{
[PublicNetWorkManager requestUserData:self.view Callback:^(BOOL state, UserModel *responseObject, NSString * _Nullable describle) {
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];
self.viewback.modelDetail = responseObject.data;
}
}];
}

97
ProductApp/ProductApp/ProductMain/我的/view/WoDeInfoView.m
View File

@ -20,10 +20,10 @@
@property (nonatomic , strong) UILabel *lbID ;
@property (nonatomic , strong) UIImageView *imgvnext;
///
@property (nonatomic , strong) UIView *viewstate;
///
@property (nonatomic , strong) UILabel *lbstate;
/////
//@property (nonatomic , strong) UIView *viewstate;
/////
//@property (nonatomic , strong) UILabel *lbstate;
@end
@ -34,7 +34,7 @@
if(self = [super initWithFrame:frame])
{
UIImageView *imgvhead = [[UIImageView alloc] init];
[imgvhead setImage:[UIImage imageNamed:@"yd_ailog"]];
[imgvhead setImage:[UIImage imageNamed:@"hb_log"]];
[self addSubview:imgvhead];
[imgvhead mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.offset(60);
@ -75,44 +75,7 @@
}];
_lbname = lbname;
lbname.text = [UserInfoModel shareModel].name;
///是否开通了会员
UIImageView *imgvstate = [[UIImageView alloc] init];
[imgvstate setImage:[UIImage imageNamed:@""]];
[imgvstate setContentMode:UIViewContentModeScaleAspectFit];
[self addSubview:imgvstate];
[imgvstate mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname.mas_right).offset(5);
make.bottom.equalTo(lbname);
make.width.offset(60);
}];
UIView *viewstate = [[UIView alloc] init];
[self addSubview:viewstate];
[viewstate mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname.mas_right).offset(5);
make.bottom.equalTo(lbname.mas_centerY);
make.height.offset(20);
}];
_viewstate = viewstate;
UILabel *lbstate= [[UILabel alloc] init];
[lbstate setText:@"未开通"];
[lbstate setTextColor:[UIColor whiteColor]];
[lbstate setTextAlignment:NSTextAlignmentLeft];
[lbstate setFont:[UIFont fontWithName:@"zihunbiantaoti" size:14]];
[viewstate addSubview:lbstate];
[lbstate mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(10);
make.centerY.equalTo(viewstate);
}];
_lbstate = lbstate;
[viewstate mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(lbstate).offset(10);
}];
[self setStateViewStyle];
UILabel *lbID = [[UILabel alloc] init];
[lbID setText:[NSString stringWithFormat:@"ID：%@",[UserInfoModel shareModel].userid]];
[lbID setTextColor:RGBCOLOR(61, 61, 61)];
@ -147,8 +110,6 @@
make.center.equalTo(viewcopy);
}];
////只有游客才有以下数据 并且点击进入登录页面
UIImageView *imgvnext = [[UIImageView alloc] init];
[imgvnext setImage:[UIImage imageNamed:@"yq_next"]];
@ -162,6 +123,7 @@
if([UserInfoModel shareModel].temp.intValue == 0)
{
[imgvnext setHidden:YES];
[self.lbweidenglu setHidden:YES];
}
UIButton *btuser = [[UIButton alloc] init];
@ -185,24 +147,22 @@
}
return self;
}
-(void)setStateViewStyle
-(void)setModelDetail:(UserModelData *)modelDetail
{
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: self.viewstate.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight| UIRectCornerBottomRight cornerRadii:CGSizeMake(8,8)];
//创建 layer
CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
maskLayer.frame = self.viewstate.bounds;
//赋值
maskLayer.path = maskPath.CGPath;
NSArray *arr = self.viewstate.layer.sublayers;
if(arr.count>1)
{
[self.viewstate.layer.sublayers.firstObject removeFromSuperlayer];
}
self.viewstate.layer.mask = maskLayer;
[Tools changedView:self.viewstate colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
});
_modelDetail = modelDetail;
[self.imgvhead sd_setImageWithURL:[NSURL URLWithString:[Tools isStringnil:self.modelDetail.avater]] placeholderImage:[UIImage imageNamed:@"hb_log"]];
self.lbname.text = [Tools isStringnil:modelDetail.name];
self.lbID.text = [NSString stringWithFormat:@"ID：%@",modelDetail.user_id];
if(modelDetail.temp.intValue != 1)
{
[self.lbweidenglu setHidden:YES];
[self.imgvnext setHidden:YES];
}
else
{
[self.lbweidenglu setHidden:NO];
[self.imgvnext setHidden:NO];
}
}
-(void)copyAction
{
@ -213,14 +173,11 @@
///用户信息 游客才有以下数据 并且点击进入登录页面
-(void)userAction
{
// if(self.modelDetail.temp.intValue == 1)
// {
// LoginViewController *vc = [[LoginViewController alloc] init];
// [self.viewController.navigationController pushViewController:vc animated:YES];
// }
LoginViewController *vc = [[LoginViewController alloc] init];
[self.viewController.navigationController pushViewController:vc animated:YES];
if(self.modelDetail.temp.intValue == 1)
{
LoginViewController *vc = [[LoginViewController alloc] init];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
@end

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

@ -6,11 +6,12 @@
//
#import <UIKit/UIKit.h>
#import "UserModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface WoDeView : UIView
///
@property (nonatomic , strong) UserModelData *modelDetail;
@end
NS_ASSUME_NONNULL_END

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

@ -16,8 +16,8 @@
#import "AppDelegate.h"
#import "ShareAlterView.h"
#import "StartPayViewController.h"
#import "PublicNetWorkManager.h"
#import <WXApi.h>
@interface WoDeView ()<UITableViewDelegate,UITableViewDataSource>
///
@ -27,6 +27,8 @@
@property (nonatomic , strong) UILabel *lbHYinfo;
@property (nonatomic , strong) UIButton *btHYkt;
@property (nonatomic , strong) WoDeYouHuiView *viewYuE;
///
@property (nonatomic , strong) UITableView *tableView;
///
@ -84,9 +86,10 @@
[viewYuE mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(imgvhy);
make.top.equalTo(imgvhy.mas_bottom).offset(12);
make.height.offset(82);
make.height.offset(0);///82
}];
[viewYuE setHidden:YES];
_viewYuE = viewYuE;
UIView *viewback = [[UIView alloc] init];
[viewback setBackgroundColor:[UIColor whiteColor]];
@ -118,7 +121,7 @@
}];
self.arrdata = [NSMutableArray arrayWithObjects:@"现金任务",@"历史记录",@"在线客服",@"分享APP",@"意见反馈",@"系统设置", nil];
self.arrdata = [NSMutableArray arrayWithObjects:@"历史记录",@"在线客服",@"意见反馈",@"系统设置", nil];
[self.tableView reloadData];
[self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(60*self.arrdata.count);
@ -138,7 +141,7 @@
[view addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(18);
make.top.offset(28);
make.top.offset(25);
}];
_lbHYname = lbname;
@ -147,21 +150,21 @@
[lbinfo setText:@"专属八大特权"];
[lbinfo setTextColor:[UIColor whiteColor]];
[lbinfo setTextAlignment:NSTextAlignmentLeft];
[lbinfo setFont:[UIFont systemFontOfSize:14]];
[lbinfo setFont:[UIFont systemFontOfSize:12]];
[view addSubview:lbinfo];
[lbinfo mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lbname);
make.top.equalTo(lbname.mas_bottom).offset(6);
make.top.equalTo(lbname.mas_bottom).offset(15);
}];
_lbHYinfo = lbinfo;
UIButton *btkt = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 86, 34)];
[btkt setTitle:@"立即办理" forState:UIControlStateNormal];
[btkt setTitleColor:MainColor forState:UIControlStateNormal];
[btkt setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[btkt.titleLabel setFont:[UIFont systemFontOfSize:14]];
[btkt.layer setMasksToBounds:YES];
[btkt.layer setCornerRadius:17];
[btkt setBackgroundColor:[UIColor whiteColor]];
[btkt setBackgroundColor:[UIColor blackColor]];
[view addSubview:btkt];
[btkt mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.offset(86);
@ -173,12 +176,62 @@
_btHYkt = btkt;
// [self.btHYkt setHidden:YES];
}
-(void)setModelDetail:(UserModelData *)modelDetail
{
_modelDetail = modelDetail;
self.viewinfo.modelDetail = modelDetail;
if(modelDetail.vip.intValue == 1 && [Tools isStringnil:self.modelDetail.vip_expire].length>0)
{
[self.lbHYname setText:@"加入会员解锁全部智能功能"];
self.lbHYinfo.text = [NSString stringWithFormat:@"您的会员权益已于%@过期",[Tools shijiangeshizhuanhuan:self.modelDetail.vip_expire timetype:3]];
[self.btHYkt setTitle:@"立即开通" forState:UIControlStateNormal];
}
else if(modelDetail.vip.intValue == 2)
{
[self.lbHYname setText:@"普通会员"];
self.lbHYinfo.text = [NSString stringWithFormat:@"您的会员权益将于%@过期",[Tools shijiangeshizhuanhuan:self.modelDetail.vip_expire timetype:3]];
[self.btHYkt setTitle:@"立即续费" forState:UIControlStateNormal];
}
else if (modelDetail.vip.intValue == 3)
{
[self.lbHYname setText:@"终生会员"];
self.lbHYinfo.text = @"专属八大特权";
[self.btHYkt setHidden:YES];
}
else
{
[self.lbHYname setText:@"加入会员解锁全部智能功能"];
self.lbHYinfo.text = @"专属八大特权";
[self.btHYkt setHidden:NO];
[self.btHYkt setTitle:@"立即开通" forState:UIControlStateNormal];
}
if([UserInfoModel PayWXQuanXian] && [[[UserInfoModel shareModel].config objectForKey:@"client.cashtask.enable"] intValue] == 1)
{
[self.viewYuE setHidden:NO];
[self.viewYuE mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(82);
}];
self.viewYuE.stryue = self.modelDetail.balance;
self.viewYuE.stryouhui = self.modelDetail.coupon_count;
self.arrdata = [NSMutableArray arrayWithObjects:@"现金任务",@"历史记录",@"在线客服",@"意见反馈",@"系统设置", nil];
[self.tableView reloadData];
[self.tableView mas_updateConstraints:^(MASConstraintMaker *make) {
make.height.offset(60*self.arrdata.count);
}];
}
}
-(void)kaitongAction
{
StartPayViewController *vc = [StartPayViewController new];
vc.ptype = 1;
vc.source = @"center";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
@ -246,7 +299,7 @@
}
else if([self.arrdata[indexPath.row] isEqualToString:@"在线客服"])
{
// [self getKeFuData];
[self getKeFuData];
}
else if([self.arrdata[indexPath.row] isEqualToString:@"分享APP"])
{
@ -262,35 +315,35 @@
else if([self.arrdata[indexPath.row] isEqualToString:@"系统设置"])
{
SetViewController *vc = [[SetViewController alloc] init];
// vc.modelDetail = self.modelDetail;
vc.modelDetail = self.modelDetail;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
//-(void)getKeFuData
//{
// [LoadAlterView showView];
// [PublicNetWorkManager requestWeixinServiceData:self Callback:^(BOOL state, WeixinServiceModel *responseObject, NSString * _Nullable describle) {
// [LoadAlterView dismis];
// if(state)
// {
// if([Tools isStringnil:responseObject.data.corpid].length>1)
// {
// WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
// req.corpid = responseObject.data.corpid; //企业ID
// req.url = responseObject.data.kf_address;
// [WXApi sendReq:req completion:nil];
// }
// else
// {
// [HXHud showMessage:@"暂时无法联系在线客服，请电话咨询" afterDelayType:1];
// }
// }
// else
// {
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
//}
-(void)getKeFuData
{
[LoadAlterView show];
[PublicNetWorkManager requestWeixinServiceData:self Callback:^(BOOL state, WeixinServiceModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
if([Tools isStringnil:responseObject.data.corpid].length>1)
{
WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init];
req.corpid = responseObject.data.corpid; //企业ID
req.url = responseObject.data.kf_address;
[WXApi sendReq:req completion:nil];
}
else
{
[HXHud showMessage:@"暂时无法联系在线客服，请电话咨询" afterDelayType:1];
}
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
@end

3
ProductApp/ProductApp/ProductMain/我的/view/WoDeYouHuiView.h
View File

@ -10,7 +10,10 @@
NS_ASSUME_NONNULL_BEGIN
@interface WoDeYouHuiView : UIView
///
@property (nonatomic , strong) NSString *stryue;
@property (nonatomic , strong) NSString *stryouhui;
@end
NS_ASSUME_NONNULL_END

10
ProductApp/ProductApp/ProductMain/我的/view/WoDeYouHuiView.m
View File

@ -139,5 +139,15 @@
[self.viewController.navigationController pushViewController:vc animated:YES];
}
}
-(void)setStryue:(NSString *)stryue
{
self.lbyue.text = [NSString stringWithFormat:@"%@ 元",stryue];
[self refLB:self.lbyue];
}
-(void)setStryouhui:(NSString *)stryouhui
{
self.lbquan.text = [NSString stringWithFormat:@"%@ 张",stryouhui];
[self refLB:self.lbquan];
}
@end

1
ProductApp/ProductApp/ProductMain/我的/优惠券/cell/YouHuiQuanListTableViewCell.m
View File

@ -232,6 +232,7 @@
-(void)useAction
{
StartPayViewController *vc = [StartPayViewController new];
vc.source = @"";
[self.viewController.navigationController pushViewController:vc animated:YES];
}

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

@ -12,8 +12,8 @@
#import "ZhangHaoBangDingViewController.h"
#import "GunYuController.h"
#import "QuanXianGuanLiViewController.h"
//#import "NomoVerbAlterView.h"
//#import "LoginViewController.h"
#import "NomoVerbAlterView.h"
#import "LoginViewController.h"
#import "AppDelegate.h"
#import "NavgationController.h"
#import "PublicNetWorkManager.h"
@ -79,34 +79,34 @@
if([UserInfoModel shareModel].temp.intValue != 0)
{
[btdenglu setHidden:YES];
self.arrdata = @[@"权限管理",@"账号绑定",@"账户管理",@"关于我们",@"注销账户"];
self.arrdata = @[@"权限管理",@"账号绑定",@"账户管理",@"关于我们"];
}
[UserInfoModel shijianShangBao:0 key:@"client.jump.to.system.setting" value:@"" extra:@""];
}
-(void)loginoutAction
{
// [NomoVerbAlterView showTitle:@"您确定要退出登录吗？" info:@"" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [LoadAlterView showView];
// [PublicNetWorkManager requestUserLogoutData:self.view Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
// [LoadAlterView dismis];
// if(state)
// {
// [UserInfoModel shijianShangBao:0 key:@"client.exit.login" value:@"" extra:@""];
// [UserInfoModel loginOut];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserInfoModelToken];
// AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
// [appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
// }
// else
// {
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
// }
// }];
[NomoVerbAlterView showTitle:@"您确定要退出登录吗？" info:@"" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[LoadAlterView show];
[PublicNetWorkManager requestUserLogoutData:self.view Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
[UserInfoModel shijianShangBao:0 key:@"client.exit.login" value:@"" extra:@""];
[UserInfoModel loginOut];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserInfoModelToken];
AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
}];
}
#pragma mark - UITableView
@ -185,20 +185,20 @@
break;
case 4:
{
// [NomoVerbAlterView showTitle:@"您确定要注销账号吗？" info:@"账号注销后信息将丢失无法找回，请谨慎操作！" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [LoadAlterView showView];
// [PublicNetWorkManager requestUserDestroyData:self.view Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
// [UserInfoModel shijianShangBao:0 key:@"client.cancel.account" value:@"" extra:@""];
// [LoadAlterView dismis];
// [UserInfoModel loginOut];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserInfoModelToken];
// AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
// [appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
// }];
// }
// }];
[NomoVerbAlterView showTitle:@"您确定要注销账号吗？" info:@"账号注销后信息将丢失无法找回，请谨慎操作！" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[LoadAlterView show];
[PublicNetWorkManager requestUserDestroyData:self.view Callback:^(BOOL state, BaseModel *responseObject, NSString * _Nullable describle) {
[UserInfoModel shijianShangBao:0 key:@"client.cancel.account" value:@"" extra:@""];
[LoadAlterView dismiss];
[UserInfoModel loginOut];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserInfoModelToken];
AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appde.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[LoginViewController new]]];
}];
}
}];
}
break;
default:

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

@ -75,7 +75,7 @@
make.bottom.equalTo(self.view);
}];
self.arrdata = @[@"版权公司",@"联系客服",@"版本号"];
self.arrdata = @[@"版权公司",@"版本号",@"算法备案公示"];
}
@ -92,7 +92,7 @@
}
else if (buttonIndex==3)
{
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:YingDaoYe];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:YingDaoYe];
AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appd.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartViewController new]]];
}
@ -107,13 +107,9 @@
{
[UserInfoModel loginOut];
[UserInfoModel removeAll];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:YingDaoYe];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserXieYiOk];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserLoginDid];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserIDFA];
// [[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:@"dengluZhangHaoTanChuang"];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:ShowSearchLongPress];
// [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:ShiPingJiaoCheng];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:YingDaoYe];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserXieYiOk];
[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:UserIDFA];
AppDelegate *appd = (AppDelegate *)[UIApplication sharedApplication].delegate;
[appd.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartViewController new]]];
}
@ -145,7 +141,7 @@
cell.lbinfo.text = @"元里千禾";
[cell.imgvnext setHidden:YES];
}
else if (indexPath.row==2)
else if (indexPath.row==1)
{
[cell.imgvnext setHidden:YES];
[cell.lbinfo setHidden:NO];
@ -176,21 +172,13 @@
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
if(indexPath.row==1)
{///联系客服
if(indexPath.row==2)
{///
WkWebviewViewController *vc = [[WkWebviewViewController alloc] init];
vc.strtitle = self.arrdata[indexPath.row];
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,SuanFaBeiANUrl];
[self.navigationController pushViewController:vc animated:YES];
}
// WkWebviewViewController *vc = [[WkWebviewViewController alloc] init];
// vc.strtitle = self.arrdata[indexPath.row];
// if(indexPath.row==1)
// {
//// vc.strurl = UserXieUrl;
// }
// else
// {
//// vc.strurl = UserYinSiUrl;
// }
// [self.navigationController pushViewController:vc animated:YES];
}

54
ProductApp/ProductApp/ProductMain/我的/系统设置/权限管理/QuanXianGuanLiViewController.m
View File

@ -85,33 +85,33 @@
///@"用户协议",@"隐私协议",@"权限说明",@"第三方共享清单",@"第三方SDK目录"
WkWebviewViewController *vc = [WkWebviewViewController new];
vc.strtitle = self.arrdata[indexPath.row];
// switch (indexPath.row) {
// case 0:
// {
// vc.strurl = UserXieUrl;
// }
// break;
// case 1:
// {
// vc.strurl = UserYinSiUrl;
// }
// break;
// case 2:
// {
// vc.strurl = QuanXianSMUrl;
// }
// break;
// case 3:
// {
// vc.strurl = SanFangGXQDUrl;
// }
// break;
// default:
// {
// vc.strurl = SanFangMuLuUrl;
// }
// break;
// }
switch (indexPath.row) {
case 0:
{
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,UserXieUrl];
}
break;
case 1:
{
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,UserYinSiUrl];
}
break;
case 2:
{
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,QuanXianShuoMingUrl];
}
break;
case 3:
{
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,SiSanFangUrl];
}
break;
default:
{
vc.strurl = [NSString stringWithFormat:@"%@%@",BaseUrl,SiSanFangSDKUrl];
}
break;
}
[self.navigationController pushViewController:vc animated:YES];

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

@ -7,11 +7,11 @@
#import "ZhangHaoBangDingViewController.h"
#import "ZhangHaoBangDingTableViewCell.h"
//#import "LoginViewController.h"
#import "LoginViewController.h"
#import "PublicNetWorkManager.h"
//#import <WXApi.h>
//#import "NomoVerbAlterView.h"
#import <WXApi.h>
#import "NomoVerbAlterView.h"
#import<AuthenticationServices/AuthenticationServices.h>
@ -32,7 +32,7 @@
[self.navigationController setNavigationBarHidden:YES animated:animated];
[self showNaviGationView:YES];
[self.navigationView setTitle:@"账号绑定" titleColor:RGBCOLOR(60, 60, 60)];
[self.navigationView setBackgroundColor:[UIColor whiteColor]];
[self.navigationView setBackgroundColor:[UIColor clearColor]];
}
-(void)viewDidAppear:(BOOL)animated
@ -54,6 +54,70 @@
[super viewDidLoad];
[self.view setBackgroundColor:[UIColor whiteColor]];
UIImageView *imgvback = [[UIImageView alloc] init];
[imgvback setImage:[UIImage imageNamed:@"znxz_back"]];
[self.view addSubview:imgvback];
[imgvback mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.top.equalTo(self.view);
make.bottom.equalTo(self.view);
}];
[self.view sendSubviewToBack:imgvback];
UIImageView *imgvhd = [[UIImageView alloc] init];
[self.view addSubview:imgvhd];
[imgvhd mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.offset(60);
make.top.offset(NavHeight+40);
make.centerX.equalTo(self.view);
}];
[imgvhd.layer setMasksToBounds:YES];
[imgvhd.layer setCornerRadius:30];
[imgvhd sd_setImageWithURL:[NSURL URLWithString:[Tools isStringnil:self.modelDetail.avater]] placeholderImage:[UIImage imageNamed:@"hb_log"]];
UIButton *bthy = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 65, 23)];
[bthy setTitle:@"终身会员" forState:UIControlStateNormal];
[bthy setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[bthy.titleLabel setFont:[UIFont fontWithName:@"zihunbiantaoti" size:14]];
[self.view addSubview:bthy];
[bthy mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(imgvhd);
make.top.equalTo(imgvhd.mas_bottom).offset(-10);
make.size.sizeOffset(CGSizeMake(65, 23));
}];
[bthy.layer setMasksToBounds:YES];
[bthy.layer setCornerRadius:10];
[Tools changedView:bthy colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
if(self.modelDetail.temp.intValue==1)
{
[bthy setHidden:YES];
}
if(self.modelDetail.vip.intValue == 2)
{
[bthy setTitle:@"普通会员" forState:UIControlStateNormal];
}
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:[Tools isStringnilkong:self.modelDetail.name]];
[lbname setTextColor:RGBCOLOR(51, 51, 51)];
[lbname setTextAlignment:NSTextAlignmentLeft];
[lbname setFont:[UIFont boldSystemFontOfSize:16]];
[self.view addSubview:lbname];
[lbname mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(bthy.mas_bottom).offset(20);
make.centerX.equalTo(self.view);
}];
UILabel *lbID = [[UILabel alloc] init];
[lbID setText:[NSString stringWithFormat:@"ID：%@",[Tools isStringnilkong:self.modelDetail.user_id]]];
[lbID setTextColor:RGBCOLOR(51, 51, 51)];
[lbID setTextAlignment:NSTextAlignmentLeft];
[lbID setFont:[UIFont boldSystemFontOfSize:16]];
[self.view addSubview:lbID];
[lbID mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(lbname.mas_bottom).offset(10);
make.centerX.equalTo(self.view);
}];
UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
[tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone];
[tableView setBackgroundColor:[UIColor clearColor]];
@ -63,7 +127,7 @@
[self.view addSubview:tableView];
[tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.equalTo(self.view);
make.top.offset(NavHeight+20);
make.top.equalTo(lbID.mas_bottom).offset(30);
}];
_tableView = tableView;
@ -169,270 +233,270 @@
///您若继续解除绑定，您的账号将没有绑定账号，软件在使用过程中可能会造成账号丢失！是否继续解除绑定！！
///微信 手机号 Apple
// baseInfoModel *model = self.arrdata[indexPath.row];
// switch (indexPath.row) {
// case 0:
// {
// if(model.select)
// {///解绑
// [NomoVerbAlterView showTitle:@"确定解除绑定微信" info:@"" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [self JieBang:@"weixin"];
// }
// }];
// }
// else
// {///绑定
// [self weixin];
// }
// }
// break;
// case 1:
// {
// if(model.select)
// {///解绑
// [NomoVerbAlterView showTitle:@"确定解除绑定手机号" info:@"" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [self JieBang:@"phone"];
// }
// }];
// }
// else
// {///绑定
// LoginViewController *vc = [[LoginViewController alloc] init];
// vc.isbind = YES;
// vc.isphoneView = YES;
// [self.navigationController pushViewController:vc animated:YES];
// }
// }
// break;
// case 2:
// {
// if(model.select)
// {///解绑
// [NomoVerbAlterView showTitle:@"确定解除绑定Apple" info:@"" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [self JieBang:@"apple"];
// }
// }];
// }
// else
// {///绑定
// [self loginApple];
// }
// }
// break;
// default:
// break;
// }
baseInfoModel *model = self.arrdata[indexPath.row];
switch (indexPath.row) {
case 0:
{
if(model.select)
{///解绑
[NomoVerbAlterView showTitle:@"确定解除绑定微信" info:@"" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[self JieBang:@"weixin"];
}
}];
}
else
{///绑定
[self weixin];
}
}
break;
case 1:
{
if(model.select)
{///解绑
[NomoVerbAlterView showTitle:@"确定解除绑定手机号" info:@"" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[self JieBang:@"phone"];
}
}];
}
else
{///绑定
LoginViewController *vc = [[LoginViewController alloc] init];
vc.isbind = YES;
vc.isphoneView = YES;
[self.navigationController pushViewController:vc animated:YES];
}
}
break;
case 2:
{
if(model.select)
{///解绑
[NomoVerbAlterView showTitle:@"确定解除绑定Apple" info:@"" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[self JieBang:@"apple"];
}
}];
}
else
{///绑定
[self loginApple];
}
}
break;
default:
break;
}
}
//-(void)weixin
//{
// @try {
// [[NSNotificationCenter defaultCenter] removeObserver:self name:WeiXinDengLuSQ object:nil];
// } @catch (NSException *exception) {
//
// } @finally {
//
// }
//
// [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(weixinNotifi:) name: WeiXinDengLuSQ object: nil];
// SendAuthReq *req = [[SendAuthReq alloc] init];
// req.scope = @"snsapi_userinfo";
// req.state = @"123";
//
// [WXApi sendAuthReq:req viewController:self delegate:nil completion:^(BOOL success) {
//
// }];
//}
//-(void)weixinNotifi:(NSNotification *)notifi
//{
// [[NSNotificationCenter defaultCenter] removeObserver:self name:WeiXinDengLuSQ object:nil];
// if(notifi.object!=nil)
// {
// SendAuthResp *resp = notifi.object;
//
// NSDictionary *dic=@{@"code":[Tools isStringnil:resp.code],
// @"code_type":@""};
//
// [LoadAlterView showView];
// [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)
// {
// [self getdata];
// }
// else
// {
// [LoadAlterView dismis];
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
// }
//}
//
//-(void)phone
//{
// NSDictionary *dic=@{@"phone":[self showPhone:self.modelDetail.phone]};
//
// [LoadAlterView showView];
// baseInfoModel *model = self.arrdata[0];
// [PublicNetWorkManager requestUserLoginData:self.view login_type:@"phone" phone:dic weixin:@{} apple:@{} device:@{} onekey:@{} bind:[NSNumber numberWithBool:NO] unbind:[NSNumber numberWithBool:!model.select] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
// if(state)
// {
// [self getdata];
// }
// else
// {
// [LoadAlterView dismis];
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
//}
/////解绑
//-(void)JieBang:(NSString *)login_type
//{
// int ibdcount = 0;
// for(baseInfoModel *model in self.arrdata)
// {
// if(model.select)
// {
// ibdcount+=1;
// }
// }
// if(ibdcount<=1)
// {
// [NomoVerbAlterView showTitle:@"您若继续解除绑定，您的账号将没有绑定账号，软件在使用过程中可能会造成账号丢失！是否继续解除绑定！！" info:@"" SelectTag:^(NSInteger tag) {
// if(tag == 0)
// {
// [self pushJieBang:login_type];
// }
// }];
// }
// else
// {
// [self pushJieBang:login_type];
// }
//}
//
//-(void)pushJieBang:(NSString *)login_type
//{
// [LoadAlterView showView];
// [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)
// {
// if(responseObject.data.token.length>3)
// {
// [UserInfoModel setToken:responseObject.data.token];
// }
// [self getdata];
// }
// else
// {
// [LoadAlterView dismis];
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
//}
//
//#pragma mark - apple
//-(void)loginPushApple:(NSDictionary *)dic login_type:(NSString *)login_type
//{
// [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 dismis];
// if(state)
// {
// [self getdata];
// }
// else
// {
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
//}
/////登录 Apple
//-(void)loginApple
//{
// if (@available(iOS 13.0, *)) {
// [LoadAlterView showView];
// // 基于用户的 Apple ID 授权用户，生成用户授权请求的一种机制
// ASAuthorizationAppleIDProvider *appleIdProvider = [[ASAuthorizationAppleIDProvider alloc] init];
// // 创建新的 AppleID 授权请求
// ASAuthorizationAppleIDRequest *request = appleIdProvider.createRequest;
// // 在用户授权期间请求的联系信息
// request.requestedScopes = @[ASAuthorizationScopeEmail, ASAuthorizationScopeFullName];
// // 由 ASAuthorizationAppleIDProvider 创建的授权请求，管理授权请求的控制器
// ASAuthorizationController *controller = [[ASAuthorizationController alloc] initWithAuthorizationRequests:@[request]];
// // 设置授权控制器通知授权请求的成功与失败的代理
// controller.delegate = self;
// // 设置提供展示上下文的代理，在这个上下文中，系统可以向用户展示授权界面
// controller.presentationContextProvider = self;
// // 在控制器初始化期间启动授权流
// [controller performRequests];
// }
// else
// {
// [HXHud showMessage:@"请升级手机系统" afterDelayType:0];
// }
//}
//- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization {
// if ([authorization.credential isKindOfClass:[ASAuthorizationAppleIDCredential class]]) {
// // 用户登录使用 ASAuthorizationAppleIDCredential
// ASAuthorizationAppleIDCredential *appleIDCredential = authorization.credential;
// NSString *user = appleIDCredential.user;
// NSString *nickname = appleIDCredential.fullName.nickname?:appleIDCredential.email;
// if([Tools isStringnil:nickname].length==0)
// {
// nickname = @"";
// }
// NSDictionary *dic = @{@"user_id":[Tools isStringnil:user],
// @"user_name":nickname,
// @"identify_code":[[NSString alloc] initWithData:appleIDCredential.authorizationCode encoding:NSUTF8StringEncoding],
// @"identify_token":[[NSString alloc] initWithData:appleIDCredential.identityToken encoding:NSUTF8StringEncoding]};
//
// [self loginPushApple:dic login_type:@"apple"];
//
// } else {
// NSLog(@"授权信息不符");
// [LoadAlterView dismis];
//
// }
//}
//- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error {
//
// NSString *errorMsg;
// switch (error.code) {
// case ASAuthorizationErrorUnknown: {
// errorMsg = @"授权请求失败，未知原因";
// break;
// }
// case ASAuthorizationErrorCanceled: {
// errorMsg = @"用户取消了授权请求";
// break;
// }
// case ASAuthorizationErrorInvalidResponse: {
// errorMsg = @"授权请求响应无效";
// break;
// }
// case ASAuthorizationErrorNotHandled: {
// errorMsg = @"未能处理授权请求";
// break;
// }
// case ASAuthorizationErrorFailed: {
// errorMsg = @"获取授权失败";
// break;
// }
// }
// [LoadAlterView dismis];
//}
//#pragma mark - <ASAuthorizationControllerPresentationContextProviding>
//// 告诉代理应该在哪个 window 展示内容给用户
//- (ASPresentationAnchor)presentationAnchorForAuthorizationController:(ASAuthorizationController *)controller {
// return self.view.window;
//}
-(void)weixin
{
@try {
[[NSNotificationCenter defaultCenter] removeObserver:self name:WeiXinDengLuSQ object:nil];
} @catch (NSException *exception) {
} @finally {
}
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(weixinNotifi:) name: WeiXinDengLuSQ object: nil];
SendAuthReq *req = [[SendAuthReq alloc] init];
req.scope = @"snsapi_userinfo";
req.state = @"123";
[WXApi sendAuthReq:req viewController:self delegate:nil completion:^(BOOL success) {
}];
}
-(void)weixinNotifi:(NSNotification *)notifi
{
[[NSNotificationCenter defaultCenter] removeObserver:self name:WeiXinDengLuSQ object:nil];
if(notifi.object!=nil)
{
SendAuthResp *resp = notifi.object;
NSDictionary *dic=@{@"code":[Tools isStringnil:resp.code],
@"code_type":@""};
[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)
{
[self getdata];
}
else
{
[LoadAlterView dismiss];
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
}
-(void)phone
{
NSDictionary *dic=@{@"phone":[self showPhone:self.modelDetail.phone]};
[LoadAlterView show];
baseInfoModel *model = self.arrdata[0];
[PublicNetWorkManager requestUserLoginData:self.view login_type:@"phone" phone:dic weixin:@{} apple:@{} device:@{} onekey:@{} bind:[NSNumber numberWithBool:NO] unbind:[NSNumber numberWithBool:!model.select] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
if(state)
{
[self getdata];
}
else
{
[LoadAlterView dismiss];
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
///解绑
-(void)JieBang:(NSString *)login_type
{
int ibdcount = 0;
for(baseInfoModel *model in self.arrdata)
{
if(model.select)
{
ibdcount+=1;
}
}
if(ibdcount<=1)
{
[NomoVerbAlterView showTitle:@"您若继续解除绑定，您的账号将没有绑定账号，软件在使用过程中可能会造成账号丢失！是否继续解除绑定！！" info:@"" SelectTag:^(NSInteger tag) {
if(tag == 0)
{
[self pushJieBang:login_type];
}
}];
}
else
{
[self pushJieBang:login_type];
}
}
-(void)pushJieBang:(NSString *)login_type
{
[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)
{
if(responseObject.data.token.length>3)
{
[UserInfoModel setToken:responseObject.data.token];
}
[self getdata];
}
else
{
[LoadAlterView dismiss];
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
#pragma mark - apple
-(void)loginPushApple:(NSDictionary *)dic login_type:(NSString *)login_type
{
[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)
{
[self getdata];
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
///登录 Apple
-(void)loginApple
{
if (@available(iOS 13.0, *)) {
[LoadAlterView show];
// 基于用户的 Apple ID 授权用户，生成用户授权请求的一种机制
ASAuthorizationAppleIDProvider *appleIdProvider = [[ASAuthorizationAppleIDProvider alloc] init];
// 创建新的 AppleID 授权请求
ASAuthorizationAppleIDRequest *request = appleIdProvider.createRequest;
// 在用户授权期间请求的联系信息
request.requestedScopes = @[ASAuthorizationScopeEmail, ASAuthorizationScopeFullName];
// 由 ASAuthorizationAppleIDProvider 创建的授权请求，管理授权请求的控制器
ASAuthorizationController *controller = [[ASAuthorizationController alloc] initWithAuthorizationRequests:@[request]];
// 设置授权控制器通知授权请求的成功与失败的代理
controller.delegate = self;
// 设置提供展示上下文的代理，在这个上下文中，系统可以向用户展示授权界面
controller.presentationContextProvider = self;
// 在控制器初始化期间启动授权流
[controller performRequests];
}
else
{
[HXHud showMessage:@"请升级手机系统" afterDelayType:0];
}
}
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization {
if ([authorization.credential isKindOfClass:[ASAuthorizationAppleIDCredential class]]) {
// 用户登录使用 ASAuthorizationAppleIDCredential
ASAuthorizationAppleIDCredential *appleIDCredential = authorization.credential;
NSString *user = appleIDCredential.user;
NSString *nickname = appleIDCredential.fullName.nickname?:appleIDCredential.email;
if([Tools isStringnil:nickname].length==0)
{
nickname = @"";
}
NSDictionary *dic = @{@"user_id":[Tools isStringnil:user],
@"user_name":nickname,
@"identify_code":[[NSString alloc] initWithData:appleIDCredential.authorizationCode encoding:NSUTF8StringEncoding],
@"identify_token":[[NSString alloc] initWithData:appleIDCredential.identityToken encoding:NSUTF8StringEncoding]};
[self loginPushApple:dic login_type:@"apple"];
} else {
NSLog(@"授权信息不符");
[LoadAlterView dismiss];
}
}
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error {
NSString *errorMsg;
switch (error.code) {
case ASAuthorizationErrorUnknown: {
errorMsg = @"授权请求失败，未知原因";
break;
}
case ASAuthorizationErrorCanceled: {
errorMsg = @"用户取消了授权请求";
break;
}
case ASAuthorizationErrorInvalidResponse: {
errorMsg = @"授权请求响应无效";
break;
}
case ASAuthorizationErrorNotHandled: {
errorMsg = @"未能处理授权请求";
break;
}
case ASAuthorizationErrorFailed: {
errorMsg = @"获取授权失败";
break;
}
}
[LoadAlterView dismiss];
}
#pragma mark - <ASAuthorizationControllerPresentationContextProviding>
// 告诉代理应该在哪个 window 展示内容给用户
- (ASPresentationAnchor)presentationAnchorForAuthorizationController:(ASAuthorizationController *)controller {
return self.view.window;
}
@end

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

@ -9,8 +9,8 @@
#import "ZhangHuGuanLiTableViewCell.h"
#import "ZhangHuGuanLiAlterView.h"
#import "PublicNetWorkManager.h"
//#import "LoginViewController.h"
//#import "NomoVerbAlterView.h"
#import "LoginViewController.h"
#import "NomoVerbAlterView.h"
#import "AppDelegate.h"
#import "TabBarController.h"
@ -80,25 +80,25 @@
-(void)getdata
{
// [LoadAlterView showView:[UIApplication sharedApplication].delegate.window frame:CGSizeMake(200, 150) title:@""];
// [PublicNetWorkManager requestUserAccountData:self.view scene:@"account" Callback:^(BOOL state, UserAccountModel *responseObject, NSString * _Nullable describle) {
// [LoadAlterView dismis];
// if(state)
// {
// self.arrdata = responseObject.data;
// }
// else
// {
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// [self.tableView reloadData];
// }];
[LoadAlterView show];
[PublicNetWorkManager requestUserAccountData:self.view scene:@"account" Callback:^(BOOL state, UserAccountModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
self.arrdata = responseObject.data;
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
[self.tableView reloadData];
}];
}
-(void)dengluAction
{
// LoginViewController *vc = [[LoginViewController alloc] init];
// vc.isbind = YES;
// [self.navigationController pushViewController:vc animated:YES];
LoginViewController *vc = [[LoginViewController alloc] init];
vc.isbind = YES;
[self.navigationController pushViewController:vc animated:YES];
}
#pragma mark - UITableView
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@ -160,81 +160,63 @@
if(![model.user_id isEqualToString:[UserInfoModel shareModel].userid])
{///切换账号 登录
// [NomoVerbAlterView showTitle:@"温馨提示" info:@"是否切换登录账号？" SelectTag:^(NSInteger tag) {
// if(tag==0)
// {
// dispatch_async(dispatch_get_main_queue(), ^{
//
// [LoadAlterView showView];
// NSDictionary *dic = @{@"user_id":[Tools isStringnil:model.user_id]};
// [PublicNetWorkManager requestUserLoginData:self.view login_type:@"device" phone:@{} weixin:@{} apple:@{} device:dic onekey:@{} bind:[NSNumber numberWithBool:NO] unbind:[NSNumber numberWithBool:NO] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
//
// if(state)
// {
// [UserInfoModel shijianShangBao:0 key:@"client.switch.account" value:@"切换账户" extra:@""];
//
// [UserInfoModel setLoingState:@"1"];
// [UserInfoModel setToken:responseObject.data.token];
// [self getPeiZhiData];
// [[NSNotificationCenter defaultCenter] postNotificationName:@"updataUserState" object:nil];
// }
// else
// {
// [LoadAlterView dismis];
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
//
// });
// }
// }];
[NomoVerbAlterView showTitle:@"温馨提示" info:@"是否切换登录账号？" SelectTag:^(NSInteger tag) {
if(tag==0)
{
dispatch_async(dispatch_get_main_queue(), ^{
[LoadAlterView show];
NSDictionary *dic = @{@"user_id":[Tools isStringnil:model.user_id]};
[PublicNetWorkManager requestUserLoginData:self.view login_type:@"device" phone:@{} weixin:@{} apple:@{} device:dic onekey:@{} bind:[NSNumber numberWithBool:NO] unbind:[NSNumber numberWithBool:NO] Callback:^(BOOL state, UserLoginModel *responseObject, NSString * _Nullable describle) {
if(state)
{
[UserInfoModel shijianShangBao:0 key:@"client.switch.account" value:@"切换账户" extra:@""];
[UserInfoModel setLoingState:@"1"];
[UserInfoModel setToken:responseObject.data.token];
[self getPeiZhiData];
[[NSNotificationCenter defaultCenter] postNotificationName:@"updataUserState" object:nil];
}
else
{
[LoadAlterView dismiss];
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
});
}
}];
}
}
}
-(void)getPeiZhiData
{
NSString *stridfa = [[NSUserDefaults standardUserDefaults] objectForKey:UserIDFA];
// [PublicNetWorkManager requestUserConfigData:self.view idfa:stridfa Callback:^(BOOL state, UserConfigModel *responseObject, NSString * _Nullable describle) {
// [LoadAlterView dismis];
// if(state)
// {
// BOOL isshow = [UserInfoModel PayWXQuanXian];
// BOOL isnowshow = NO;
// if(responseObject.data.config != nil || [[[NSUserDefaults standardUserDefaults] objectForKey:ShowSearchLongPress] intValue] == 1)
// {
// NSString *str = [responseObject.data.config objectForKey:@"client.material.search"];
// if(str.intValue == 1 || [Tools isStringnil:str].length==0 || [[[NSUserDefaults standardUserDefaults] objectForKey:ShowSearchLongPress] intValue] == 1)
// {
// isnowshow = YES;
// }
// }
//
// [UserInfoModel setToken:responseObject.data.token];
// [UserInfoModel setLoingState:@"1"];
// [UserInfoModel setUserid:responseObject.data.user_id];
// [UserInfoModel setAppid:responseObject.data.app_id];
// [UserInfoModel setRole:responseObject.data.role];
// [UserInfoModel setTemp:responseObject.data.temp];
// [UserInfoModel setName:responseObject.data.name];
// [UserInfoModel setConfig:responseObject.data.config];
//
// [UserInfoModel shareModel].isloadconfig = YES;
//
// if(isshow==NO && isnowshow==YES)
// {
// AppDelegate *appde = (AppDelegate *)[UIApplication sharedApplication].delegate;
// [appde.window setRootViewController:[TabBarController new]];
// }
// else
// {
// [self.navigationController popToRootViewControllerAnimated:YES];
// }
// }
// else
// {
// [HXHud showMessage:responseObject.message afterDelayType:1];
// }
// }];
[PublicNetWorkManager requestUserConfigData:self.view idfa:stridfa Callback:^(BOOL state, UserConfigModel *responseObject, NSString * _Nullable describle) {
[LoadAlterView dismiss];
if(state)
{
[UserInfoModel setToken:responseObject.data.token];
[UserInfoModel setLoingState:@"1"];
[UserInfoModel setUserid:responseObject.data.user_id];
[UserInfoModel setAppid:responseObject.data.app_id];
[UserInfoModel setRole:responseObject.data.role];
[UserInfoModel setTemp:responseObject.data.temp];
[UserInfoModel setName:responseObject.data.name];
[UserInfoModel setConfig:responseObject.data.config];
[UserInfoModel shareModel].isloadconfig = YES;
[self.navigationController popToRootViewControllerAnimated:YES];
}
else
{
[HXHud showMessage:responseObject.message afterDelayType:1];
}
}];
}
#pragma mark - DZNEmptyDataSetSource

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

@ -438,7 +438,7 @@
[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];
[self updateBtShow];

1
ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m
View File

@ -81,6 +81,7 @@
{
StartPayViewController *vc = [StartPayViewController new];
vc.ptype = 1;
vc.source = @"bannner home_banner";
[self.viewController.navigationController pushViewController:vc animated:YES];
}
else if([strpage isEqualToString:@"composition"])

26
ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m
View File

@ -7,13 +7,20 @@
#import "ShouYeZNXZTableViewCell.h"
#import "ZhiNengXieZuoViewController.h"
#import <libpag/PAGView.h>
@interface ShouYeZNXZTableViewCell ()
///
@property (nonatomic , strong) PAGView *pagView;
@end
@implementation ShouYeZNXZTableViewCell
-(void)dealloc
{
[self.pagView stop];
[self.pagView freeCache];
}
-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
{
if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
@ -75,6 +82,23 @@
make.right.equalTo(viewback).offset(-18);
}];
PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 140)];
[viewback addSubview:pagView];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
NSString *strpath = [[NSBundle mainBundle] pathForResource:@"逐字动效" ofType:@"pag"];
PAGFile* pagFile = [PAGFile Load:strpath];
[pagView setComposition:pagFile];
[pagView setRepeatCount:0];
dispatch_async(dispatch_get_main_queue(), ^{
[pagView play];
});
});
[pagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(viewback);
}];
_pagView = pagView;
UIButton *btnext = [[UIButton alloc] init];
[viewback addSubview:btnext];
[btnext mas_makeConstraints:^(MASConstraintMaker *make) {

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

@ -6,7 +6,8 @@
//
#import "ShouYeLSKTPGTableViewCell.h"
#import "ZhiNengXieZuoViewController.h"
#import "CamreViewController.h"
@interface ShouYeLSKTPGTableViewCell ()
@ -141,7 +142,30 @@
}
-(void)btAction:(UIButton *)sender
{
switch (sender.tag) {
case 0:
{
CamreViewController *vc = [CamreViewController new];
vc.type = 3;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;
case 1:
{
ZhiNengXieZuoViewController *vc = [ZhiNengXieZuoViewController new];
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;
case 2:
{
CamreViewController *vc = [CamreViewController new];
vc.type = 2;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
break;
default:
break;
}
}
@end

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

@ -6,14 +6,21 @@
//
#import "ShouYeLSZWPGTableViewCell.h"
#import <libpag/PAGView.h>
#import "CamreViewController.h"
@interface ShouYeLSZWPGTableViewCell ()
///
@property (nonatomic , strong) PAGView *pagView;
@end
@implementation ShouYeLSZWPGTableViewCell
-(void)dealloc
{
[self.pagView stop];
[self.pagView freeCache];
}
-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
{
if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
@ -26,7 +33,7 @@
}];
[viewback.layer setMasksToBounds:YES];
[viewback.layer setCornerRadius:8];
[viewback setImage:[UIImage imageNamed:@"home_znxzback"]];
[viewback setImage:[UIImage imageNamed:@"home_ls_zwpg"]];
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"作文批改"];
@ -74,9 +81,38 @@
make.right.equalTo(viewback).offset(-18);
}];
PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 140)];
[viewback addSubview:pagView];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
NSString *strpath = [[NSBundle mainBundle] pathForResource:@"分数" ofType:@"pag"];
PAGFile* pagFile = [PAGFile Load:strpath];
[pagView setComposition:pagFile];
[pagView setRepeatCount:0];
dispatch_async(dispatch_get_main_queue(), ^{
[pagView play];
});
});
[pagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(viewback);
}];
_pagView = pagView;
UIButton *btnext = [[UIButton alloc] init];
[viewback addSubview:btnext];
[btnext mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(viewback);
}];
[btnext addTarget:self action:@selector(nextAction) forControlEvents:UIControlEventTouchUpInside];
}
return self;
}
-(void)nextAction
{
CamreViewController *vc = [CamreViewController new];
vc.type = 1;
[self.viewController.navigationController pushViewController:vc animated:YES];
}
@end

34
ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.m
View File

@ -7,13 +7,19 @@
#import "ShouYeZCPPTTableViewCell.h"
#import "ZhiNengPPTViewController.h"
#import <libpag/PAGView.h>
@interface ShouYeZCPPTTableViewCell ()
///
@property (nonatomic , strong) PAGView *pagView;
@end
@implementation ShouYeZCPPTTableViewCell
-(void)dealloc
{
[self.pagView stop];
[self.pagView freeCache];
}
-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
{
if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])
@ -30,7 +36,7 @@
[viewback setImage:[UIImage imageNamed:@"home_zc_ppt"]];
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"智能PPT生成"];
[lbname setText:@"创作PPT"];
[lbname setTextColor:RGBCOLOR(26, 26, 26)];
[lbname setTextAlignment:NSTextAlignmentLeft];
[lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]];
@ -55,7 +61,7 @@
[btsy setTitle:@"立即使用" forState:UIControlStateNormal];
[btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal];
[btsy.titleLabel setFont:[UIFont systemFontOfSize:16]];
[btsy setBackgroundImage:[UIImage imageNamed:@"home_znxz_bt"] forState:UIControlStateNormal];
[btsy setBackgroundImage:[UIImage imageNamed:@"hone_ppt_cs_bt"] forState:UIControlStateNormal];
[viewback addSubview:btsy];
[btsy mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.offset(26);
@ -74,6 +80,26 @@
make.top.offset(11);
make.right.equalTo(viewback).offset(-18);
}];
PAGView *pagView = [[PAGView alloc] initWithFrame:CGRectMake(0, 0, 145, 92)];
[viewback addSubview:pagView];
dispatch_async(dispatch_get_global_queue(0, 0), ^{
NSString *strpath = [[NSBundle mainBundle] pathForResource:@"PPT切换效果" ofType:@"pag"];
PAGFile* pagFile = [PAGFile Load:strpath];
[pagView setComposition:pagFile];
[pagView setRepeatCount:0];
dispatch_async(dispatch_get_main_queue(), ^{
[pagView play];
});
});
[pagView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(viewback);
make.bottom.equalTo(viewback);
make.width.offset(145);
make.height.offset(92);
}];
_pagView = pagView;
UIButton *btnext = [[UIButton alloc] init];
[viewback addSubview:btnext];
[btnext mas_makeConstraints:^(MASConstraintMaker *make) {

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

@ -28,7 +28,7 @@
[viewback setImage:[UIImage imageNamed:@"home_znxzback"]];
UILabel *lbname = [[UILabel alloc] init];
[lbname setText:@"智能写作"];
[lbname setText:@"写作生成"];
[lbname setTextColor:RGBCOLOR(26, 26, 26)];
[lbname setTextAlignment:NSTextAlignmentLeft];
[lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]];

BIN
ProductApp/ProductApp/分数.pag Normal file
View File

Binary file not shown.

BIN
ProductApp/ProductApp/逐字动效.pag Normal file
View File

Binary file not shown.