This commit is contained in:
lianxiang
2018-10-12 09:12:54 +08:00
parent dc1b1e330f
commit 97af177b88
37 changed files with 583 additions and 173 deletions
@@ -237,12 +237,15 @@
if (index > _currentModel.answerList.count) {
return;
}
//答案整型非范围 设计稿范围展示!!
NSLog(@"答案下标:%d",index);
//修改答案默认下标
//返回时查看之前选中答案时使用
_currentModel.slidervalue = value;
//选中记录 修改答案默认下标 最终答案选择根据defaultFlag 1 时为选中答案
[self changeAnswerDefaultflag:index];
}
@@ -330,8 +333,6 @@
-(void)reloadViews{
//刷新问题相关数据
if (_page == self.questonArray.count) {
NSAttributedString *nextTitle = [[NSAttributedString alloc] initWithString:@"完成" attributes:@{NSFontAttributeName:[UIFont fontWithName:GIGA_FONTBOLD size:18],NSForegroundColorAttributeName:[UIColor whiteColor]}];
@@ -20,6 +20,7 @@
#import "UIButton+WebCache.h"
#import "UIImageView+WebCache.h"
#import "GiGaUserInfoVC.h"
#import "LXCustomActionSheet.h"
@interface MaskTestResultVC ()
@@ -314,26 +315,48 @@
[self showFinalShareView];
UIImage *image = [UIImage saveNavsuitImage:self.tableView];
//[[GiGaFileNanager shareInstance] saveImaeToAlBum:image];
[self jxt_showActionSheetWithTitle:@"分享到微信" message:@"" appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
// [self jxt_showActionSheetWithTitle:@"分享到微信" message:@"" appearanceProcess:^(JXTAlertController * _Nonnull alertMaker) {
//
// alertMaker.addActionDefaultTitle(@"微信好友");
// alertMaker.addActionDefaultTitle(@"朋友圈");
// alertMaker.addActionCancelTitle(@"取消");
// } actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
// [self hidSomeViews];
// if (buttonIndex==0) {
// //好友
// [self shareImagToWX:image scene:WXSceneSession];
//
//
// }else if (buttonIndex==1){
// // 朋友圈
// [self shareImagToWX:image scene:WXSceneTimeline];
// }else{
// GILog(@"取消");
//
// }
// }];
LXCustomActionSheet *sheet = [[LXCustomActionSheet alloc] initWithTitle:@"分享到微信" optionsArr:@[@"微信好友",@"朋友圈"] cancelTitle:@"取消" selectedBlock:^(NSInteger index) {
alertMaker.addActionDefaultTitle(@"微信好友");
alertMaker.addActionDefaultTitle(@"朋友圈");
alertMaker.addActionCancelTitle(@"取消");
} actionsBlock:^(NSInteger buttonIndex, UIAlertAction * _Nonnull action, JXTAlertController * _Nonnull alertSelf) {
if (index==0) {
[self hidSomeViews];
//好友
[self shareImagToWX:image scene:WXSceneSession];
}else if (index==1){
[self hidSomeViews];
// 朋友圈
[self shareImagToWX:image scene:WXSceneTimeline];
}
} cancelBlock:^{
[self hidSomeViews];
if (buttonIndex==0) {
//好友
[self shareImagToWX:image scene:WXSceneSession];
}else if (buttonIndex==1){
// 朋友圈
[self shareImagToWX:image scene:WXSceneTimeline];
}else{
GILog(@"取消");
}
GILog(@"取消");
}];
[sheet show];
}
-(void)hidSomeViews{
MaskResultShareViewCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]];
@@ -350,8 +373,7 @@
cell.shareBtn.hidden = YES;
cell.lastLabe.text = @"长按扫描二维码,测试你的肤质";
self.tabheader.hidden = NO;
}
-(void)shareImagToWX:(UIImage *)image scene:(int)scene{